Lift clever handling of some capabilities into MutableCapabilities

Slowly, slowly, DesiredCapbilities evaporates.

Author: shs96c

java/client/src/org/openqa/selenium/MutableCapabilities.java

@@ -18,6 +18,9 @@
 package org.openqa.selenium;
 
 
+import org.openqa.selenium.logging.LogLevelMapping;
+import org.openqa.selenium.logging.LoggingPreferences;
+
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
@@ -140,6 +143,32 @@ public void setCapability(String key, Object value) {
       return;
     }
 
+    if ("loggingPrefs".equals(key) && value instanceof Map) {
+      LoggingPreferences prefs = new LoggingPreferences();
+      @SuppressWarnings("unchecked") Map<String, String> prefsMap = (Map<String, String>) value;
+
+      for (String logType : prefsMap.keySet()) {
+        prefs.enable(logType, LogLevelMapping.toLevel(prefsMap.get(logType)));
+      }
+      caps.put(key, prefs);
+      return;
+    }
+
+    if ("platform".equals(key) && value instanceof String) {
+      try {
+        caps.put(key, Platform.fromString((String) value));
+      } catch (WebDriverException e) {
+        caps.put(key, value);
+      }
+      return;
+    }
+
+    if ("unexpectedAlertBehaviour".equals(key)) {
+      caps.put("unexpectedAlertBehaviour", value);
+      caps.put("unhandledPromptBehavior", value);
+      return;
+    }
+
     if (value == null) {
       caps.remove(key);
     } else {

java/client/src/org/openqa/selenium/logging/BUCK

@@ -2,6 +2,7 @@ API_SRCS = [
   'Logs.java',
   'LogEntries.java',
   'LogEntry.java',
+  'LogLevelMapping.java',
   'LoggingPreferences.java',
 ]
 

java/client/src/org/openqa/selenium/logging/LogLevelMapping.java

@@ -17,10 +17,9 @@
 
 package org.openqa.selenium.logging;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
-import com.google.common.collect.ImmutableMap;
-
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 
 public class LogLevelMapping {
@@ -30,7 +29,7 @@ public class LogLevelMapping {
    */
   private static final String DEBUG = "DEBUG";
 
-  private static ImmutableMap<Integer, Level> levelMap;
+  private static final Map<Integer, Level> levelMap;
 
   static {
     Level[] supportedLevels = new Level[] {
@@ -41,11 +40,11 @@ public class LogLevelMapping {
       Level.SEVERE,
       Level.OFF
     };
-    ImmutableMap.Builder<Integer, Level> builder = ImmutableMap.builder();
+    Map<Integer, Level> builder = new HashMap<>();
     for (Level level : supportedLevels) {
       builder.put(level.intValue(), level);
     }
-    levelMap = builder.build();
+    levelMap = Collections.unmodifiableMap(builder);
   }
 
   /**
@@ -80,7 +79,7 @@ public static String getName(Level level) {
   }
 
   public static Level toLevel(String logLevelName) {
-    if (isNullOrEmpty(logLevelName)) {
+    if (logLevelName == null || "".equals(logLevelName)) {
       // Default the log level to info.
       return Level.INFO;
     }

java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java

@@ -111,32 +111,6 @@ public DesiredCapabilities merge(Capabilities extraCapabilities) {
     return this;
   }
 
-  public void setCapability(String key, Object value) {
-    if (LOGGING_PREFS.equals(key) && value instanceof Map) {
-      LoggingPreferences prefs = new LoggingPreferences();
-      Map<String, String> prefsMap = (Map<String, String>) value;
-
-      for (String logType : prefsMap.keySet()) {
-        prefs.enable(logType, LogLevelMapping.toLevel(prefsMap.get(logType)));
-      }
-      super.setCapability(LOGGING_PREFS, prefs);
-
-    } else if (PLATFORM.equals(key) && value instanceof String) {
-      try {
-        super.setCapability(key, Platform.fromString((String) value));
-      } catch (WebDriverException e) {
-        super.setCapability(key, value);
-      }
-
-    } else if (UNEXPECTED_ALERT_BEHAVIOUR.equals(key)) {
-      super.setCapability(UNEXPECTED_ALERT_BEHAVIOUR, value);
-      super.setCapability(UNHANDLED_PROMPT_BEHAVIOUR, value);
-
-    } else {
-      super.setCapability(key, value);
-    }
-  }
-
   public static DesiredCapabilities android() {
     return new DesiredCapabilities(BrowserType.ANDROID, "", Platform.ANDROID);
   }