Fixes #96 Adding Selenium 4 support

Author: glibas

README.md

@@ -9,6 +9,8 @@ Selenium Shutterbug is a utility library written in Java for making screenshots
 
 The idea behind the project is to make testers life easier by enabling them to create descriptive screenshots which, in some cases, could be directly attached to the bug reports or serve as a source of information about system state at a specific moment of time. 
 
+##### Selenium WebDriver version 4+ support starts from version 1.6
+
 Supported features: 
 
 - Capturing the entire page

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.assertthat</groupId>
     <artifactId>selenium-shutterbug</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.6-SNAPSHOT</version>
     <name>selenium-shutterbug</name>
     <description>Utility library to create customized screenshots using Selenium WebDriver and Java AWT</description>
     <url>http://www.assertthat.com</url>
@@ -43,8 +43,8 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>3.141.59</version>
-	    <scope>compile</scope>
+            <version>4.1.1</version>
+	        <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

src/main/java/com/assertthat/selenium_shutterbug/utils/web/Browser.java

@@ -14,10 +14,7 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.edge.EdgeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.remote.CommandInfo;
-import org.openqa.selenium.remote.HttpCommandExecutor;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import org.openqa.selenium.remote.Response;
+import org.openqa.selenium.remote.*;
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.support.ui.FluentWait;
 
@@ -28,6 +25,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.Duration;
@@ -906,8 +904,19 @@ private void defineCustomCommand(String name, CommandInfo info) {
         try {
             Method defineCommand = HttpCommandExecutor.class.getDeclaredMethod("defineCommand", String.class, CommandInfo.class);
             defineCommand.setAccessible(true);
-            defineCommand.invoke(((RemoteWebDriver) this.driver).getCommandExecutor(), name, info);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            CommandExecutor commandExecutor = ((RemoteWebDriver) this.driver).getCommandExecutor();
+            try {
+                Class.forName("org.openqa.selenium.remote.TracedCommandExecutor");
+                if (commandExecutor instanceof TracedCommandExecutor) {
+                    Field delegateField = TracedCommandExecutor.class.getDeclaredField("delegate");
+                    delegateField.setAccessible(true);
+                    commandExecutor = (CommandExecutor) delegateField.get(commandExecutor);
+                }
+            }catch (ClassNotFoundException cnfe){
+                //Then using selenium 3
+            }
+            defineCommand.invoke(commandExecutor, name, info);
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException | NoSuchFieldException e) {
             throw new RuntimeException(e);
         }
     }