From f875c3b86aa0f14e27a91d0a3d1f8e51d02e9054 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 3 Oct 2023 11:32:26 +0300 Subject: [PATCH] chore: Automate more static code checks (#2028) --- config/checkstyle/appium-style.xml | 10 ++++++++++ .../java/io/appium/java_client/AppiumDriver.java | 6 +++--- .../appium/java_client/CommandExecutionHelper.java | 6 +++--- src/main/java/io/appium/java_client/LogsEvents.java | 4 ++-- .../java/io/appium/java_client/MobileCommand.java | 3 ++- .../android/AndroidMobileCommandHelper.java | 3 +-- .../java_client/internal/CapabilityHelpers.java | 6 +++--- .../java/io/appium/java_client/internal/Config.java | 4 ++-- .../java_client/internal/ReflectionHelpers.java | 6 +++--- .../appium/java_client/internal/SessionHelpers.java | 6 +++--- .../pagefactory/AppiumFieldDecorator.java | 4 ++-- .../pagefactory/DefaultElementByBuilder.java | 2 +- .../pagefactory/OverrideWidgetReader.java | 6 +++--- .../java_client/pagefactory/ThrowableUtil.java | 6 +++--- .../java_client/pagefactory/WidgetInterceptor.java | 2 +- .../pagefactory/WidgetListInterceptor.java | 2 +- .../appium/java_client/pagefactory/WithTimeout.java | 7 +++---- .../pagefactory/utils/WebDriverUnpackUtility.java | 6 +++--- .../io/appium/java_client/proxy/Interceptor.java | 12 ++++++------ .../remote/options/BaseMapOptionData.java | 8 ++++---- .../java_client/remote/options/BaseOptions.java | 2 +- .../java/io/appium/java_client/TestResources.java | 3 +++ src/test/java/io/appium/java_client/TestUtils.java | 3 +++ .../java_client/android/AndroidDriverTest.java | 7 +++---- .../android/AndroidLogcatListenerTest.java | 2 +- .../appium/java_client/android/BaseAndroidTest.java | 1 + .../appium/java_client/android/BaseEspressoTest.java | 1 + .../drivers/options/OptionsBuildingTest.java | 2 +- .../java/io/appium/java_client/ios/BaseIOSTest.java | 1 + .../java/io/appium/java_client/ios/IOSAlertTest.java | 4 ++-- .../java_client/ios/IOSSyslogListenerTest.java | 2 +- 31 files changed, 77 insertions(+), 60 deletions(-) diff --git a/config/checkstyle/appium-style.xml b/config/checkstyle/appium-style.xml index 2feb5eeff..630949b66 100755 --- a/config/checkstyle/appium-style.xml +++ b/config/checkstyle/appium-style.xml @@ -128,6 +128,7 @@ + @@ -198,6 +199,12 @@ + + + + + + @@ -208,4 +215,7 @@ + + + diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java index ead0a05d0..749a0204d 100644 --- a/src/main/java/io/appium/java_client/AppiumDriver.java +++ b/src/main/java/io/appium/java_client/AppiumDriver.java @@ -70,7 +70,7 @@ public class AppiumDriver extends RemoteWebDriver implements CanRememberExtensionPresence, HasSettings { - private static final ErrorHandler errorHandler = new ErrorHandler(new ErrorCodesMobile(), true); + private static final ErrorHandler ERROR_HANDLER = new ErrorHandler(new ErrorCodesMobile(), true); // frequently used command parameters private final URL remoteAddress; protected final RemoteLocationContext locationContext; @@ -89,7 +89,7 @@ public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) { super(executor, capabilities); this.executeMethod = new AppiumExecutionMethod(this); locationContext = new RemoteLocationContext(executeMethod); - super.setErrorHandler(errorHandler); + super.setErrorHandler(ERROR_HANDLER); this.remoteAddress = executor.getAddressOfRemoteServer(); } @@ -167,7 +167,7 @@ public AppiumDriver(URL remoteSessionAddress, String platformName, String automa setCommandExecutor(executor); this.executeMethod = new AppiumExecutionMethod(this); locationContext = new RemoteLocationContext(executeMethod); - super.setErrorHandler(errorHandler); + super.setErrorHandler(ERROR_HANDLER); this.remoteAddress = executor.getAddressOfRemoteServer(); setSessionId(sessionAddress.getId()); diff --git a/src/main/java/io/appium/java_client/CommandExecutionHelper.java b/src/main/java/io/appium/java_client/CommandExecutionHelper.java index 7abfef612..692f7cf0f 100644 --- a/src/main/java/io/appium/java_client/CommandExecutionHelper.java +++ b/src/main/java/io/appium/java_client/CommandExecutionHelper.java @@ -17,8 +17,6 @@ package io.appium.java_client; import com.google.common.collect.ImmutableMap; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import org.openqa.selenium.remote.Response; import javax.annotation.Nullable; @@ -28,9 +26,11 @@ import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT; -@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class CommandExecutionHelper { + private CommandExecutionHelper() { + } + @Nullable public static T execute( ExecutesMethod executesMethod, Map.Entry> keyValuePair diff --git a/src/main/java/io/appium/java_client/LogsEvents.java b/src/main/java/io/appium/java_client/LogsEvents.java index a29d9eecf..33f50d2db 100644 --- a/src/main/java/io/appium/java_client/LogsEvents.java +++ b/src/main/java/io/appium/java_client/LogsEvents.java @@ -63,8 +63,8 @@ default ServerEvents getEvents() { .stream() .map((Map cmd) -> new CommandEvent( (String) cmd.get("cmd"), - ((Long) cmd.get("startTime")), - ((Long) cmd.get("endTime")) + (Long) cmd.get("startTime"), + (Long) cmd.get("endTime") )) .collect(Collectors.toList()); diff --git a/src/main/java/io/appium/java_client/MobileCommand.java b/src/main/java/io/appium/java_client/MobileCommand.java index 721c854a7..d61a3ef01 100644 --- a/src/main/java/io/appium/java_client/MobileCommand.java +++ b/src/main/java/io/appium/java_client/MobileCommand.java @@ -38,6 +38,7 @@ * Most of these commands are platform-specific obsolete things and should eventually be replaced with * calls to corresponding `mobile:` extensions, so we don't abuse non-w3c APIs */ +@SuppressWarnings({"checkstyle:HideUtilityClassConstructor", "checkstyle:ConstantName"}) public class MobileCommand { //General @Deprecated @@ -434,7 +435,7 @@ public static ImmutableMap prepareArguments(String[] params, Object[] values) { ImmutableMap.Builder builder = ImmutableMap.builder(); for (int i = 0; i < params.length; i++) { - if (!StringUtils.isBlank(params[i]) && (values[i] != null)) { + if (!StringUtils.isBlank(params[i]) && values[i] != null) { builder.put(params[i], values[i]); } } diff --git a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java index 1bed116d7..562eb9172 100644 --- a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java +++ b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java @@ -214,8 +214,7 @@ public class AndroidMobileCommandHelper extends MobileCommand { String intentAction, String intentCategory, String intentFlags, String optionalIntentArguments, boolean stopApp) throws IllegalArgumentException { - checkArgument((!StringUtils.isBlank(appPackage) - && !StringUtils.isBlank(appActivity)), + checkArgument(!StringUtils.isBlank(appPackage) && !StringUtils.isBlank(appActivity), String.format("'%s' and '%s' are required.", "appPackage", "appActivity")); String targetWaitPackage = !StringUtils.isBlank(appWaitPackage) ? appWaitPackage : ""; diff --git a/src/main/java/io/appium/java_client/internal/CapabilityHelpers.java b/src/main/java/io/appium/java_client/internal/CapabilityHelpers.java index 5280b8e17..855a40cdb 100644 --- a/src/main/java/io/appium/java_client/internal/CapabilityHelpers.java +++ b/src/main/java/io/appium/java_client/internal/CapabilityHelpers.java @@ -16,8 +16,6 @@ package io.appium.java_client.internal; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import org.openqa.selenium.Capabilities; import javax.annotation.Nullable; @@ -28,10 +26,12 @@ import java.util.List; import java.util.function.Function; -@NoArgsConstructor(access = AccessLevel.PRIVATE) public class CapabilityHelpers { public static final String APPIUM_PREFIX = "appium:"; + private CapabilityHelpers() { + } + /** * Helper that is used for capability values retrieval. * Supports both prefixed W3C and "classic" capability names. diff --git a/src/main/java/io/appium/java_client/internal/Config.java b/src/main/java/io/appium/java_client/internal/Config.java index 83bfb7995..4413f28ab 100644 --- a/src/main/java/io/appium/java_client/internal/Config.java +++ b/src/main/java/io/appium/java_client/internal/Config.java @@ -11,7 +11,7 @@ public class Config { private static Config mainInstance = null; private static final String MAIN_CONFIG = "main.properties"; - private static final Map cache = new ConcurrentHashMap<>(); + private static final Map CACHE = new ConcurrentHashMap<>(); private final String configName; /** @@ -58,7 +58,7 @@ public T getValue(String key, Class valueType) { * @throws ClassCastException if the retrieved value cannot be cast to `valueType` type */ public Optional getOptionalValue(String key, Class valueType) { - final Properties cachedProps = cache.computeIfAbsent(configName, k -> { + final Properties cachedProps = CACHE.computeIfAbsent(configName, k -> { try (InputStream configFileStream = getClass().getClassLoader().getResourceAsStream(configName)) { final Properties p = new Properties(); p.load(configFileStream); diff --git a/src/main/java/io/appium/java_client/internal/ReflectionHelpers.java b/src/main/java/io/appium/java_client/internal/ReflectionHelpers.java index abe16a170..10375e2ad 100644 --- a/src/main/java/io/appium/java_client/internal/ReflectionHelpers.java +++ b/src/main/java/io/appium/java_client/internal/ReflectionHelpers.java @@ -16,15 +16,15 @@ package io.appium.java_client.internal; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import org.openqa.selenium.WebDriverException; import java.lang.reflect.Field; -@NoArgsConstructor(access = AccessLevel.PRIVATE) public class ReflectionHelpers { + private ReflectionHelpers() { + } + /** * Sets the given value to a private instance field. * diff --git a/src/main/java/io/appium/java_client/internal/SessionHelpers.java b/src/main/java/io/appium/java_client/internal/SessionHelpers.java index c028bdfb5..51371dbd1 100644 --- a/src/main/java/io/appium/java_client/internal/SessionHelpers.java +++ b/src/main/java/io/appium/java_client/internal/SessionHelpers.java @@ -16,9 +16,7 @@ package io.appium.java_client.internal; -import lombok.AccessLevel; import lombok.Data; -import lombok.NoArgsConstructor; import org.openqa.selenium.InvalidArgumentException; import org.openqa.selenium.WebDriverException; @@ -27,10 +25,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -@NoArgsConstructor(access = AccessLevel.PRIVATE) public class SessionHelpers { private static final Pattern SESSION = Pattern.compile("/session/([^/]+)"); + private SessionHelpers() { + } + @Data public static class SessionAddress { private final URL serverUrl; private final String id; diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java index 2d5daaa03..b0c8cd428 100644 --- a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java +++ b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java @@ -62,7 +62,7 @@ */ public class AppiumFieldDecorator implements FieldDecorator { - private static final List> availableElementClasses = ImmutableList.of( + private static final List> AVAILABLE_ELEMENT_CLASSES = ImmutableList.of( WebElement.class, RemoteWebElement.class ); @@ -169,7 +169,7 @@ protected boolean isDecoratableList(Field field) { List bounds = (listType instanceof TypeVariable) ? Arrays.asList(((TypeVariable) listType).getBounds()) : Collections.emptyList(); - return availableElementClasses.stream() + return AVAILABLE_ELEMENT_CLASSES.stream() .anyMatch(webElClass -> webElClass.equals(listType) || bounds.contains(webElClass)); } }; diff --git a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java index 23195e5ce..5cb10c9de 100644 --- a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java +++ b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java @@ -186,7 +186,7 @@ protected By buildMobileNativeBy() { @Override public boolean isLookupCached() { AnnotatedElement annotatedElement = annotatedElementContainer.getAnnotated(); - return (annotatedElement.getAnnotation(CacheLookup.class) != null); + return annotatedElement.getAnnotation(CacheLookup.class) != null; } private By returnMappedBy(By byDefault, By nativeAppBy) { diff --git a/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java b/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java index 9f8b59c17..e08f413dd 100644 --- a/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java +++ b/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java @@ -17,8 +17,6 @@ package io.appium.java_client.pagefactory; import io.appium.java_client.pagefactory.bys.ContentType; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; @@ -31,7 +29,6 @@ import static io.appium.java_client.remote.MobilePlatform.IOS; import static io.appium.java_client.remote.MobilePlatform.WINDOWS; -@NoArgsConstructor(access = AccessLevel.PRIVATE) class OverrideWidgetReader { private static final Class EMPTY = Widget.class; private static final String HTML = "html"; @@ -39,6 +36,9 @@ class OverrideWidgetReader { private static final String IOS_XCUIT_AUTOMATION = "iOSXCUITAutomation"; private static final String WINDOWS_AUTOMATION = "windowsAutomation"; + private OverrideWidgetReader() { + } + @SuppressWarnings("unchecked") private static Class getConvenientClass(Class declaredClass, AnnotatedElement annotatedElement, String method) { diff --git a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java index f5b310702..af09676f7 100644 --- a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java +++ b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java @@ -16,17 +16,17 @@ package io.appium.java_client.pagefactory; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import org.openqa.selenium.InvalidSelectorException; import org.openqa.selenium.StaleElementReferenceException; import java.lang.reflect.InvocationTargetException; -@NoArgsConstructor(access = AccessLevel.PRIVATE) class ThrowableUtil { private static final String INVALID_SELECTOR_PATTERN = "Invalid locator strategy:"; + private ThrowableUtil() { + } + protected static boolean isInvalidSelectorRootCause(Throwable e) { if (e == null) { return false; diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java index d00c6e3c9..bfc358bd8 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java @@ -67,7 +67,7 @@ protected Object getObject(WebElement element, Method method, Object[] args) thr ContentType type = getCurrentContentType(element); WebElement cachedElement = cachedElementReference == null ? null : cachedElementReference.get(); if (cachedElement == null || !cachedInstances.containsKey(type) - || (locator != null && !((CacheableLocator) locator).isLookUpCached()) + || locator != null && !((CacheableLocator) locator).isLookUpCached() ) { cachedElementReference = new WeakReference<>(element); diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java index 031a0e624..ff9983f8c 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java +++ b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java @@ -71,7 +71,7 @@ protected Object getObject(List elements, Method method, Object[] ar .filter(Objects::nonNull) .collect(Collectors.toList()); if (cachedElements.size() != cachedWidgets.size() - || (locator != null && !((CacheableLocator) locator).isLookUpCached())) { + || locator != null && !((CacheableLocator) locator).isLookUpCached()) { cachedWidgets.clear(); cachedElementReferences.clear(); diff --git a/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java b/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java index 0727bc2b3..0b04dadf2 100644 --- a/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java +++ b/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java @@ -16,9 +16,6 @@ package io.appium.java_client.pagefactory; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -46,8 +43,10 @@ */ ChronoUnit chronoUnit(); - @NoArgsConstructor(access = AccessLevel.PRIVATE) class DurationBuilder { + private DurationBuilder() { + } + static Duration build(WithTimeout withTimeout) { return Duration.of(withTimeout.time(), withTimeout.chronoUnit()); } diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java index 9df129930..6d31fcc5a 100644 --- a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java +++ b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java @@ -18,8 +18,6 @@ import io.appium.java_client.HasBrowserCheck; import io.appium.java_client.pagefactory.bys.ContentType; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import org.openqa.selenium.ContextAware; import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebDriver; @@ -33,10 +31,12 @@ import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; -@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class WebDriverUnpackUtility { private static final String NATIVE_APP_PATTERN = "NATIVE_APP"; + private WebDriverUnpackUtility() { + } + /** * This method extract an instance of {@link WebDriver} from the given {@link SearchContext}. * @param searchContext is an instance of {@link SearchContext}. It may be the instance of diff --git a/src/main/java/io/appium/java_client/proxy/Interceptor.java b/src/main/java/io/appium/java_client/proxy/Interceptor.java index aca474044..fa4d72405 100644 --- a/src/main/java/io/appium/java_client/proxy/Interceptor.java +++ b/src/main/java/io/appium/java_client/proxy/Interceptor.java @@ -16,8 +16,6 @@ package io.appium.java_client.proxy; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.Origin; import net.bytebuddy.implementation.bind.annotation.RuntimeType; @@ -31,9 +29,11 @@ import java.util.UUID; import java.util.concurrent.Callable; -@NoArgsConstructor(access = AccessLevel.PRIVATE) public class Interceptor { - private static final Logger logger = LoggerFactory.getLogger(Interceptor.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Interceptor.class); + + private Interceptor() { + } /** * A magic method used to wrap public method calls in classes @@ -64,7 +64,7 @@ public static Object intercept( } catch (NotImplementedException e) { // ignore } catch (Exception e) { - logger.atError() + LOGGER.atError() .addArgument(() -> self.getClass().getName()) .addArgument(method::getName) .log("Got an unexpected error in beforeCall listener of {}.{} method", e); @@ -110,7 +110,7 @@ public static Object intercept( } catch (NotImplementedException e) { // ignore } catch (Exception e) { - logger.atError() + LOGGER.atError() .addArgument(() -> self.getClass().getName()) .addArgument(method::getName) .log("Got an unexpected error in afterCall listener of {}.{} method", e); diff --git a/src/main/java/io/appium/java_client/remote/options/BaseMapOptionData.java b/src/main/java/io/appium/java_client/remote/options/BaseMapOptionData.java index a7b75e3d7..dc5ada3a5 100644 --- a/src/main/java/io/appium/java_client/remote/options/BaseMapOptionData.java +++ b/src/main/java/io/appium/java_client/remote/options/BaseMapOptionData.java @@ -26,7 +26,7 @@ public abstract class BaseMapOptionData> { private Map options; - private static final Gson gson = new Gson(); + private static final Gson GSON = new Gson(); public BaseMapOptionData() { } @@ -37,7 +37,7 @@ public BaseMapOptionData(Map options) { public BaseMapOptionData(String json) { //noinspection unchecked - this((Map) gson.fromJson(json, Map.class)); + this((Map) GSON.fromJson(json, Map.class)); } /** @@ -78,11 +78,11 @@ public Map toMap() { } public JsonObject toJson() { - return gson.toJsonTree(toMap()).getAsJsonObject(); + return GSON.toJsonTree(toMap()).getAsJsonObject(); } @Override public String toString() { - return gson.toJson(toMap()); + return GSON.toJson(toMap()); } } diff --git a/src/main/java/io/appium/java_client/remote/options/BaseOptions.java b/src/main/java/io/appium/java_client/remote/options/BaseOptions.java index 7ef52b7e4..dff4f5c44 100644 --- a/src/main/java/io/appium/java_client/remote/options/BaseOptions.java +++ b/src/main/java/io/appium/java_client/remote/options/BaseOptions.java @@ -96,7 +96,7 @@ public Platform getPlatformName() { } try { - return Platform.fromString((String.valueOf(cap))); + return Platform.fromString(String.valueOf(cap)); } catch (WebDriverException e) { return null; } diff --git a/src/test/java/io/appium/java_client/TestResources.java b/src/test/java/io/appium/java_client/TestResources.java index 9d188fb58..6928cdcaf 100644 --- a/src/test/java/io/appium/java_client/TestResources.java +++ b/src/test/java/io/appium/java_client/TestResources.java @@ -5,6 +5,9 @@ import static io.appium.java_client.TestUtils.resourcePathToLocalPath; public class TestResources { + private TestResources() { + } + public static Path apiDemosApk() { return resourcePathToLocalPath("apps/ApiDemos-debug.apk"); } diff --git a/src/test/java/io/appium/java_client/TestUtils.java b/src/test/java/io/appium/java_client/TestUtils.java index f2ed2792e..6a968a4e1 100644 --- a/src/test/java/io/appium/java_client/TestUtils.java +++ b/src/test/java/io/appium/java_client/TestUtils.java @@ -19,6 +19,9 @@ import java.util.function.Supplier; public class TestUtils { + private TestUtils() { + } + public static String getLocalIp4Address() throws SocketException, UnknownHostException { // https://stackoverflow.com/questions/9481865/getting-the-ip-address-of-the-current-machine-using-java try (final DatagramSocket socket = new DatagramSocket()) { diff --git a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java index 45f048272..095866e89 100644 --- a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java +++ b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java @@ -220,7 +220,7 @@ public void runAppInBackgroundTest() { long time = System.currentTimeMillis(); driver.runAppInBackground(Duration.ofSeconds(4)); long timeAfter = System.currentTimeMillis(); - assert (timeAfter - time > 3000); + assert timeAfter - time > 3000; } @Test @@ -237,9 +237,8 @@ public void testApplicationsManagement() throws InterruptedException { @Test public void pullFileTest() { - byte[] data = - driver.pullFile("/data/system/users/userlist.xml"); - assert (data.length > 0); + byte[] data = driver.pullFile("/data/system/users/userlist.xml"); + assert data.length > 0; } @Test diff --git a/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java b/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java index e7a40383c..618da2e32 100644 --- a/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java +++ b/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java @@ -16,7 +16,7 @@ public void verifyLogcatListenerCanBeAssigned() { final Semaphore messageSemaphore = new Semaphore(1); final Duration timeout = Duration.ofSeconds(15); - driver.addLogcatMessagesListener((msg) -> messageSemaphore.release()); + driver.addLogcatMessagesListener(msg -> messageSemaphore.release()); driver.addLogcatConnectionListener(() -> System.out.println("Connected to the web socket")); driver.addLogcatDisconnectionListener(() -> System.out.println("Disconnected from the web socket")); driver.addLogcatErrorsListener(Throwable::printStackTrace); diff --git a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java index 28c1c95f4..21142e631 100644 --- a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java +++ b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java @@ -25,6 +25,7 @@ import static io.appium.java_client.TestResources.apiDemosApk; +@SuppressWarnings("checkstyle:HideUtilityClassConstructor") public class BaseAndroidTest { public static final String APP_ID = "io.appium.android.apis"; protected static final int PORT = 4723; diff --git a/src/test/java/io/appium/java_client/android/BaseEspressoTest.java b/src/test/java/io/appium/java_client/android/BaseEspressoTest.java index cfc690021..d312587bd 100644 --- a/src/test/java/io/appium/java_client/android/BaseEspressoTest.java +++ b/src/test/java/io/appium/java_client/android/BaseEspressoTest.java @@ -24,6 +24,7 @@ import static io.appium.java_client.TestResources.apiDemosApk; +@SuppressWarnings("checkstyle:HideUtilityClassConstructor") public class BaseEspressoTest { private static AppiumDriverLocalService service; diff --git a/src/test/java/io/appium/java_client/drivers/options/OptionsBuildingTest.java b/src/test/java/io/appium/java_client/drivers/options/OptionsBuildingTest.java index 04574448c..7a22ffd93 100644 --- a/src/test/java/io/appium/java_client/drivers/options/OptionsBuildingTest.java +++ b/src/test/java/io/appium/java_client/drivers/options/OptionsBuildingTest.java @@ -67,7 +67,7 @@ public void canBuildXcuiTestOptions() throws MalformedURLException { assertEquals(Duration.ofSeconds(10), options.getNewCommandTimeout().orElse(null)); assertEquals(new URL("http://localhost:8000"), options.getWdaBaseUrl().orElse(null)); assertNotNull(options.getPermissions() - .map((v) -> v.getAppPermissions("com.apple.MobileSafari")) + .map(v -> v.getAppPermissions("com.apple.MobileSafari")) .orElse(null)); assertEquals(10L, (long) options.getSafariSocketChunkSize().orElse(0)); assertEquals(1L, options.getCommandTimeouts().orElse(null).left() diff --git a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java index fe5764e7b..cc571b6fa 100644 --- a/src/test/java/io/appium/java_client/ios/BaseIOSTest.java +++ b/src/test/java/io/appium/java_client/ios/BaseIOSTest.java @@ -22,6 +22,7 @@ import java.time.Duration; +@SuppressWarnings("checkstyle:HideUtilityClassConstructor") public class BaseIOSTest { protected static AppiumDriverLocalService service; diff --git a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java index 7e1fb6528..7d91e596a 100644 --- a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java @@ -38,16 +38,16 @@ public class IOSAlertTest extends AppIOSTest { private static final Duration ALERT_TIMEOUT = Duration.ofSeconds(5); private static final int CLICK_RETRIES = 2; + private static final String IOS_AUTOMATION_TEXT = "show alert"; private final WebDriverWait waiter = new WebDriverWait(driver, ALERT_TIMEOUT); - private static final String iOSAutomationText = "show alert"; private void ensureAlertPresence() { int retry = 0; // CI might not be performant enough, so we need to retry while (true) { try { - driver.findElement(AppiumBy.accessibilityId(iOSAutomationText)).click(); + driver.findElement(AppiumBy.accessibilityId(IOS_AUTOMATION_TEXT)).click(); } catch (WebDriverException e) { // ignore } diff --git a/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java b/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java index 34429e5df..b2c4c96bd 100644 --- a/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java @@ -16,7 +16,7 @@ public void verifySyslogListenerCanBeAssigned() { final Semaphore messageSemaphore = new Semaphore(1); final Duration timeout = Duration.ofSeconds(15); - driver.addSyslogMessagesListener((msg) -> messageSemaphore.release()); + driver.addSyslogMessagesListener(msg -> messageSemaphore.release()); driver.addSyslogConnectionListener(() -> System.out.println("Connected to the web socket")); driver.addSyslogDisconnectionListener(() -> System.out.println("Disconnected from the web socket")); driver.addSyslogErrorsListener(Throwable::printStackTrace);