use java pattern for setgeolocationoverrideparameters

Author: Delta456

java/src/org/openqa/selenium/bidi/emulation/SetGeolocationOverrideParameters.java

@@ -8,7 +8,7 @@
 //
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
-// Unless required by applicable law or agreed to in writing,
+// Unless required by applicable law or agreed in writing,
 // software distributed under the License is distributed on an
 // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 // KIND, either express or implied.  See the License for the
@@ -22,56 +22,51 @@
 import java.util.Map;
 
 public class SetGeolocationOverrideParameters {
-  private final GeolocationCoordinates coordinates;
-  private final GeolocationPositionError error;
-  private final List<String> contexts;
-  private final List<String> userContexts;
+  private final Map<String, Object> map = new HashMap<>();
 
-  public SetGeolocationOverrideParameters(
-      GeolocationCoordinates coordinates,
-      GeolocationPositionError error,
-      List<String> contexts,
-      List<String> userContexts) {
-
-    this.coordinates = coordinates;
-    this.error = error;
-    this.contexts = contexts;
-    this.userContexts = userContexts;
-
-    if (this.coordinates != null && this.error != null) {
-      throw new IllegalArgumentException("Cannot specify both coordinates and error");
-    }
-    if (this.contexts != null && this.userContexts != null) {
-      throw new IllegalArgumentException("Cannot specify both contexts and userContexts");
+  // Constructor for coordinates - must specify either contexts or userContexts later
+  public SetGeolocationOverrideParameters(GeolocationCoordinates coordinates) {
+    if (coordinates == null) {
+      throw new IllegalArgumentException("GeolocationCoordinates cannot be null");
     }
+    map.put("coordinates", coordinates.toMap());
+  }
 
-    if (this.contexts == null && this.userContexts == null) {
-      throw new IllegalArgumentException("Must specify either contexts or userContexts");
+  // Constructor for error - must specify either contexts or userContexts later
+  public SetGeolocationOverrideParameters(GeolocationPositionError error) {
+    if (error == null) {
+      throw new IllegalArgumentException("GeolocationPositionError cannot be null");
     }
+    map.put("error", error.toMap());
   }
 
-  public SetGeolocationOverrideParameters(
-      GeolocationCoordinates coordinates, GeolocationPositionError error) {
-    this(coordinates, error, null, null);
+  public SetGeolocationOverrideParameters contexts(List<String> contexts) {
+    if (contexts == null || contexts.isEmpty()) {
+      throw new IllegalArgumentException("Contexts cannot be null or empty");
+    }
+    if (map.containsKey("userContexts")) {
+      throw new IllegalArgumentException("Cannot specify both contexts and userContexts");
+    }
+    map.put("contexts", contexts);
+    return this;
   }
 
-  public Map<String, Object> toMap() {
-    Map<String, Object> param = new HashMap<>();
-
-    if (this.coordinates != null) {
-      param.put("coordinates", this.coordinates.toMap());
+  public SetGeolocationOverrideParameters userContexts(List<String> userContexts) {
+    if (userContexts == null || userContexts.isEmpty()) {
+      throw new IllegalArgumentException("User contexts cannot be null or empty");
     }
-
-    if (this.error != null) {
-      param.put("error", this.error.toMap());
+    if (map.containsKey("contexts")) {
+      throw new IllegalArgumentException("Cannot specify both contexts and userContexts");
     }
+    map.put("userContexts", userContexts);
+    return this;
+  }
 
-    if (this.contexts != null) {
-      param.put("contexts", this.contexts);
-    } else {
-      param.put("userContexts", this.userContexts);
+  public Map<String, Object> toMap() {
+    // Validate that either contexts or userContexts is set
+    if (!map.containsKey("contexts") && !map.containsKey("userContexts")) {
+      throw new IllegalStateException("Must specify either contexts or userContexts");
     }
-
-    return Map.copyOf(param);
+    return Map.copyOf(map);
   }
 }

java/test/org/openqa/selenium/bidi/emulation/EmulationTest.java

@@ -85,7 +85,7 @@ void canSetGeolocationOverrideWithCoordinatesInContext() {
     Emulation emul = new Emulation(driver);
     GeolocationCoordinates coords = new GeolocationCoordinates(37.7749, -122.4194);
     emul.setGeolocationOverride(
-        new SetGeolocationOverrideParameters(coords, null, List.of(contextId), null));
+        new SetGeolocationOverrideParameters(coords).contexts(List.of(contextId)));
 
     Object result = getBrowserGeolocation(driver, null, origin);
     Map<String, Object> r = ((Map<String, Object>) result);
@@ -121,8 +121,8 @@ void canSetGeolocationOverrideWithMultipleUserContexts() {
 
     Emulation emulation = new Emulation(driver);
     emulation.setGeolocationOverride(
-        new SetGeolocationOverrideParameters(
-            coords, null, null, List.of(userContext1, userContext2)));
+        new SetGeolocationOverrideParameters(coords)
+            .userContexts(List.of(userContext1, userContext2)));
 
     driver.switchTo().window(context1.getId());
     String url1 = appServer.whereIsSecure("blank.html");
@@ -187,7 +187,7 @@ void canSetGeolocationOverrideWithError() {
     GeolocationPositionError error = new GeolocationPositionError();
     Emulation emul = new Emulation(driver);
     emul.setGeolocationOverride(
-        new SetGeolocationOverrideParameters(null, error, List.of(contextId), null));
+        new SetGeolocationOverrideParameters(error).contexts(List.of(contextId)));
 
     Object result = getBrowserGeolocation(driver, null, origin);
     Map<String, Object> r = ((Map<String, Object>) result);