[BqvAC2FK] Update selenium dependencies (#3663)

* [BqvAC2FK] Update selenium dependencies * [BqvAC2FK] solve deps conflicts * [BqvAC2FK] removed ext. dep * [BqvAC2FK] add testImplementation dep.
neo4j-contrib · Aug 30, 2023 · f0a3a1a · f0a3a1a
1 parent 4dbe46d
commit f0a3a1a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/extra-dependencies/selenium/build.gradle b/extra-dependencies/selenium/build.gradle
@@ -17,9 +17,11 @@ jar {
 }
 
 dependencies {
-    // currently we cannot update to the latest version due to guava minimum version required (31.0.1-jre)
-    compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.141.59', {
+    compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '4.10.0' , {
         exclude group: 'com.google.guava', module: 'guava'
     }
-    compile group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '4.4.3'
+    compile group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '5.4.0', {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+
 }
diff --git a/full/build.gradle b/full/build.gradle
@@ -76,10 +76,18 @@ dependencies {
     compile 'org.jsoup:jsoup:1.15.3'
 
     // currently we cannot update selenium to the latest version due to guava minimum version required (31.0.1-jre)
-    compileOnly group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.141.59', { exclude group: 'com.google.guava', module: 'guava' }
-    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.141.59', { exclude group: 'com.google.guava', module: 'guava' }
-    compileOnly group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '5.1.0'
-    testCompile group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '5.1.0'
+    compileOnly group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '4.10.0', {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '4.10.0', {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    compileOnly group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '5.4.0', {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    testCompile group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '5.4.0', {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
 
     compile group: 'org.roaringbitmap', name: 'RoaringBitmap', version: '0.7.17'
     compile(group: 'org.apache.commons', name: 'commons-configuration2', version: '2.9.0') {
@@ -170,6 +178,7 @@ dependencies {
     compileOnly group: 'com.sun.mail', name: 'javax.mail', version: '1.6.0'
     testCompile group: 'com.sun.mail', name: 'javax.mail', version: '1.6.0'
     testCompile group: 'org.zapodot', name: 'embedded-ldap-junit', version: '0.9.0'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '5.4.0'
 
     configurations.all {
         exclude group: 'org.slf4j', module: 'slf4j-nop'

diff --git a/full/src/main/java/apoc/load/LoadHtml.java b/full/src/main/java/apoc/load/LoadHtml.java
@@ -97,7 +97,7 @@ private Stream<MapResult> readHtmlPage(String url, Map<String, String> query, Ma
         } catch (UnsupportedCharsetException e) {
             throw new RuntimeException("Unsupported charset: " + config.getCharset());
         } catch (IllegalArgumentException | ClassCastException e) {
-            throw new RuntimeException("Invalid config: " + config);
+            throw new RuntimeException("Invalid config: " + e.getMessage());
         } catch (FileNotFoundException e) {
             throw new RuntimeException("File not found from: " + url);
         } catch(Exception e) {

diff --git a/full/src/main/java/apoc/load/LoadHtmlBrowser.java b/full/src/main/java/apoc/load/LoadHtmlBrowser.java
@@ -34,6 +34,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.Duration;
 import java.util.Map;
 
 import static java.util.Optional.ofNullable;
@@ -44,7 +45,7 @@ public static InputStream getChromeInputStream(String url, Map<String, String> q
         setupWebDriverManager(WebDriverManager.chromedriver(), config);
 
         ChromeOptions chromeOptions = new ChromeOptions();
-        chromeOptions.setHeadless(isHeadless);
+        chromeOptions.addArguments("--headless=new");
         chromeOptions.setAcceptInsecureCerts(isAcceptInsecureCerts);
         return getInputStreamWithBrowser(url, query, config, new ChromeDriver(chromeOptions));
     }
@@ -53,7 +54,7 @@ public static InputStream getFirefoxInputStream(String url, Map<String, String>
         setupWebDriverManager(WebDriverManager.firefoxdriver(), config);
 
         FirefoxOptions firefoxOptions = new FirefoxOptions();
-        firefoxOptions.setHeadless(isHeadless);
+        firefoxOptions.addArguments("-headless");
         firefoxOptions.setAcceptInsecureCerts(isAcceptInsecureCerts);
         return getInputStreamWithBrowser(url, query, config, new FirefoxDriver(firefoxOptions));
     }
@@ -150,7 +151,7 @@ private static InputStream getInputStreamWithBrowser(String url, Map<String, Str
 
         final long wait = config.getWait();
         if (wait > 0) {
-            Wait<WebDriver> driverWait = new WebDriverWait(driver, wait);
+            Wait<WebDriver> driverWait = new WebDriverWait(driver, Duration.ofSeconds(wait));
             try {
                 driverWait.until(webDriver -> query.values().stream()
                         .noneMatch(selector -> webDriver.findElements(By.cssSelector(selector)).isEmpty()));