From ca15a17230bf6de01b3dad44c0525036ac038d47 Mon Sep 17 00:00:00 2001 From: Puja Jagani Date: Tue, 10 Oct 2023 16:38:07 +0530 Subject: [PATCH] [java] Use Java Map instead of Guava Immutable Map in Chromium package --- .../org/openqa/selenium/chromium/AddHasCasting.java | 10 ++++------ java/src/org/openqa/selenium/chromium/AddHasCdp.java | 5 ++--- .../org/openqa/selenium/chromium/AddHasLaunchApp.java | 5 ++--- .../selenium/chromium/AddHasNetworkConditions.java | 8 +++----- .../openqa/selenium/chromium/AddHasPermissions.java | 7 ++----- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/java/src/org/openqa/selenium/chromium/AddHasCasting.java b/java/src/org/openqa/selenium/chromium/AddHasCasting.java index 959adcf0f2e36..aeb57693110e9 100644 --- a/java/src/org/openqa/selenium/chromium/AddHasCasting.java +++ b/java/src/org/openqa/selenium/chromium/AddHasCasting.java @@ -17,7 +17,6 @@ package org.openqa.selenium.chromium; -import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; @@ -62,22 +61,21 @@ public List> getCastSinks() { public void selectCastSink(String deviceName) { Require.nonNull("Device Name", deviceName); - executeMethod.execute(SET_CAST_SINK_TO_USE, ImmutableMap.of("sinkName", deviceName)); + executeMethod.execute(SET_CAST_SINK_TO_USE, Map.of("sinkName", deviceName)); } @Override public void startDesktopMirroring(String deviceName) { Require.nonNull("Device Name", deviceName); - executeMethod.execute( - START_CAST_DESKTOP_MIRRORING, ImmutableMap.of("sinkName", deviceName)); + executeMethod.execute(START_CAST_DESKTOP_MIRRORING, Map.of("sinkName", deviceName)); } @Override public void startTabMirroring(String deviceName) { Require.nonNull("Device Name", deviceName); - executeMethod.execute(START_CAST_TAB_MIRRORING, ImmutableMap.of("sinkName", deviceName)); + executeMethod.execute(START_CAST_TAB_MIRRORING, Map.of("sinkName", deviceName)); } @Override @@ -89,7 +87,7 @@ public String getCastIssueMessage() { public void stopCasting(String deviceName) { Require.nonNull("Device Name", deviceName); - executeMethod.execute(STOP_CASTING, ImmutableMap.of("sinkName", deviceName)); + executeMethod.execute(STOP_CASTING, Map.of("sinkName", deviceName)); } }; } diff --git a/java/src/org/openqa/selenium/chromium/AddHasCdp.java b/java/src/org/openqa/selenium/chromium/AddHasCdp.java index 2f45da1be54fb..628fb12cb0512 100644 --- a/java/src/org/openqa/selenium/chromium/AddHasCdp.java +++ b/java/src/org/openqa/selenium/chromium/AddHasCdp.java @@ -19,7 +19,6 @@ import static org.openqa.selenium.chromium.ChromiumDriver.IS_CHROMIUM_BROWSER; -import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.function.Predicate; import org.openqa.selenium.Capabilities; @@ -58,9 +57,9 @@ public Map executeCdpCommand( Map toReturn = (Map) executeMethod.execute( - EXECUTE_CDP, ImmutableMap.of("cmd", commandName, "params", parameters)); + EXECUTE_CDP, Map.of("cmd", commandName, "params", parameters)); - return ImmutableMap.copyOf(toReturn); + return Map.copyOf(toReturn); } }; } diff --git a/java/src/org/openqa/selenium/chromium/AddHasLaunchApp.java b/java/src/org/openqa/selenium/chromium/AddHasLaunchApp.java index ded44d2fb0a54..c9c014769dca5 100644 --- a/java/src/org/openqa/selenium/chromium/AddHasLaunchApp.java +++ b/java/src/org/openqa/selenium/chromium/AddHasLaunchApp.java @@ -20,7 +20,6 @@ import static org.openqa.selenium.chromium.ChromiumDriver.IS_CHROMIUM_BROWSER; import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.function.Predicate; import org.openqa.selenium.Capabilities; @@ -38,7 +37,7 @@ public class AddHasLaunchApp implements AugmenterProvider, Additio public static final String LAUNCH_APP = "launchApp"; private static final Map COMMANDS = - ImmutableMap.of( + Map.of( LAUNCH_APP, new CommandInfo("/session/:sessionId/chromium/launch_app", HttpMethod.POST)); @Override @@ -63,7 +62,7 @@ public HasLaunchApp getImplementation(Capabilities capabilities, ExecuteMethod e public void launchApp(String id) { Require.nonNull("id of Chromium App", id); - executeMethod.execute(LAUNCH_APP, ImmutableMap.of("id", id)); + executeMethod.execute(LAUNCH_APP, Map.of("id", id)); } }; } diff --git a/java/src/org/openqa/selenium/chromium/AddHasNetworkConditions.java b/java/src/org/openqa/selenium/chromium/AddHasNetworkConditions.java index e92f0e58435fa..9dd90168bfb26 100644 --- a/java/src/org/openqa/selenium/chromium/AddHasNetworkConditions.java +++ b/java/src/org/openqa/selenium/chromium/AddHasNetworkConditions.java @@ -20,7 +20,6 @@ import static org.openqa.selenium.chromium.ChromiumDriver.IS_CHROMIUM_BROWSER; import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableMap; import java.time.Duration; import java.util.Map; import java.util.function.Predicate; @@ -42,7 +41,7 @@ public class AddHasNetworkConditions public static final String DELETE_NETWORK_CONDITIONS = "deleteNetworkConditions"; private static final Map COMMANDS = - ImmutableMap.of( + Map.of( GET_NETWORK_CONDITIONS, new CommandInfo("/session/:sessionId/chromium/network_conditions", HttpMethod.GET), SET_NETWORK_CONDITIONS, @@ -94,7 +93,7 @@ public void setNetworkConditions(ChromiumNetworkConditions networkConditions) { Require.nonNull("Network Conditions", networkConditions); Map conditions = - ImmutableMap.of( + Map.of( ChromiumNetworkConditions.OFFLINE, networkConditions.getOffline(), ChromiumNetworkConditions.LATENCY, @@ -103,8 +102,7 @@ public void setNetworkConditions(ChromiumNetworkConditions networkConditions) { networkConditions.getDownloadThroughput(), ChromiumNetworkConditions.UPLOAD_THROUGHPUT, networkConditions.getUploadThroughput()); - executeMethod.execute( - SET_NETWORK_CONDITIONS, ImmutableMap.of("network_conditions", conditions)); + executeMethod.execute(SET_NETWORK_CONDITIONS, Map.of("network_conditions", conditions)); } @Override diff --git a/java/src/org/openqa/selenium/chromium/AddHasPermissions.java b/java/src/org/openqa/selenium/chromium/AddHasPermissions.java index aaad1899b8fb1..b9d500a3acf63 100644 --- a/java/src/org/openqa/selenium/chromium/AddHasPermissions.java +++ b/java/src/org/openqa/selenium/chromium/AddHasPermissions.java @@ -20,7 +20,6 @@ import static org.openqa.selenium.chromium.ChromiumDriver.IS_CHROMIUM_BROWSER; import com.google.auto.service.AutoService; -import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.function.Predicate; import org.openqa.selenium.Capabilities; @@ -39,8 +38,7 @@ public class AddHasPermissions public static final String SET_PERMISSION = "setPermission"; private static final Map COMMANDS = - ImmutableMap.of( - SET_PERMISSION, new CommandInfo("/session/:sessionId/permissions", HttpMethod.POST)); + Map.of(SET_PERMISSION, new CommandInfo("/session/:sessionId/permissions", HttpMethod.POST)); @Override public Map getAdditionalCommands() { @@ -66,8 +64,7 @@ public void setPermission(String name, String value) { Require.nonNull("Permission value", value); executeMethod.execute( - SET_PERMISSION, - ImmutableMap.of("descriptor", ImmutableMap.of("name", name), "state", value)); + SET_PERMISSION, Map.of("descriptor", Map.of("name", name), "state", value)); } }; }