Avoid creating unnecessary map instance when merging options

Author: shs96c

java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -64,6 +64,8 @@ public ChromeOptions setLogLevel(ChromeDriverLogLevel logLevel){
 
   @Override
   public ChromeOptions merge(Capabilities extraCapabilities) {
+    Require.nonNull("Capabilities to merge", extraCapabilities);
+
     ChromeOptions newInstance = new ChromeOptions();
     newInstance.mergeInPlace(this);
     newInstance.mergeInPlace(extraCapabilities);

java/client/src/org/openqa/selenium/chromium/ChromiumOptions.java

@@ -235,7 +235,9 @@ public Map<String, Object> asMap() {
   }
 
   protected void mergeInPlace(Capabilities capabilities) {
-    capabilities.asMap().forEach(this::setCapability);
+    Require.nonNull("Capabilities to merge", capabilities);
+
+    capabilities.getCapabilityNames().forEach(name -> setCapability(name, capabilities.getCapability(name)));
     if (capabilities instanceof ChromiumOptions) {
       ChromiumOptions<?> options = (ChromiumOptions<?>) capabilities;
       addArguments(options.args);

java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -334,9 +334,10 @@ public Map<String, Object> asMap() {
 
   @Override
   public FirefoxOptions merge(Capabilities capabilities) {
+    Require.nonNull("Capabilities to merge", capabilities);
     FirefoxOptions newInstance = new FirefoxOptions();
-    this.asMap().forEach(newInstance::setCapability);
-    capabilities.asMap().forEach(newInstance::setCapability);
+    getCapabilityNames().forEach(name -> newInstance.setCapability(name, getCapability(name)));
+    capabilities.getCapabilityNames().forEach(name -> newInstance.setCapability(name, capabilities.getCapability(name)));
     newInstance.mirror(this);
     if (capabilities instanceof FirefoxOptions) {
       newInstance.mirror((FirefoxOptions) capabilities);

java/client/src/org/openqa/selenium/safari/SafariOptions.java

@@ -21,6 +21,7 @@
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
 
 import org.openqa.selenium.MutableCapabilities;
+import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -87,9 +88,14 @@ public SafariOptions(Capabilities source) {
 
   @Override
   public SafariOptions merge(Capabilities extraCapabilities) {
+    Require.nonNull("Capabilities to merge", extraCapabilities);
+
     SafariOptions newInstance = new SafariOptions();
-    this.asMap().forEach(newInstance::setCapability);
-    extraCapabilities.asMap().forEach(newInstance::setCapability);
+
+    getCapabilityNames().forEach(name -> newInstance.setCapability(name, getCapability(name)));
+    extraCapabilities.getCapabilityNames()
+      .forEach(name -> newInstance.setCapability(name, extraCapabilities.getCapability(name)));
+
     return newInstance;
   }