Merge pull request #49 from ApplauseOSS/AUT-7054

AUT-7054 update all deps, bump version, fix linting

Author: noobgramming

auto-sdk-java-common/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.applause</groupId>
     <artifactId>auto-sdk-java</artifactId>
-    <version>6.0.5-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>auto-sdk-java-common</artifactId>
   <properties>

auto-sdk-java-common/src/main/java/com/applause/auto/context/FrameworkContext.java

@@ -20,6 +20,7 @@
 import com.applause.auto.logging.ResultPropertyMap;
 import com.applause.auto.templates.TemplateManager;
 import com.google.common.base.Suppliers;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import freemarker.template.Template;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -36,6 +37,9 @@
 @AllArgsConstructor
 @Data
 @RequiredArgsConstructor
+@SuppressFBWarnings(
+    value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE",
+    justification = "Lombok @Data generates equals/hashCode; null checks are redundant.")
 public class FrameworkContext {
   @Setter(value = AccessLevel.NONE)
   private final String contextId = UUID.randomUUID().toString();

auto-sdk-java-common/src/main/java/com/applause/auto/context/PageObjectOptions.java

@@ -20,21 +20,26 @@
 import java.time.Duration;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
+import lombok.Setter;
+import lombok.ToString;
 
 /** Additional options used by the PageObjectContext that change how the PageObjectModel behaves */
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@Data
+@Getter
+@Setter
+@EqualsAndHashCode
+@ToString
 public class PageObjectOptions {
   /** Default timeout for locating elements */
-  private @NonNull @Builder.Default Duration timeout = Duration.ofSeconds(10);
+  @Builder.Default private Duration timeout = Duration.ofSeconds(10);
 
   /** Default polling interval for locating elements */
-  private @NonNull @Builder.Default Duration pollingInterval = Duration.ofSeconds(1);
+  @Builder.Default private Duration pollingInterval = Duration.ofSeconds(1);
 
   /**
    * For lazy list implementations, this flag determines if we throw an exception when no elements

auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/Platform.java

@@ -35,39 +35,73 @@
  */
 @Getter
 public enum Platform {
+  /** Default platform, used as a fallback when no specific platform is matched. */
   DEFAULT("Default", null),
+  /** Represents all mobile platforms. */
   MOBILE("Mobile", DEFAULT),
+  /** Represents all Android mobile devices. */
   MOBILE_ANDROID("MobileAndroid", MOBILE),
+  /** Represents Android mobile phones. */
   MOBILE_ANDROID_PHONE("MobileAndroidPhone", MOBILE_ANDROID),
+  /** Represents Android tablets. */
   MOBILE_ANDROID_TABLET("MobileAndroidTablet", MOBILE_ANDROID),
+  /** Represents small Android tablets. */
   MOBILE_ANDROID_SMALL_TABLET("MobileAndroidSmallTablet", MOBILE_ANDROID),
+  /** Represents all iOS mobile devices. */
   MOBILE_IOS("MobileIOS", MOBILE),
+  /** Represents iOS mobile phones. */
   MOBILE_IOS_PHONE("MobileIOSPhone", MOBILE_IOS),
+  /** Represents iOS tablets. */
   MOBILE_IOS_TABLET("MobileIOSTablet", MOBILE_IOS),
+  /** Represents small iOS tablets. */
   MOBILE_IOS_SMALL_TABLET("MobileIOSSmallTablet", MOBILE_IOS),
+  /** Represents all web platforms. */
   WEB("Web", DEFAULT),
+  /** Represents desktop web platforms. */
   WEB_DESKTOP("WebDesktop", WEB),
+  /** Represents Chrome browser on desktop. */
   WEB_DESKTOP_CHROME("WebDesktopChrome", WEB_DESKTOP),
+  /** Represents Edge browser on desktop. */
   WEB_DESKTOP_EDGE("WebDesktopEdge", WEB_DESKTOP),
+  /** Represents Firefox browser on desktop. */
   WEB_DESKTOP_FIREFOX("WebDesktopFirefox", WEB_DESKTOP),
+  /** Represents Internet Explorer browser on desktop. */
   WEB_DESKTOP_IE("WebDesktopIE", WEB_DESKTOP),
+  /** Represents Safari browser on desktop. */
   WEB_DESKTOP_SAFARI("WebDesktopSafari", WEB_DESKTOP),
+  /** Represents all web mobile platforms. */
   WEB_MOBILE("WebMobile", WEB),
+  /** Represents web mobile phones. */
   WEB_MOBILE_PHONE("WebMobilePhone", WEB_MOBILE),
+  /** Represents Android web mobile phones. */
   WEB_ANDROID_PHONE("WebAndroidPhone", WEB_MOBILE_PHONE),
+  /** Represents iOS web mobile phones. */
   WEB_IOS_PHONE("WebIOSPhone", WEB_MOBILE_PHONE),
+  /** Represents web mobile tablets. */
   WEB_MOBILE_TABLET("WebMobileTablet", WEB_MOBILE),
+  /** Represents Android web mobile tablets. */
   WEB_ANDROID_TABLET("WebAndroidTablet", WEB_MOBILE_TABLET),
+  /** Represents iOS web mobile tablets. */
   WEB_IOS_TABLET("WebIOSTablet", WEB_MOBILE_TABLET),
+  /** Represents web mobile small tablets. */
   WEB_MOBILE_SMALL_TABLET("WebMobileSmallTablet", WEB_MOBILE),
+  /** Represents Android web mobile small tablets. */
   WEB_ANDROID_SMALL_TABLET("WebAndroidSmallTablet", WEB_MOBILE_SMALL_TABLET),
+  /** Represents iOS web mobile small tablets. */
   WEB_IOS_SMALL_TABLET("WebIOSSmallTablet", WEB_MOBILE_SMALL_TABLET),
+  /** Represents all OTT (over-the-top) platforms. */
   OTT("OTT", DEFAULT),
+  /** Represents Amazon Fire TV OTT platform. */
   OTT_FIRE_TV("OttFireTv", OTT),
+  /** Represents Amazon Fire TV 4K OTT platform. */
   OTT_FIRE_TV_4K("OttFireTv4k", OTT_FIRE_TV),
+  /** Represents Apple TV OTT platform. */
   OTT_APPLE_TV("OttAppleTv", OTT),
+  /** Represents Apple TV 4K OTT platform. */
   OTT_APPLE_TV_4K("OttAppleTv4k", OTT_APPLE_TV),
+  /** Represents Google Chromecast OTT platform. */
   OTT_CHROMECAST("OttChromecast", OTT),
+  /** Represents Android TV OTT platform. */
   OTT_ANDROID_TV("OttAndroidTv", OTT);
 
   private static final Logger logger = LogManager.getLogger(Platform.class);
@@ -120,14 +154,15 @@ public static boolean hasNativeFallback(final @NonNull Platform p) {
    * @param p the current Platform
    * @return if chain falls back to MobileNative (Platform.MOBILE)
    */
-  @SuppressWarnings({"PMD.AvoidBranchingStatementAsLastInLoop", "PMD.SimplifyBooleanReturns"})
   public boolean hasFallback(final @NonNull Platform p) {
+    boolean result = false;
     // If the platforms match, then this falls back to the provided platform
     if (this == p) {
-      return true;
+      result = true;
+    } else if (this.fallback != null) {
+      result = this.fallback.hasFallback(p);
     }
-    // If we have a fallback, check if it falls back to the requested platform
-    return this.fallback != null && this.fallback.hasFallback(p);
+    return result;
   }
 
   @Override

auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/SwipeDirection.java

@@ -60,9 +60,6 @@ public Pair<Point, Point> getSwipeVector(final int width, final int height) {
             start = new Point((int) (width * 0.15), height / 2);
             yield new Point((int) (width * 0.85), height / 2);
           }
-          default ->
-              throw new IllegalArgumentException(
-                  "Invalid SwipeDirection value specified, somehow.");
         };
     return Pair.of(start, end);
   }

auto-sdk-java-common/src/main/java/com/applause/auto/logging/ResultPropertyConverter.java

@@ -57,10 +57,6 @@ public final class ResultPropertyConverter extends LogEventPatternConverter {
    *
    * @param properties options, may be null.
    */
-  @SuppressWarnings({
-    "PMD.UnusedFormalParameter",
-    "PMD.UseVarargs",
-  })
   private ResultPropertyConverter(final String... properties) {
     super("ResultProperty", "resultProperty");
     this.properties = new ArrayList<>();
@@ -94,10 +90,6 @@ private ResultPropertyConverter(final String... properties) {
    * @param properties options, may be null.
    * @return instance of pattern converter.
    */
-  @SuppressWarnings({
-    "PMD.UnusedFormalParameter",
-    "PMD.UseVarargs",
-  })
   public static ResultPropertyConverter newInstance(final String... properties) {
     return new ResultPropertyConverter(properties);
   }

auto-sdk-java-common/src/main/java/com/applause/auto/logging/ServerSideRemoteLogAppender.java

@@ -17,8 +17,8 @@
  */
 package com.applause.auto.logging;
 
-import com.google.common.base.Charsets;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LogEvent;
@@ -79,6 +79,6 @@ public static ServerSideRemoteLogAppender createAppender(
   @Override
   public void append(final LogEvent logEvent) {
     // code inspired by Log4J source to behave like their other appender
-    LogOutputSingleton.put(new String(layout.toByteArray(logEvent), Charsets.UTF_8));
+    LogOutputSingleton.put(new String(layout.toByteArray(logEvent), StandardCharsets.UTF_8));
   }
 }

auto-sdk-java-config/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.applause</groupId>
     <artifactId>auto-sdk-java</artifactId>
-    <version>6.0.5-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>auto-sdk-java-config</artifactId>
   <properties>

auto-sdk-java-config/src/main/java/com/applause/auto/config/PropertyHelper.java

@@ -201,7 +201,6 @@ static String hidePasswordOrKey(final String value) {
     return sb.toString();
   }
 
-  @SuppressWarnings("PMD.CognitiveComplexity")
   static <T extends Config> String callForValueAsString(
       final @NonNull Method method, final @NonNull T configBean) {
     String defaultReturnValue = NO_VALUE;

auto-sdk-java-config/src/main/java/com/applause/auto/config/SdkConfigBean.java

@@ -31,7 +31,6 @@
  */
 @LoadPolicy(LoadType.MERGE)
 @Sources({"classpath:props/system.properties"})
-@SuppressWarnings("PMD.ExcessivePublicCount")
 public interface SdkConfigBean extends Config {
 
   /**