Java code conventions fixes

Author: ashwithpoojary98

src/main/java/io/appium/java_client/AppiumBy.java

@@ -16,7 +16,9 @@
 
 package io.appium.java_client;
 
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.Validate;
 import org.openqa.selenium.By;
 import org.openqa.selenium.By.Remotable;
@@ -25,6 +27,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public abstract class AppiumBy extends By implements Remotable {
 
@@ -51,9 +54,9 @@ protected AppiumBy(String selector, String locatorString, String locatorName) {
 
     /**
      * About Android accessibility
-     * https://developer.android.com/intl/ru/training/accessibility/accessible-app.html
+     * <a href="https://developer.android.com/intl/ru/training/accessibility/accessible-app.html">https://developer.android.com/intl/ru/training/accessibility/accessible-app.html</a>
      * About iOS accessibility
-     * https://developer.apple.com/library/ios/documentation/UIKit/Reference/
+     * <a href="https://developer.apple.com/library/ios/documentation/UIKit/Reference/">https://developer.apple.com/library/ios/documentation/UIKit/Reference/</a>
      * UIAccessibilityIdentification_Protocol/index.html
      * @param accessibilityId id is a convenient UI automation accessibility Id.
      * @return an instance of {@link AppiumBy.ByAndroidUIAutomator}
@@ -74,7 +77,7 @@ public static By androidDataMatcher(final String dataMatcherString) {
     }
 
     /**
-     * Refer to https://developer.android.com/training/testing/ui-automator
+     * Refer to <a href="https://developer.android.com/training/testing/ui-automator">https://developer.android.com/training/testing/ui-automator</a>
      * @param uiautomatorText is Android UIAutomator string
      * @return an instance of {@link AppiumBy.ByAndroidUIAutomator}
      */
@@ -253,6 +256,20 @@ protected ByIosNsPredicate(String locatorString) {
             super("-ios predicate string", locatorString, "iOSNsPredicate");
         }
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        AppiumBy appiumBy = (AppiumBy) o;
+        return Objects.equals(remoteParameters, appiumBy.remoteParameters) && Objects.equals(locatorName, appiumBy.locatorName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), remoteParameters, locatorName);
+    }
 }
 
 

src/main/java/io/appium/java_client/CommandExecutionHelper.java

@@ -17,6 +17,8 @@
 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;
