Skip to content

Commit 9776116

Browse files
committed
refactor\!: drop Appium FindsBy* iterfaces
1 parent 0be6ac3 commit 9776116

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+131
-1436
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@
6868
*/
6969
@SuppressWarnings("unchecked")
7070
public class AppiumDriver<T extends WebElement>
71-
extends DefaultGenericMobileDriver<T> implements ComparesImages, FindsByImage<T>, FindsByCustom<T>,
72-
ExecutesDriverScript, LogsEvents, HasSettings {
71+
extends DefaultGenericMobileDriver<T> implements ComparesImages, ExecutesDriverScript, LogsEvents, HasSettings {
7372

7473
private static final ErrorHandler errorHandler = new ErrorHandler(new ErrorCodesMobile(), true);
7574
// frequently used command parameters
@@ -174,16 +173,6 @@ public List<T> findElements(By by) {
174173
return super.findElements(by);
175174
}
176175

177-
@Override
178-
public List<T> findElements(String by, String using) {
179-
return super.findElements(by, using);
180-
}
181-
182-
@Override
183-
public List<T> findElementsByAccessibilityId(String using) {
184-
return super.findElementsByAccessibilityId(using);
185-
}
186-
187176
@Override
188177
public ExecuteMethod getExecuteMethod() {
189178
return executeMethod;

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,10 @@ public DefaultGenericMobileDriver(CommandExecutor executor, Capabilities desired
4848
return super.findElements(by);
4949
}
5050

51-
@Override public List findElements(String by, String using) {
52-
return super.findElements(by, using);
53-
}
54-
5551
@Override public T findElement(By by) {
5652
return (T) super.findElement(by);
5753
}
5854

59-
@Override public T findElement(String by, String using) {
60-
return (T) super.findElement(by, using);
61-
}
62-
6355
@Override
6456
public String toString() {
6557
Capabilities capabilities = getCapabilities();

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
import java.util.Map;
2929

3030
@SuppressWarnings({"unchecked", "rawtypes"})
31-
abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteWebElement
32-
implements FindsByFluentSelector<T>, FindsByAccessibilityId<T>, ExecutesMethod {
31+
abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteWebElement implements ExecutesMethod {
3332

3433
@Override public Response execute(String driverCommand, Map<String, ?> parameters) {
3534
return super.execute(driverCommand, parameters);
@@ -43,18 +42,10 @@ abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteW
4342
return super.findElements(by);
4443
}
4544

46-
@Override public List findElements(String by, String using) {
47-
return super.findElements(by, using);
48-
}
49-
5045
@Override public T findElement(By by) {
5146
return (T) super.findElement(by);
5247
}
5348

54-
@Override public T findElement(String by, String using) {
55-
return (T) super.findElement(by, using);
56-
}
57-
5849
/**
5950
* {@inheritDoc}
6051
*

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 0 additions & 53 deletions
This file was deleted.

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)