From 0336f5650915914500ae3d9b57f2360ba396df43 Mon Sep 17 00:00:00 2001 From: Mark Gunlogson <31893232+noobgramming@users.noreply.github.com> Date: Mon, 7 Jul 2025 15:31:15 -0500 Subject: [PATCH] AUT-7054 update all deps, bump version, fix linting --- auto-sdk-java-common/pom.xml | 2 +- .../auto/context/FrameworkContext.java | 4 + .../auto/context/PageObjectOptions.java | 15 ++- .../applause/auto/data/enums/Platform.java | 43 ++++++- .../auto/data/enums/SwipeDirection.java | 3 - .../auto/logging/ResultPropertyConverter.java | 8 -- .../logging/ServerSideRemoteLogAppender.java | 4 +- auto-sdk-java-config/pom.xml | 2 +- .../applause/auto/config/PropertyHelper.java | 1 - .../applause/auto/config/SdkConfigBean.java | 1 - .../auto/config/TestRailConfigBean.java | 1 - auto-sdk-java-cucumber/pom.xml | 2 +- .../utils/TestRailConfigBeanMapper.java | 1 - auto-sdk-java-framework/pom.xml | 2 +- .../auto/framework/AbstractDriverManager.java | 2 +- .../selenium/apppush/AppPushHelper.java | 2 +- auto-sdk-java-helpers/pom.xml | 2 +- .../com/applause/auto/helpers/SyncHelper.java | 1 - .../analytics/AnalyticsInterceptor.java | 1 - .../auto/helpers/analytics/NetworkEntry.java | 6 +- .../http/mapping/IRestObjectMapper.java | 1 + auto-sdk-java-integrations/pom.xml | 2 +- .../auto/config/ApplauseSdkConfigBean.java | 1 - .../auto/helpers/ApplauseAppPushHelper.java | 2 +- .../integrations/BasicAuthInterceptor.java | 1 - auto-sdk-java-page-object/pom.xml | 2 +- .../pageobjectmodel/base/BaseComponent.java | 9 +- .../pageobjectmodel/base/BaseElement.java | 3 - .../auto/pageobjectmodel/base/LocatedBy.java | 11 +- .../pageobjectmodel/elements/Checkbox.java | 1 - .../pageobjectmodel/elements/TextBox.java | 1 - .../pageobjectmodel/factory/LazyList.java | 25 +++- .../factory/LazyWebElement.java | 27 ++++- auto-sdk-java-reporting/pom.xml | 2 +- .../auto/reporting/ISessionInitializer.java | 1 + .../auto/reporting/ShutdownHandler.java | 3 +- auto-sdk-java-rest-clients/pom.xml | 2 +- .../api/InternalTestCycleApi.java | 1 + .../util/applausepublicapi/api/KeysApi.java | 1 + auto-sdk-java-testng/pom.xml | 4 +- .../com/applause/auto/testng/BaseTest.java | 1 - .../auto/testng/TestRailConfigBeanMapper.java | 1 - .../IApplauseTestCaseIdOverride.java | 1 + .../dataprovider/IDriverConfigOverride.java | 1 + .../dataprovider/IParameterOverride.java | 1 + .../dataprovider/ITestIterationTag.java | 2 +- .../dataprovider/ITestRailCaseIdOverride.java | 2 +- .../testng/dataprovider/TestIterationTag.java | 1 - build-tools/pmdconfig.xml | 31 +---- build-tools/spotbugs-exclude.xml | 3 + pom.xml | 107 ++++++++---------- 51 files changed, 190 insertions(+), 164 deletions(-) diff --git a/auto-sdk-java-common/pom.xml b/auto-sdk-java-common/pom.xml index 4c4de37..5fb4815 100644 --- a/auto-sdk-java-common/pom.xml +++ b/auto-sdk-java-common/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-common diff --git a/auto-sdk-java-common/src/main/java/com/applause/auto/context/FrameworkContext.java b/auto-sdk-java-common/src/main/java/com/applause/auto/context/FrameworkContext.java index f251b07..1bd7081 100644 --- a/auto-sdk-java-common/src/main/java/com/applause/auto/context/FrameworkContext.java +++ b/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(); diff --git a/auto-sdk-java-common/src/main/java/com/applause/auto/context/PageObjectOptions.java b/auto-sdk-java-common/src/main/java/com/applause/auto/context/PageObjectOptions.java index 6b3ac6d..0bce0d0 100644 --- a/auto-sdk-java-common/src/main/java/com/applause/auto/context/PageObjectOptions.java +++ b/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 diff --git a/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/Platform.java b/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/Platform.java index aa49a22..fa635f3 100644 --- a/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/Platform.java +++ b/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 diff --git a/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/SwipeDirection.java b/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/SwipeDirection.java index 5ca4fbe..dc095db 100644 --- a/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/SwipeDirection.java +++ b/auto-sdk-java-common/src/main/java/com/applause/auto/data/enums/SwipeDirection.java @@ -60,9 +60,6 @@ public Pair 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); } diff --git a/auto-sdk-java-common/src/main/java/com/applause/auto/logging/ResultPropertyConverter.java b/auto-sdk-java-common/src/main/java/com/applause/auto/logging/ResultPropertyConverter.java index a4e36b6..94e41cd 100644 --- a/auto-sdk-java-common/src/main/java/com/applause/auto/logging/ResultPropertyConverter.java +++ b/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); } diff --git a/auto-sdk-java-common/src/main/java/com/applause/auto/logging/ServerSideRemoteLogAppender.java b/auto-sdk-java-common/src/main/java/com/applause/auto/logging/ServerSideRemoteLogAppender.java index d41c1b5..e0d9e63 100644 --- a/auto-sdk-java-common/src/main/java/com/applause/auto/logging/ServerSideRemoteLogAppender.java +++ b/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)); } } diff --git a/auto-sdk-java-config/pom.xml b/auto-sdk-java-config/pom.xml index 73e7b28..c49adb1 100644 --- a/auto-sdk-java-config/pom.xml +++ b/auto-sdk-java-config/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-config diff --git a/auto-sdk-java-config/src/main/java/com/applause/auto/config/PropertyHelper.java b/auto-sdk-java-config/src/main/java/com/applause/auto/config/PropertyHelper.java index 216fcf4..6347d67 100644 --- a/auto-sdk-java-config/src/main/java/com/applause/auto/config/PropertyHelper.java +++ b/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 String callForValueAsString( final @NonNull Method method, final @NonNull T configBean) { String defaultReturnValue = NO_VALUE; diff --git a/auto-sdk-java-config/src/main/java/com/applause/auto/config/SdkConfigBean.java b/auto-sdk-java-config/src/main/java/com/applause/auto/config/SdkConfigBean.java index 8d61f4a..f129f46 100644 --- a/auto-sdk-java-config/src/main/java/com/applause/auto/config/SdkConfigBean.java +++ b/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 { /** diff --git a/auto-sdk-java-config/src/main/java/com/applause/auto/config/TestRailConfigBean.java b/auto-sdk-java-config/src/main/java/com/applause/auto/config/TestRailConfigBean.java index 33f8790..25b8be5 100644 --- a/auto-sdk-java-config/src/main/java/com/applause/auto/config/TestRailConfigBean.java +++ b/auto-sdk-java-config/src/main/java/com/applause/auto/config/TestRailConfigBean.java @@ -29,7 +29,6 @@ @LoadPolicy(LoadType.MERGE) // testrail.properties comes from the user of the SDK. @Sources({"classpath:props/testrail.properties", "classpath:cfg/testrail_default.properties"}) -@SuppressWarnings({"PMD.JUnit4TestShouldUseTestAnnotation"}) public interface TestRailConfigBean extends Config { /** diff --git a/auto-sdk-java-cucumber/pom.xml b/auto-sdk-java-cucumber/pom.xml index db6b297..656e787 100644 --- a/auto-sdk-java-cucumber/pom.xml +++ b/auto-sdk-java-cucumber/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-cucumber diff --git a/auto-sdk-java-cucumber/src/main/java/com/applause/auto/cucumber/utils/TestRailConfigBeanMapper.java b/auto-sdk-java-cucumber/src/main/java/com/applause/auto/cucumber/utils/TestRailConfigBeanMapper.java index cc87fc6..ea62372 100644 --- a/auto-sdk-java-cucumber/src/main/java/com/applause/auto/cucumber/utils/TestRailConfigBeanMapper.java +++ b/auto-sdk-java-cucumber/src/main/java/com/applause/auto/cucumber/utils/TestRailConfigBeanMapper.java @@ -25,7 +25,6 @@ /** Convenience class that maps the TestRail config interface into a class */ @Getter -@SuppressWarnings("PMD.JUnit4TestShouldUseTestAnnotation") public final class TestRailConfigBeanMapper { private TestRailConfigBeanMapper() { diff --git a/auto-sdk-java-framework/pom.xml b/auto-sdk-java-framework/pom.xml index 19aa62c..69e2604 100644 --- a/auto-sdk-java-framework/pom.xml +++ b/auto-sdk-java-framework/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-framework diff --git a/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/AbstractDriverManager.java b/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/AbstractDriverManager.java index ff7ae47..f7ed26f 100644 --- a/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/AbstractDriverManager.java +++ b/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/AbstractDriverManager.java @@ -41,7 +41,7 @@ @RequiredArgsConstructor @Log4j2 public abstract class AbstractDriverManager { - protected static final Gson gsonLenient = new GsonBuilder().setLenient().create(); + protected static final Gson gsonLenient = new GsonBuilder().create(); private final RetryPolicyBuilder policyBuilder = RetryPolicy.builder() .handle(WebDriverException.class) diff --git a/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/selenium/apppush/AppPushHelper.java b/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/selenium/apppush/AppPushHelper.java index 4e090a7..9bfccd6 100644 --- a/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/selenium/apppush/AppPushHelper.java +++ b/auto-sdk-java-framework/src/main/java/com/applause/auto/framework/selenium/apppush/AppPushHelper.java @@ -27,6 +27,7 @@ import com.google.common.net.HttpHeaders; import dev.failsafe.Failsafe; import dev.failsafe.RetryPolicy; +import jakarta.ws.rs.HttpMethod; import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -39,7 +40,6 @@ import java.util.Locale; import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.ws.rs.HttpMethod; import lombok.NonNull; import okhttp3.Call; import okhttp3.Credentials; diff --git a/auto-sdk-java-helpers/pom.xml b/auto-sdk-java-helpers/pom.xml index 8fb2f2b..0d992aa 100644 --- a/auto-sdk-java-helpers/pom.xml +++ b/auto-sdk-java-helpers/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-helpers diff --git a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/SyncHelper.java b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/SyncHelper.java index cfb7993..b8daa79 100644 --- a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/SyncHelper.java +++ b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/SyncHelper.java @@ -33,7 +33,6 @@ import org.openqa.selenium.support.ui.WebDriverWait; /** Utility class to handle waiting for elements and locating elements. */ -@SuppressWarnings({"PMD.ExcessivePublicCount", "PMD.GodClass"}) @AllArgsConstructor public class SyncHelper implements IPageObjectExtension { private static final Logger logger = LogManager.getLogger(SyncHelper.class); diff --git a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/AnalyticsInterceptor.java b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/AnalyticsInterceptor.java index 6ed2b50..919a583 100644 --- a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/AnalyticsInterceptor.java +++ b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/AnalyticsInterceptor.java @@ -33,7 +33,6 @@ * This interceptor is added to classes in the PageObjectFactory to facilitate running code before * and after methods. Currently, the only use case is for the @AnalyticsCall annotation. */ -@SuppressWarnings("PMD.SignatureDeclareThrowsException") // since we're intercepting this is okay public class AnalyticsInterceptor extends ComponentInterceptor { private final AnalyticsHelper analyticsHelper; diff --git a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/NetworkEntry.java b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/NetworkEntry.java index 8c17001..c24404d 100644 --- a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/NetworkEntry.java +++ b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/analytics/NetworkEntry.java @@ -29,11 +29,7 @@ import org.apache.logging.log4j.Logger; /** extends regular analytics entry with network info */ -@SuppressWarnings({ - "PMD.GodClass", - "checkstyle:CyclomaticComplexity", - "checkstyle:MultipleStringLiterals" -}) +@SuppressWarnings({"checkstyle:CyclomaticComplexity", "checkstyle:MultipleStringLiterals"}) public class NetworkEntry extends AnalyticsEntry { private static final Logger logger = LogManager.getLogger(NetworkEntry.class); diff --git a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/http/mapping/IRestObjectMapper.java b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/http/mapping/IRestObjectMapper.java index bc6fb57..f07ba32 100644 --- a/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/http/mapping/IRestObjectMapper.java +++ b/auto-sdk-java-helpers/src/main/java/com/applause/auto/helpers/http/mapping/IRestObjectMapper.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** Functional Interface that is representing object mapper method for REST API */ +@FunctionalInterface public interface IRestObjectMapper { ObjectMapper restJsonObjectMapper(); } diff --git a/auto-sdk-java-integrations/pom.xml b/auto-sdk-java-integrations/pom.xml index cc150fa..d6f70b7 100644 --- a/auto-sdk-java-integrations/pom.xml +++ b/auto-sdk-java-integrations/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-integrations diff --git a/auto-sdk-java-integrations/src/main/java/com/applause/auto/config/ApplauseSdkConfigBean.java b/auto-sdk-java-integrations/src/main/java/com/applause/auto/config/ApplauseSdkConfigBean.java index 41ee568..c0ae3f0 100644 --- a/auto-sdk-java-integrations/src/main/java/com/applause/auto/config/ApplauseSdkConfigBean.java +++ b/auto-sdk-java-integrations/src/main/java/com/applause/auto/config/ApplauseSdkConfigBean.java @@ -31,7 +31,6 @@ // system.properties comes from the user of the SDK. // applause_environment.properties is in this project and contains the defaults @Sources({"classpath:props/system.properties", "classpath:applause_environment.properties"}) -@SuppressWarnings("PMD.ExcessivePublicCount") public interface ApplauseSdkConfigBean extends Config { /** * Gets Applause API Key diff --git a/auto-sdk-java-integrations/src/main/java/com/applause/auto/helpers/ApplauseAppPushHelper.java b/auto-sdk-java-integrations/src/main/java/com/applause/auto/helpers/ApplauseAppPushHelper.java index f0c89f5..92b2b73 100644 --- a/auto-sdk-java-integrations/src/main/java/com/applause/auto/helpers/ApplauseAppPushHelper.java +++ b/auto-sdk-java-integrations/src/main/java/com/applause/auto/helpers/ApplauseAppPushHelper.java @@ -34,6 +34,7 @@ import com.google.common.net.HttpHeaders; import dev.failsafe.Failsafe; import dev.failsafe.RetryPolicy; +import jakarta.ws.rs.HttpMethod; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -46,7 +47,6 @@ import java.util.Base64; import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.ws.rs.HttpMethod; import lombok.NonNull; import okhttp3.Call; import okhttp3.HttpUrl; diff --git a/auto-sdk-java-integrations/src/main/java/com/applause/auto/integrations/BasicAuthInterceptor.java b/auto-sdk-java-integrations/src/main/java/com/applause/auto/integrations/BasicAuthInterceptor.java index 8cc5f28..d64ce1d 100644 --- a/auto-sdk-java-integrations/src/main/java/com/applause/auto/integrations/BasicAuthInterceptor.java +++ b/auto-sdk-java-integrations/src/main/java/com/applause/auto/integrations/BasicAuthInterceptor.java @@ -29,7 +29,6 @@ class BasicAuthInterceptor implements Interceptor { private final String credentials; - @SuppressWarnings("PMD.NullAssignment") BasicAuthInterceptor(final String user, final String password) { if (null != user && null != password) { this.credentials = Credentials.basic(user, password); diff --git a/auto-sdk-java-page-object/pom.xml b/auto-sdk-java-page-object/pom.xml index c8573ab..3876d4d 100644 --- a/auto-sdk-java-page-object/pom.xml +++ b/auto-sdk-java-page-object/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-page-object diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseComponent.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseComponent.java index 6e005cb..512e094 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseComponent.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseComponent.java @@ -52,8 +52,6 @@ * @see com.applause.auto.pageobjectmodel.annotation.Implementation * @see PageObjectBuilder */ -@SuppressWarnings("PMD.LoggerIsNotStaticFinal") // code gen interferes with logger naming -@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"}) public abstract class BaseComponent implements UIElement { /** A Logger that looks up the classname with any ByteBuddy naming removed */ protected final Logger logger = @@ -67,7 +65,12 @@ public abstract class BaseComponent implements UIElement { /** -- GETTER -- Gets the underlying element of this component. */ @Getter @Setter private @Nullable LazyWebElement underlying; - @Getter @Setter private @NonNull IPageObjectContext context; + @Getter + @Setter + @SuppressFBWarnings( + value = "NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", + justification = "Field is set by PageObjectBuilder after construction.") + private @NonNull IPageObjectContext context; /** * Post-creation lifecycle method for the BaseComponent. afterInit() is called by diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseElement.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseElement.java index 3b3dedb..29520e6 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseElement.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/BaseElement.java @@ -23,7 +23,6 @@ import com.applause.auto.pageobjectmodel.elements.ContainerElement; import com.applause.auto.pageobjectmodel.factory.LazyWebElement; import com.applause.auto.pageobjectmodel.factory.Locator; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.time.Duration; import java.util.List; import lombok.Getter; @@ -39,8 +38,6 @@ * * @see LazyWebElement */ -@SuppressWarnings({"PMD.LoggerIsNotStaticFinal", "PMD.GodClass"}) -@SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"}) public abstract class BaseElement implements UIElement { /** The Logger */ protected final Logger logger = LogManager.getLogger(this.getClass().getSimpleName()); diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/LocatedBy.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/LocatedBy.java index 078dc76..5303e87 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/LocatedBy.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/base/LocatedBy.java @@ -19,7 +19,6 @@ import dev.failsafe.Failsafe; import dev.failsafe.RetryPolicy; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.appium.java_client.AppiumBy; import java.io.IOException; import java.io.InputStream; @@ -57,13 +56,6 @@ */ // ignore caps on a few method names, so they match the Selenium // call (convenience) -@SuppressFBWarnings("NM_METHOD_NAMING_CONVENTION") -@SuppressWarnings({ - "PMD.MethodNamingConventions", - "checkstyle:AbbreviationAsWordInName", - "checkstyle:MethodName", - "PMD.ShortMethodName" -}) public enum LocatedBy { ; static final Logger logger = LogManager.getLogger(); @@ -176,6 +168,7 @@ public static By androidUIAutomator(final String selector) { * @param selector the class chain selector pointing at an element or elements in the DOM * @return the By locator corresponding to that selector */ + @SuppressWarnings("checkstyle:MethodName") public static By iOSClassChain(final String selector) { return AppiumBy.iOSClassChain(selector); } @@ -186,6 +179,7 @@ public static By iOSClassChain(final String selector) { * @param selector the NsPredicate selector pointing at an element or elements in the DOM * @return the By locator corresponding to that selector */ + @SuppressWarnings("checkstyle:MethodName") public static By iOSNsPredicate(final String selector) { return AppiumBy.iOSNsPredicateString(selector); } @@ -207,6 +201,7 @@ public static By appiumClassName(final String selector) { * @return a By which locates elements selected by that Sizzle Public API call * @throws IllegalArgumentException if sizzle selector is null */ + @SuppressWarnings("checkstyle:MethodName") public static By jQuery(final String selector) { if (selector == null) { throw new IllegalArgumentException("Cannot find elements with a null Sizzle selector."); diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/Checkbox.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/Checkbox.java index 9eaa2a4..0953141 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/Checkbox.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/Checkbox.java @@ -45,7 +45,6 @@ public Checkbox(final LazyWebElement element, final IPageObjectContext context) * * @return true if Checkbox is checked, otherwise, false */ - @SuppressWarnings({"PMD.AvoidDeeplyNestedIfStmts"}) public boolean isChecked() { if (Platform.hasNativeFallback(this.context.getPlatform())) { if (this.context.getDriver() instanceof IOSDriver) { diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/TextBox.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/TextBox.java index 26acbbd..ba2cd5e 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/TextBox.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/elements/TextBox.java @@ -59,7 +59,6 @@ public void clearText() { * * @return current text as a string */ - @SuppressWarnings("PMD.AvoidCatchingNPE") @SuppressFBWarnings("DCN_NULLPOINTER_EXCEPTION") public String getCurrentText() { String response; diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyList.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyList.java index 6baedec..5c2f054 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyList.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyList.java @@ -120,7 +120,6 @@ private List buildList(final List elements) { } @Override - @SuppressWarnings("PMD.CognitiveComplexity") public void initialize() { if (locator == null || locator.getBy(formatArgs) == null) { throw new IllegalArgumentException( @@ -229,12 +228,18 @@ private S runLazily(final Callable supplier) { /** Proxy to the underlying List.size() with lazy-loading. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Method reference would make the call ambiguous due to + // runLazily overloads public int size() { return runLazily(() -> underlying.size()); } /** Proxy to the underlying List.isEmpty() with lazy-loading. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Method reference would make the call ambiguous due to + // runLazily overloads public boolean isEmpty() { return runLazily(() -> underlying.isEmpty()); } @@ -247,12 +252,18 @@ public boolean contains(final Object o) { /** Proxy to the underlying List.iterator() with lazy-loading. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Method reference would make the call ambiguous due to + // runLazily overloads public @NonNull Iterator iterator() { return runLazily(() -> underlying.iterator()); } /** Proxy to the underlying List.toArray() with lazy-loading. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Method reference would make the call ambiguous due to + // runLazily overloads public Object @NonNull [] toArray() { return runLazily(() -> underlying.toArray()); } @@ -277,8 +288,11 @@ public boolean addAll(int index, final @Nonnull Collection c) { /** Proxy to the underlying List.clear() with lazy-loading. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Method reference would make the call ambiguous due to + // runLazily overloads public void clear() { - runLazily(() -> underlying.clear()); + runLazily((Runnable) () -> underlying.clear()); } /** Proxy to the underlying List.get() with lazy-loading. */ @@ -296,13 +310,13 @@ public T set(int index, final T element) { /** Proxy to the underlying List.add() with lazy-loading. */ @Override public void add(int index, final T element) { - runLazily(() -> underlying.add(index, element)); + runLazily((Runnable) () -> underlying.add(index, element)); } /** Proxy to the underlying List.add() with lazy-loading. */ @Override public boolean add(final T o) { - runLazily(() -> underlying.add(o)); + runLazily((Runnable) () -> underlying.add(o)); return true; } @@ -332,6 +346,9 @@ public int lastIndexOf(final Object o) { /** Proxy to the underlying List.listIterator() with lazy-loading. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Method reference would make the call ambiguous due to + // runLazily overloads public @Nonnull ListIterator listIterator() { return runLazily(() -> underlying.listIterator()); } diff --git a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyWebElement.java b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyWebElement.java index a8fcbb6..234c4b8 100644 --- a/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyWebElement.java +++ b/auto-sdk-java-page-object/src/main/java/com/applause/auto/pageobjectmodel/factory/LazyWebElement.java @@ -87,7 +87,6 @@ public class LazyWebElement implements WebElement, UIElement { * @param locator a Locator pointing at an element in the DOM * @param context the underlying context to use */ - @SuppressWarnings("PMD.NullAssignment") public LazyWebElement(final Locator locator, final IPageObjectContext context) { this.locator = locator; this.context = context; @@ -324,12 +323,16 @@ private T runLazily(final Callable supplier) { /** Proxy to the underlying WebElement.click() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public void click() { runLazily(() -> underlying.click()); } /** Proxy to the underlying WebElement.submit() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public void submit() { runLazily(() -> underlying.submit()); } @@ -344,6 +347,8 @@ public void sendKeys(final CharSequence... charSequences) { /** Proxy to the underlying WebElement.clear() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public void clear() { runLazily(() -> underlying.clear()); } @@ -352,6 +357,8 @@ public void clear() { * Proxy to the underlying WebElement.getTagName() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public String getTagName() { return runLazily(() -> underlying.getTagName()); } @@ -379,6 +386,8 @@ public String getDomProperty(final String s) { * Proxy to the underlying WebElement.isSelected() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public boolean isSelected() { return runLazily(() -> underlying.isSelected()); } @@ -387,6 +396,8 @@ public boolean isSelected() { * Proxy to the underlying WebElement.isEnabled() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public boolean isEnabled() { return runLazily(() -> underlying.isEnabled()); } @@ -395,6 +406,8 @@ public boolean isEnabled() { * Proxy to the underlying WebElement.getText() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public String getText() { return runLazily(() -> underlying.getText()); } @@ -422,6 +435,8 @@ public WebElement findElement(final By by) { * protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public boolean isDisplayed() { return runLazily(() -> underlying.isDisplayed()); } @@ -431,6 +446,8 @@ public boolean isDisplayed() { * protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public Point getLocation() { return runLazily(() -> underlying.getLocation()); } @@ -439,6 +456,8 @@ public Point getLocation() { * Proxy to the underlying WebElement.getSize() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public Dimension getSize() { return runLazily(() -> underlying.getSize()); } @@ -447,6 +466,8 @@ public Dimension getSize() { * Proxy to the underlying WebElement.getRect() with lazy-loading and stale element protection. */ @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public Rectangle getRect() { return runLazily(() -> underlying.getRect()); } @@ -470,6 +491,8 @@ public X getScreenshotAs(final OutputType target) throws WebDriverExcepti } @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public SearchContext getShadowRoot() { return runLazily(() -> underlying.getShadowRoot()); } @@ -534,6 +557,8 @@ public Duration getWaitPollingInterval() { } @Override + @SuppressWarnings( + "PMD.LambdaCanBeMethodReference") // Lambda required to defer null check for lazy-loading public boolean exists() { return runLazily(() -> this.underlying.isEnabled()); } diff --git a/auto-sdk-java-reporting/pom.xml b/auto-sdk-java-reporting/pom.xml index a597791..8a1e6a0 100644 --- a/auto-sdk-java-reporting/pom.xml +++ b/auto-sdk-java-reporting/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-reporting diff --git a/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ISessionInitializer.java b/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ISessionInitializer.java index c61bcc2..4d2379d 100644 --- a/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ISessionInitializer.java +++ b/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ISessionInitializer.java @@ -20,6 +20,7 @@ import com.applause.auto.reporting.params.ApplauseRunCreation; /** Interface describing a TestRun session initializer */ +@FunctionalInterface public interface ISessionInitializer { /** diff --git a/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ShutdownHandler.java b/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ShutdownHandler.java index a9b8dc2..7b23fa0 100644 --- a/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ShutdownHandler.java +++ b/auto-sdk-java-reporting/src/main/java/com/applause/auto/reporting/ShutdownHandler.java @@ -23,7 +23,6 @@ /** A Helper for registering a shutdown hook on the JVM */ @SuppressWarnings({ - "PMD.AvoidUsingVolatile", "PMD.AvoidSynchronizedAtMethodLevel", "PMD.AvoidCatchingThrowable", "PMD.DataClass" @@ -33,7 +32,7 @@ public final class ShutdownHandler extends Thread { private static volatile ShutdownHandler instance; private Long testRunId; private AutoApi client; - private boolean normalExit; + private volatile boolean normalExit; /** * This is a singleton pattern. get the instance and ensure it is registered with the runtime diff --git a/auto-sdk-java-rest-clients/pom.xml b/auto-sdk-java-rest-clients/pom.xml index d96ffb1..8bf2282 100644 --- a/auto-sdk-java-rest-clients/pom.xml +++ b/auto-sdk-java-rest-clients/pom.xml @@ -21,7 +21,7 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-rest-clients diff --git a/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/InternalTestCycleApi.java b/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/InternalTestCycleApi.java index 6258cb6..7e30299 100644 --- a/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/InternalTestCycleApi.java +++ b/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/InternalTestCycleApi.java @@ -24,6 +24,7 @@ import retrofit2.Response; import retrofit2.http.*; +@SuppressWarnings("PMD.ImplicitFunctionalInterface") public interface InternalTestCycleApi { /** * Creates test cycle by cloning an existing one. Optionally, some fields in the new cycle can be diff --git a/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/KeysApi.java b/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/KeysApi.java index 3465490..8755993 100644 --- a/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/KeysApi.java +++ b/auto-sdk-java-rest-clients/src/main/java/com/applause/auto/util/applausepublicapi/api/KeysApi.java @@ -22,6 +22,7 @@ import retrofit2.Response; import retrofit2.http.*; +@SuppressWarnings("PMD.ImplicitFunctionalInterface") public interface KeysApi { /** * Returns info for current API key diff --git a/auto-sdk-java-testng/pom.xml b/auto-sdk-java-testng/pom.xml index 9327d99..7395ba5 100644 --- a/auto-sdk-java-testng/pom.xml +++ b/auto-sdk-java-testng/pom.xml @@ -21,13 +21,13 @@ com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT auto-sdk-java-testng 21 21 - 7.6.1 + 7.11.0 UTF-8 UTF-8 diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/BaseTest.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/BaseTest.java index 70b1002..5657a5b 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/BaseTest.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/BaseTest.java @@ -40,7 +40,6 @@ import org.testng.annotations.Listeners; /** Base TestNG Class to ensure all needed items are wired up properly for test execution. */ -@SuppressWarnings("PMD.LoggerIsNotStaticFinal") // Listeners are run in reverse order - we want the SDK Testrail work to be done last, so we can // fetch // appropriate data from the session close diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/TestRailConfigBeanMapper.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/TestRailConfigBeanMapper.java index 0da9ed7..3fcf609 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/TestRailConfigBeanMapper.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/TestRailConfigBeanMapper.java @@ -25,7 +25,6 @@ /** Convenience class that maps the TestRail config interface into a class */ @Getter -@SuppressWarnings("PMD.JUnit4TestShouldUseTestAnnotation") public final class TestRailConfigBeanMapper { private TestRailConfigBeanMapper() { diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IApplauseTestCaseIdOverride.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IApplauseTestCaseIdOverride.java index 2999173..f423271 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IApplauseTestCaseIdOverride.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IApplauseTestCaseIdOverride.java @@ -22,6 +22,7 @@ /** * Interface describing an Override for the Applause TestCase ID when using a TestNG DataProvider */ +@FunctionalInterface public interface IApplauseTestCaseIdOverride { /** * Get the Applause Test Case IDs diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IDriverConfigOverride.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IDriverConfigOverride.java index 7548d4b..b8ece76 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IDriverConfigOverride.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IDriverConfigOverride.java @@ -18,6 +18,7 @@ package com.applause.auto.testng.dataprovider; /** Interface defining a driver config override for a TestNG Data Provider */ +@FunctionalInterface public interface IDriverConfigOverride { /** * Gets the Driver Config to use for the Data Provider Iteration diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IParameterOverride.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IParameterOverride.java index ee44b07..7b19953 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IParameterOverride.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/IParameterOverride.java @@ -18,6 +18,7 @@ package com.applause.auto.testng.dataprovider; /** Interface describing a parameter string override for Data Provider iterations */ +@FunctionalInterface public interface IParameterOverride { /** * Return the parameter list as a serialized string diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestIterationTag.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestIterationTag.java index 762d6a2..1012f2d 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestIterationTag.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestIterationTag.java @@ -18,7 +18,7 @@ package com.applause.auto.testng.dataprovider; /** Interface describing an Tag for a given Data Provider iteration */ -@SuppressWarnings("PMD.JUnit4TestShouldUseTestAnnotation") +@FunctionalInterface public interface ITestIterationTag { /** diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestRailCaseIdOverride.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestRailCaseIdOverride.java index 00f650d..09ac4cf 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestRailCaseIdOverride.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/ITestRailCaseIdOverride.java @@ -18,7 +18,7 @@ package com.applause.auto.testng.dataprovider; /** Interface describing a TestRail case id override for a data provider iteration */ -@SuppressWarnings("PMD.JUnit4TestShouldUseTestAnnotation") +@FunctionalInterface public interface ITestRailCaseIdOverride { /** diff --git a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/TestIterationTag.java b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/TestIterationTag.java index f503215..7aea943 100644 --- a/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/TestIterationTag.java +++ b/auto-sdk-java-testng/src/main/java/com/applause/auto/testng/dataprovider/TestIterationTag.java @@ -22,7 +22,6 @@ * * @param testIterationTag A "tag" for the Data Provider iteration */ -@SuppressWarnings("PMD.AvoidFieldNameMatchingTypeName") public record TestIterationTag(String testIterationTag) implements ITestIterationTag { @Override public String toString() { diff --git a/build-tools/pmdconfig.xml b/build-tools/pmdconfig.xml index d9f06ff..b98b78f 100644 --- a/build-tools/pmdconfig.xml +++ b/build-tools/pmdconfig.xml @@ -27,16 +27,8 @@ Main PMD linting ruleset - - - - - - - - @@ -46,6 +38,7 @@ + @@ -53,18 +46,7 @@ - - - - - - - - - - - @@ -83,6 +65,7 @@ + @@ -97,22 +80,20 @@ - - - + - - - + + + \ No newline at end of file diff --git a/build-tools/spotbugs-exclude.xml b/build-tools/spotbugs-exclude.xml index 5656ed8..dc7fa2c 100644 --- a/build-tools/spotbugs-exclude.xml +++ b/build-tools/spotbugs-exclude.xml @@ -33,4 +33,7 @@ + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1dc4e64..0847f98 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 com.applause auto-sdk-java - 6.0.5-SNAPSHOT + 6.1.0-SNAPSHOT pom ${project.artifactId} @@ -47,57 +47,50 @@ UTF-8 - 7.10.2 - 7.19.0 - 9.1.0 + 7.11.0 + 7.23.0 + 9.5.0 - 4.18.1 - 2.22.1 - 2.15.1 + 4.34.0 + 2.24.3 + 2.19.0 3.17.0 - 1.15.3 - 2.11.0 + 1.17.6 + 3.0.0 4.12.0 - 2.10.1 - 33.0.0-jre - 2.17.2 + 2.13.1 + 33.4.8-jre + 2.19.1 3.3.2 1.0.12 - 1.18.34 + 1.18.38 2.1.3 2.0.3 - 2.3.31 + 2.3.34 6.0.0 - 4.4 + 4.5.0 - 5.5.0 - 4.2.2 - 1.18.3 + 5.5.5 + 4.3.0 + 1.21.1 0.3.7 1.0.2 2.29.1 - 20250107 + 20250517 0.0.12 - 2.7.2 + 2.8.0 v4-rev612-1.25.0 - 5.13.0 - 5.2.0 + 5.18.0 - 7.0.0 - 4.7.3 - 2.1.1 + 7.15.0 + 4.9.3 + 4.0.0 - - org.mockito - mockito-inline - ${org.mockito-inline.version} - test - com.squareup.retrofit2 retrofit @@ -234,9 +227,9 @@ ${org.apache.commons.version} - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} jakarta.mail @@ -321,10 +314,6 @@ org.mockito mockito-core - - org.mockito - mockito-inline - com.google.guava guava @@ -371,8 +360,8 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api provided @@ -391,46 +380,46 @@ maven-deploy-plugin - 3.1.0 + 3.1.4 org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.14.0 org.codehaus.mojo versions-maven-plugin - 2.17.1 + 2.18.0 maven-scm-plugin - 1.13.0 + 2.1.0 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.5.0 org.apache.maven.plugins maven-install-plugin - 3.1.3 + 3.1.4 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.3 org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.11.2 @@ -438,7 +427,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.43.0 + 2.44.2 true @@ -449,7 +438,7 @@ - 1.19.2 + 1.27.0 - - net.sourceforge.pmd - pmd-compat6 - ${pmdVersion} - net.sourceforge.pmd pmd-core @@ -590,7 +573,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.7.1 true resolveCiFriendliesOnly @@ -615,7 +598,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.4 + 4.9.3.2 true @@ -625,7 +608,7 @@ com.github.spotbugs spotbugs - 4.8.3 + 4.9.3 @@ -640,7 +623,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.1 + 3.6.0 build-tools/checkstyle.xml build-tools/checkstyle_suppression.xml