@@ -26,6 +28,7 @@
 
 import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class CommandExecutionHelper {
 
     @Nullable

src/main/java/io/appium/java_client/ErrorCodesMobile.java

@@ -43,6 +43,7 @@ public class ErrorCodesMobile extends ErrorCodes {
     * @param statusCode The status code to convert.
     * @return The exception type that corresponds to the provided status
     */
+    @Override
     public Class<? extends WebDriverException> getExceptionType(int statusCode) {
         switch (statusCode) {
             case NO_SUCH_CONTEXT:
@@ -60,6 +61,7 @@ public Class<? extends WebDriverException> getExceptionType(int statusCode) {
      * @return The exception type that corresponds to the provided error message or {@code null} if
      *     there are no matching mobile exceptions.
      */
+    @Override
     public Class<? extends WebDriverException> getExceptionType(String message) {
         for (Map.Entry<Integer, String> entry : statusToState.entrySet()) {
             if (message.contains(entry.getValue())) {
@@ -75,6 +77,7 @@ public Class<? extends WebDriverException> getExceptionType(String message) {
     * @param thrown The thrown error.
     * @return The corresponding status code for the given thrown error.
     */
+    @Override
     public int toStatusCode(Throwable thrown) {
         if (thrown instanceof NoSuchContextException) {
             return NO_SUCH_CONTEXT;

src/main/java/io/appium/java_client/InteractsWithApps.java

@@ -75,7 +75,7 @@ default void installApp(String appPath, @Nullable BaseInstallApplicationOptions
             Map args = ImmutableMap.builder()
                     .put("appPath", appPath)
                     .putAll(Optional.ofNullable(options).map(
-                            (opts) -> ImmutableMap.of("options", opts.build())
+                            opts -> ImmutableMap.of("options", opts.build())
                     ).orElseGet(ImmutableMap::of))
                     .build();
             CommandExecutionHelper.execute(
@@ -169,7 +169,7 @@ default boolean removeApp(String bundleId, @Nullable BaseRemoveApplicationOption
             Map args = ImmutableMap.builder()
                     .put("bundleId", bundleId)
                     .putAll(Optional.ofNullable(options).map(
-                            (opts) -> ImmutableMap.of("options", opts.build())
+                            opts -> ImmutableMap.of("options", opts.build())
                     ).orElseGet(ImmutableMap::of))
                     .build();
             //noinspection RedundantCast
@@ -214,7 +214,7 @@ default void activateApp(String bundleId, @Nullable BaseActivateApplicationOptio
             Map args = ImmutableMap.builder()
                     .put("bundleId", bundleId)
                     .putAll(Optional.ofNullable(options).map(
-                            (opts) -> ImmutableMap.of("options", opts.build())
+                            opts -> ImmutableMap.of("options", opts.build())
                     ).orElseGet(ImmutableMap::of))
                     .build();
             CommandExecutionHelper.execute(
@@ -290,7 +290,7 @@ default boolean terminateApp(String bundleId, @Nullable BaseTerminateApplication
             Map args = ImmutableMap.builder()
                     .put("bundleId", bundleId)
                     .putAll(Optional.ofNullable(options).map(
-                            (opts) -> ImmutableMap.of("options", opts.build())
+                            opts -> ImmutableMap.of("options", opts.build())
                     ).orElseGet(ImmutableMap::of))
                     .build();
             //noinspection RedundantCast

src/main/java/io/appium/java_client/LocksDevice.java

@@ -64,7 +64,7 @@ default void unlockDevice() {
         final String extName = "mobile: unlock";
         try {
             //noinspection ConstantConditions
-            if (!(Boolean) CommandExecutionHelper.executeScript(assertExtensionExists(extName), "mobile: isLocked")) {
+            if (!Boolean.parseBoolean(CommandExecutionHelper.executeScript(assertExtensionExists(extName), "mobile: isLocked"))) {
                 return;
             }
             CommandExecutionHelper.executeScript(this, extName);

src/main/java/io/appium/java_client/ScreenshotState.java

@@ -175,7 +175,7 @@ private ScreenshotState checkState(Function<Double, Boolean> checkerFunc, Durati
      * @throws ScreenshotComparisonError   if {@link #remember()} method has not been invoked yet
      */
     public ScreenshotState verifyChanged(Duration timeout, double minScore) {
-        return checkState((x) -> x < minScore, timeout);
+        return checkState(x -> x < minScore, timeout);
     }
 
     /**
@@ -190,7 +190,7 @@ public ScreenshotState verifyChanged(Duration timeout, double minScore) {
      * @throws ScreenshotComparisonError   if {@link #remember()} method has not been invoked yet
      */
     public ScreenshotState verifyNotChanged(Duration timeout, double minScore) {
-        return checkState((x) -> x >= minScore, timeout);
+        return checkState(x -> x >= minScore, timeout);
     }
 
     /**

src/main/java/io/appium/java_client/Setting.java

@@ -65,6 +65,7 @@ public enum Setting {
         this.name = name;
     }
 
+    @Override
     public String toString() {
         return this.name;
     }

src/main/java/io/appium/java_client/android/options/app/IntentOptions.java

@@ -261,7 +261,7 @@ public IntentOptions withEi(Map<String, Integer> ei) {
     private <T> Map<String, T> convertMapValues(Map<String, Object> map, Function<String, T> converter) {
         return map.entrySet().stream()
                 .collect(Collectors.toMap(
-                        Map.Entry::getKey, (entry) -> converter.apply(String.valueOf(entry.getValue())))
+                        Map.Entry::getKey, entry -> converter.apply(String.valueOf(entry.getValue())))
                 );
     }
 
@@ -272,7 +272,7 @@ private <T> Map<String, T> convertMapValues(Map<String, Object> map, Function<St
      */
     public Optional<Map<String, Integer>> getEi() {
         Optional<Map<String, Object>> value = getOptionValue("ei");
-        return value.map((v) -> convertMapValues(v, Integer::parseInt));
+        return value.map(v -> convertMapValues(v, Integer::parseInt));
     }
 
     /**
@@ -292,7 +292,7 @@ public IntentOptions withEl(Map<String, Long> el) {
      */
     public Optional<Map<String, Long>> getEl() {
         Optional<Map<String, Object>> value = getOptionValue("el");
-        return value.map((v) -> convertMapValues(v, Long::parseLong));
+        return value.map(v -> convertMapValues(v, Long::parseLong));
     }
 
     /**
@@ -312,7 +312,7 @@ public IntentOptions withEf(Map<String, Float> ef) {
      */
     public Optional<Map<String, Float>> getEf() {
         Optional<Map<String, Object>> value = getOptionValue("ef");
-        return value.map((v) -> convertMapValues(v, Float::parseFloat));
+        return value.map(v -> convertMapValues(v, Float::parseFloat));
     }
 
     /**
@@ -356,7 +356,7 @@ public Optional<Map<String, String>> getEcn() {
     private static Map<String, String> mergeValues(Map<String, ?> map) {
         return map.entrySet().stream()
                 .collect(
-                        Collectors.toMap(Map.Entry::getKey, (entry) -> ((List<?>) entry.getValue()).stream()
+                        Collectors.toMap(Map.Entry::getKey, entry -> ((List<?>) entry.getValue()).stream()
                                 .map(String::valueOf)
                                 .collect(Collectors.joining(",")))
                 );

src/main/java/io/appium/java_client/android/options/app/SupportsActivityOptionsOption.java

@@ -48,6 +48,6 @@ default T setActivityOptions(ActivityOptions options) {
     default Optional<ActivityOptions> getActivityOptions() {
         //noinspection unchecked
         return Optional.ofNullable(getCapability(ACTIVITY_OPTIONS_OPTION))
-                .map((v) -> new ActivityOptions((Map<String, Object>) v));
+                .map(v -> new ActivityOptions((Map<String, Object>) v));
     }
 }

src/main/java/io/appium/java_client/android/options/app/SupportsIntentOptionsOption.java

@@ -48,6 +48,6 @@ default T setIntentOptions(IntentOptions options) {
     default Optional<IntentOptions> getIntentOptions() {
         //noinspection unchecked
         return Optional.ofNullable(getCapability(INTENT_OPTIONS_OPTION))
-                .map((v) -> new IntentOptions((Map<String, Object>) v));
+                .map(v -> new IntentOptions((Map<String, Object>) v));
     }
 }