Merge pull request #68 from aquality-automation/support/update-libraries-version

[Logging][Selenium] Update libraries versions

Author: aqualityAutomation

pom.xml

@@ -86,24 +86,24 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>2.17.0</version>
+            <version>2.18.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.0</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.0.0</version>
+            <version>7.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>5.0.1</version>
+            <version>5.1.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>
@@ -114,29 +114,29 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.1</version>
+            <version>2.13.3</version>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>4.1.1</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.bonigarcia</groupId>
             <artifactId>webdrivermanager</artifactId>
-            <version>5.0.2</version>
+            <version>5.2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
-            <version>8.0.0-beta2</version>
+            <version>8.1.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.0</version>
+            <version>2.18.0</version>
         </dependency>
     </dependencies>
 

src/main/java/aquality/selenium/core/elements/ElementFactory.java

@@ -153,7 +153,7 @@ protected By generateXpathLocator(By multipleElementsLocator, WebElement webElem
      * @return extracted XPath.
      */
     protected String extractXPathFromLocator(By locator) {
-        Class supportedLocatorType = ByXPath.class;
+        Class<ByXPath> supportedLocatorType = ByXPath.class;
         if (locator.getClass().equals(supportedLocatorType)) {
             return locator.toString().substring(XPATH_SUBSTRING_BEGIN_INDEX);
         }
@@ -162,7 +162,7 @@ protected String extractXPathFromLocator(By locator) {
         }
         throw new InvalidArgumentException(String.format(
                 "Cannot define xpath from locator %1$s. Locator type %2$s is not %3$s, and is not supported yet",
-                locator.toString(), locator.getClass(), supportedLocatorType));
+                locator, locator.getClass(), supportedLocatorType));
     }
 
     /**
@@ -210,6 +210,7 @@ protected <T extends IElement> Class<T> resolveElementClass(Class<T> clazz) {
                     String.format("Interface %1$s is not found in getElementTypesMap()", clazz));
         }
 
+        //noinspection unchecked
         return clazz.isInterface() ? (Class<T>) getElementTypesMap().get(clazz) : clazz;
     }
 

src/main/java/aquality/selenium/core/waitings/ConditionalWait.java

@@ -40,7 +40,7 @@ public boolean waitFor(BooleanSupplier condition, Duration timeout, Duration pol
     @Override
     public void waitForTrue(BooleanSupplier condition, Duration timeout, Duration pollingInterval, String message, Collection<Class<? extends Throwable>> exceptionsToIgnore) throws TimeoutException {
         BooleanSupplier supplier = Optional.ofNullable(condition).orElseThrow(() -> new IllegalArgumentException("Condition cannot be null"));
-        long timeoutInSeconds = resolveConditionTimeoutInSeconds(timeout);
+        Duration currentTimeout = resolveConditionTimeout(timeout);
         long pollingIntervalInMilliseconds = resolvePollingInterval(pollingInterval).toMillis();
         String exMessage = resolveMessage(message);
         double startTime = getCurrentTime();
@@ -50,8 +50,8 @@ public void waitForTrue(BooleanSupplier condition, Duration timeout, Duration po
             }
 
             double currentTime = getCurrentTime();
-            if ((currentTime - startTime) > timeoutInSeconds) {
-                String exceptionMessage = String.format("Timed out after %1$s seconds during wait for condition '%2$s'", timeoutInSeconds, exMessage);
+            if ((currentTime - startTime) > currentTimeout.getSeconds()) {
+                String exceptionMessage = String.format("Timed out after %1$s seconds during wait for condition '%2$s'", currentTimeout, exMessage);
                 throw new TimeoutException(exceptionMessage);
             }
 
@@ -67,10 +67,10 @@ public void waitForTrue(BooleanSupplier condition, Duration timeout, Duration po
     public <T> T waitFor(ExpectedCondition<T> condition, Duration timeout, Duration pollingInterval, String message, Collection<Class<? extends Throwable>> exceptionsToIgnore) {
         IApplication app = applicationProvider.get();
         app.setImplicitWaitTimeout(Duration.ZERO);
-        long timeoutInSeconds = resolveConditionTimeoutInSeconds(timeout);
+        Duration currentTimeout = resolveConditionTimeout(timeout);
         Duration actualPollingInterval = resolvePollingInterval(pollingInterval);
         String exMessage = resolveMessage(message);
-        WebDriverWait wait = new WebDriverWait(app.getDriver(), timeoutInSeconds);
+        WebDriverWait wait = new WebDriverWait(app.getDriver(), currentTimeout);
         wait.pollingEvery(actualPollingInterval);
         wait.withMessage(exMessage);
         wait.ignoreAll(exceptionsToIgnore == null ? Collections.singleton(StaleElementReferenceException.class) : exceptionsToIgnore);
@@ -97,8 +97,8 @@ private boolean isConditionSatisfied(BooleanSupplier condition, Collection<Class
         }
     }
 
-    private long resolveConditionTimeoutInSeconds(Duration timeout) {
-        return Optional.ofNullable(timeout).orElse(timeoutConfiguration.getCondition()).getSeconds();
+    private Duration resolveConditionTimeout(Duration timeout) {
+        return Optional.ofNullable(timeout).orElse(timeoutConfiguration.getCondition());
     }
 
     private Duration resolvePollingInterval(Duration pollingInterval) {