Replace GSON with native JSON serializer

Author: sudharsan-selvaraj

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

@@ -160,4 +160,36 @@ void testCameraMocking() throws IOException {
         driver.findElement(AppiumBy.flutterText("PICK")).click();
         assertTrue(driver.findElement(AppiumBy.flutterText("Success!")).isDisplayed());
     }
+
+    @Test
+    void testScrollTillVisibleForAncestor() {
+        WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
+        loginButton.click();
+        openScreen("Nested Scroll");
+
+        AppiumBy.FlutterBy ancestorBy = AppiumBy.flutterAncestor(
+                AppiumBy.flutterText("Child 2"),
+                AppiumBy.flutterKey("parent_card_4")
+        );
+
+        assertEquals(0, driver.findElements(ancestorBy).size());
+        driver.scrollTillVisible(new ScrollParameter(ancestorBy));
+        assertEquals(1, driver.findElements(ancestorBy).size());
+    }
+
+    @Test
+    void testScrollTillVisibleForDescendant() {
+        WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
+        loginButton.click();
+        openScreen("Nested Scroll");
+
+        AppiumBy.FlutterBy descendantBy = AppiumBy.flutterDescendant(
+                AppiumBy.flutterKey("parent_card_4"),
+                AppiumBy.flutterText("Child 2")
+        );
+
+        assertEquals(0, driver.findElements(descendantBy).size());
+        driver.scrollTillVisible(new ScrollParameter(descendantBy));
+        assertEquals(1, driver.findElements(descendantBy).size());
+    }
 }

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

@@ -24,6 +24,7 @@
 import org.openqa.selenium.By.Remotable;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.json.Json;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -383,7 +384,7 @@ protected FlutterBy(String selector, String locatorString, String locatorName) {
     }
 
     public abstract static class FlutterByHierarchy extends FlutterBy {
-        private static final Gson GSON = new Gson();
+        private static final Json json = new Json();
 
         protected FlutterByHierarchy(
                 String selector,
@@ -404,7 +405,7 @@ static String formatLocator(FlutterBy of, FlutterBy matching, Map<String, Object
             locator.put("of", parseFlutterLocator(of));
             locator.put("matching", parseFlutterLocator(matching));
             locator.put("parameters", properties);
-            return GSON.toJson(locator);
+            return json.toJson(locator);
         }
     }