CR fixes 2

Author: sudharsan-selvaraj

src/e2eFlutterTest/java/io/appium/java_client/android/BaseFlutterTest.java

@@ -2,8 +2,8 @@
 
 import io.appium.java_client.AppiumBy;
 import io.appium.java_client.android.options.UiAutomator2Options;
-import io.appium.java_client.flutter.FlutterDriver;
 import io.appium.java_client.flutter.FlutterDriverOptions;
+import io.appium.java_client.flutter.FlutterIntegrationTestDriver;
 import io.appium.java_client.flutter.android.FlutterAndroidDriver;
 import io.appium.java_client.flutter.commands.ScrollParameter;
 import io.appium.java_client.flutter.ios.FlutterIOSDriver;
@@ -32,7 +32,7 @@ class BaseFlutterTest {
     protected static final int PORT = 4723;
 
     private static AppiumDriverLocalService service;
-    protected static FlutterDriver driver;
+    protected static FlutterIntegrationTestDriver driver;
     protected static final By LOGIN_BUTTON = AppiumBy.flutterText("Login");
 
     /**

src/main/java/io/appium/java_client/flutter/FlutterDriverOptions.java

@@ -20,28 +20,32 @@ public class FlutterDriverOptions extends BaseOptions<FlutterDriverOptions> impl
         SupportsFlutterElementWaitTimeoutOption<FlutterDriverOptions> {
 
     public FlutterDriverOptions() {
-        setCommonOptions();
+        setDefaultOptions();
     }
 
     public FlutterDriverOptions(Capabilities source) {
         super(source);
-        setCommonOptions();
+        setDefaultOptions();
     }
 
     public FlutterDriverOptions(Map<String, ?> source) {
         super(source);
-        setCommonOptions();
+        setDefaultOptions();
     }
 
     public FlutterDriverOptions setUiAutomator2Options(UiAutomator2Options uiAutomator2Options) {
-        return merge(uiAutomator2Options);
+        return setDefaultOptions(merge(uiAutomator2Options));
     }
 
     public FlutterDriverOptions setXCUITestOptions(XCUITestOptions xcuiTestOptions) {
-        return merge(xcuiTestOptions);
+        return setDefaultOptions(merge(xcuiTestOptions));
     }
 
-    private void setCommonOptions() {
-        setAutomationName(AutomationName.FLUTTER_INTEGRATION);
+    private void setDefaultOptions() {
+        setDefaultOptions(this);
+    }
+
+    private FlutterDriverOptions setDefaultOptions(FlutterDriverOptions flutterDriverOptions) {
+        return flutterDriverOptions.setAutomationName(AutomationName.FLUTTER_INTEGRATION);
     }
 }

src/main/java/io/appium/java_client/flutter/FlutterDriver.java renamed to src/main/java/io/appium/java_client/flutter/FlutterIntegrationTestDriver.java

@@ -15,7 +15,7 @@
  * @see SupportsScrollingOfFlutterElements
  * @see SupportsWaitingForFlutterElements
  */
-public interface FlutterDriver extends
+public interface FlutterIntegrationTestDriver extends
         WebDriver,
         SupportsGestureOnFlutterElements,
         SupportsScrollingOfFlutterElements,

src/main/java/io/appium/java_client/flutter/android/FlutterAndroidDriver.java

@@ -2,7 +2,7 @@
 
 import io.appium.java_client.AppiumClientConfig;
 import io.appium.java_client.android.AndroidDriver;
-import io.appium.java_client.flutter.FlutterDriver;
+import io.appium.java_client.flutter.FlutterIntegrationTestDriver;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
 import org.openqa.selenium.Capabilities;
@@ -15,7 +15,7 @@
 /**
  * Custom AndroidDriver implementation with additional Flutter-specific capabilities.
  */
-public class FlutterAndroidDriver extends AndroidDriver implements FlutterDriver {
+public class FlutterAndroidDriver extends AndroidDriver implements FlutterIntegrationTestDriver {
 
     public FlutterAndroidDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, capabilities);

src/main/java/io/appium/java_client/flutter/ios/FlutterIOSDriver.java

@@ -1,7 +1,7 @@
 package io.appium.java_client.flutter.ios;
 
 import io.appium.java_client.AppiumClientConfig;
-import io.appium.java_client.flutter.FlutterDriver;
+import io.appium.java_client.flutter.FlutterIntegrationTestDriver;
 import io.appium.java_client.ios.IOSDriver;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import io.appium.java_client.service.local.AppiumServiceBuilder;
@@ -15,7 +15,7 @@
 /**
  * Custom IOSDriver implementation with additional Flutter-specific capabilities.
  */
-public class FlutterIOSDriver extends IOSDriver implements FlutterDriver {
+public class FlutterIOSDriver extends IOSDriver implements FlutterIntegrationTestDriver {
 
     public FlutterIOSDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, capabilities);

src/main/java/io/appium/java_client/flutter/options/SupportsFlutterSystemPortOption.java

@@ -18,7 +18,7 @@ public interface SupportsFlutterSystemPortOption<T extends BaseOptions<T>> exten
      * @param flutterSystemPort is the port number
      * @return self instance for chaining.
      */
-    default T setFlutterSystemPort(Integer flutterSystemPort) {
+    default T setFlutterSystemPort(int flutterSystemPort) {
         return amend(FLUTTER_SYSTEM_PORT_OPTION, flutterSystemPort);
     }