chore: Deprecate obsolete TouchAction helpers

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

@@ -17,6 +17,7 @@
 package io.appium.java_client;
 
 import com.google.common.base.Preconditions;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.openqa.selenium.By;
 import org.openqa.selenium.By.Remotable;
@@ -25,10 +26,10 @@
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 
+@EqualsAndHashCode(callSuper = true)
 public abstract class AppiumBy extends By implements Remotable {
 
     @Getter private final Parameters remoteParameters;
@@ -256,27 +257,4 @@ 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/pagefactory/bys/ContentMappedBy.java

@@ -16,18 +16,19 @@
 
 package io.appium.java_client.pagefactory.bys;
 
+import lombok.EqualsAndHashCode;
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
 
 import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
 import static java.util.Objects.requireNonNull;
 
+@EqualsAndHashCode(callSuper = true)
 public class ContentMappedBy extends By {
     private final Map<ContentType, By> map;
     private ContentType currentContent = NATIVE_MOBILE_SPECIFIC;
@@ -62,24 +63,4 @@ public List<WebElement> findElements(SearchContext context) {
     public String toString() {
         return map.get(currentContent).toString();
     }
-
-    @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;
-        }
-        ContentMappedBy that = (ContentMappedBy) o;
-        return Objects.equals(map, that.map) && currentContent == that.currentContent;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), map, currentContent);
-    }
 }

src/main/java/io/appium/java_client/touch/ActionOptions.java

@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@Deprecated
 public abstract class ActionOptions<T extends ActionOptions<T>> {
     /**
      * This method is automatically called before building

src/main/java/io/appium/java_client/touch/LongPressOptions.java

@@ -25,6 +25,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.Optional.ofNullable;
 
+@Deprecated
 public class LongPressOptions extends AbstractOptionCombinedWithPosition<LongPressOptions> {
     protected Duration duration = null;
 

src/main/java/io/appium/java_client/touch/TapOptions.java

@@ -23,6 +23,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Optional.ofNullable;
 
+@Deprecated
 public class TapOptions extends AbstractOptionCombinedWithPosition<TapOptions> {
     private Integer tapsCount = null;
 

src/main/java/io/appium/java_client/touch/WaitOptions.java

@@ -23,6 +23,7 @@
 import static java.time.Duration.ofMillis;
 import static java.util.Objects.requireNonNull;
 
+@Deprecated
 public class WaitOptions extends ActionOptions<WaitOptions> {
     protected Duration duration = ofMillis(0);
 

src/main/java/io/appium/java_client/touch/offset/AbstractOptionCombinedWithPosition.java

@@ -6,6 +6,7 @@
 
 import static java.util.Optional.ofNullable;
 
+@Deprecated
 public abstract class AbstractOptionCombinedWithPosition<T extends AbstractOptionCombinedWithPosition<T>>
         extends ActionOptions<AbstractOptionCombinedWithPosition<T>> {
     private ActionOptions<?> positionOption;