Add explicit JSON serialization for Proxy.

The reflection-based serialization done by BeanToJsonConverter inserts extraneous keys (such as "class" and "hCode"), which are rejected by W3C-compliant drivers.

Author: juangj

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

@@ -64,6 +64,7 @@ java_library(name = 'core',
     '//java/client/src/org/openqa/selenium/interactions:exceptions',
     '//java/client/src/org/openqa/selenium/logging:api',
     '//java/client/src/org/openqa/selenium/security:security',
+    '//third_party/java/gson:gson',
   ],
   visibility = [
     '//java/client/src/org/openqa/selenium/interactions:interactions',

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

@@ -17,6 +17,9 @@
 
 package org.openqa.selenium;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -92,6 +95,41 @@ public Proxy(Map<String, ?> raw) {
     }
   }
 
+  public JsonElement toJson() {
+    Map<String, String> m = new HashMap<>();
+    if (proxyType != ProxyType.UNSPECIFIED) {
+      m.put("proxyType", proxyType.toString().toLowerCase());
+    }
+    if (ftpProxy != null) {
+      m.put("ftpProxy", ftpProxy);
+    }
+    if (httpProxy != null) {
+      m.put("httpProxy", httpProxy);
+    }
+    if (noProxy != null) {
+      m.put("noProxy", noProxy);
+    }
+    if (sslProxy != null) {
+      m.put("sslProxy", sslProxy);
+    }
+    if (socksProxy != null) {
+      m.put("socksProxy", socksProxy);
+    }
+    if (socksUsername != null) {
+      m.put("socksUsername", socksUsername);
+    }
+    if (socksPassword != null) {
+      m.put("socksPassword", socksPassword);
+    }
+    if (proxyAutoconfigUrl != null) {
+      m.put("proxyAutoconfigUrl", proxyAutoconfigUrl);
+    }
+    if (autodetect) {
+      m.put("autodetect", "true");
+    }
+    return new Gson().toJsonTree(m);
+  }
+
   /**
    * Gets the {@link ProxyType}.  This can signal if set to use a direct connection (without proxy),
    * manually set proxy settings, auto-configured proxy settings, or whether to use the default

java/client/test/org/openqa/selenium/BUCK

@@ -81,6 +81,7 @@ java_library(name = 'tests',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//java/client/test/org/openqa/selenium/testing:test-base',
     '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
+    '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
     '//third_party/java/hamcrest:hamcrest-core',
     '//third_party/java/hamcrest:hamcrest-library',

java/client/test/org/openqa/selenium/ProxyTest.java

@@ -24,6 +24,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.util.Set;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -204,7 +207,7 @@ public void testAutodetectProxy() {
 
 
   @Test
-  public void testInitializationManualProxy() {
+  public void manualProxyFromMap() {
     Map<String, String> proxyData = new HashMap<>();
     proxyData.put("proxyType", "manual");
     proxyData.put("httpProxy", "http.proxy:1234");
@@ -231,7 +234,32 @@ public void testInitializationManualProxy() {
   }
 
   @Test
-  public void testInitializationPACProxy() {
+  public void manualProxyToJson() {
+    Proxy proxy = new Proxy();
+    proxy.setProxyType(ProxyType.MANUAL);
+    proxy.setHttpProxy("http.proxy:1234");
+    proxy.setFtpProxy("ftp.proxy");
+    proxy.setSslProxy("ssl.proxy");
+    proxy.setNoProxy("localhost,127.0.0.*");
+    proxy.setSocksProxy("socks.proxy:65555");
+    proxy.setSocksUsername("test1");
+    proxy.setSocksPassword("test2");
+
+    JsonObject json = proxy.toJson().getAsJsonObject();
+
+    assertEquals("manual", json.getAsJsonPrimitive("proxyType").getAsString());
+    assertEquals("ftp.proxy", json.getAsJsonPrimitive("ftpProxy").getAsString());
+    assertEquals("http.proxy:1234", json.getAsJsonPrimitive("httpProxy").getAsString());
+    assertEquals("ssl.proxy", json.getAsJsonPrimitive("sslProxy").getAsString());
+    assertEquals("socks.proxy:65555", json.getAsJsonPrimitive("socksProxy").getAsString());
+    assertEquals("test1", json.getAsJsonPrimitive("socksUsername").getAsString());
+    assertEquals("test2", json.getAsJsonPrimitive("socksPassword").getAsString());
+    assertEquals("localhost,127.0.0.*", json.getAsJsonPrimitive("noProxy").getAsString());
+    assertEquals(8, json.entrySet().size());
+  }
+
+  @Test
+  public void pacProxyFromMap() {
     Map<String, String> proxyData = new HashMap<>();
     proxyData.put("proxyType", "PAC");
     proxyData.put("proxyAutoconfigUrl", "http://aaa/bbb.pac");
@@ -252,7 +280,20 @@ public void testInitializationPACProxy() {
   }
 
   @Test
-  public void testInitializationAutodetectProxy() {
+  public void pacProxyToJson() {
+    Proxy proxy = new Proxy();
+    proxy.setProxyType(ProxyType.PAC);
+    proxy.setProxyAutoconfigUrl("http://aaa/bbb.pac");
+
+    JsonObject json = proxy.toJson().getAsJsonObject();
+
+    assertEquals("pac", json.getAsJsonPrimitive("proxyType").getAsString());
+    assertEquals("http://aaa/bbb.pac", json.getAsJsonPrimitive("proxyAutoconfigUrl").getAsString());
+    assertEquals(2, json.entrySet().size());
+  }
+
+  @Test
+  public void autodetectProxyFromMap() {
     Map<String, Object> proxyData = new HashMap<>();
     proxyData.put("proxyType", "AUTODETECT");
     proxyData.put("autodetect", true);
@@ -273,7 +314,20 @@ public void testInitializationAutodetectProxy() {
   }
 
   @Test
-  public void testInitializationSystemProxy() {
+  public void autodetectProxyToJson() {
+    Proxy proxy = new Proxy();
+    proxy.setProxyType(ProxyType.AUTODETECT);
+    proxy.setAutodetect(true);
+
+    JsonObject json = proxy.toJson().getAsJsonObject();
+
+    assertEquals("autodetect", json.getAsJsonPrimitive("proxyType").getAsString());
+    assertTrue(json.getAsJsonPrimitive("autodetect").getAsBoolean());
+    assertEquals(2, json.entrySet().size());
+  }
+
+  @Test
+  public void systemProxyFromMap() {
     Map<String, String> proxyData = new HashMap<>();
     proxyData.put("proxyType", "system");
 
@@ -293,7 +347,18 @@ public void testInitializationSystemProxy() {
   }
 
   @Test
-  public void testInitializationDirectProxy() {
+  public void systemProxyToJson() {
+    Proxy proxy = new Proxy();
+    proxy.setProxyType(ProxyType.SYSTEM);
+
+    JsonObject json = proxy.toJson().getAsJsonObject();
+
+    assertEquals("system", json.getAsJsonPrimitive("proxyType").getAsString());
+    assertEquals(1, json.entrySet().size());
+  }
+
+  @Test
+  public void directProxyFromMap() {
     Map<String, String> proxyData = new HashMap<>();
     proxyData.put("proxyType", "DIRECT");
 
@@ -312,6 +377,17 @@ public void testInitializationDirectProxy() {
     assertNull(proxy.getProxyAutoconfigUrl());
   }
 
+  @Test
+  public void directProxyToJson() {
+    Proxy proxy = new Proxy();
+    proxy.setProxyType(ProxyType.DIRECT);
+
+    JsonObject json = proxy.toJson().getAsJsonObject();
+
+    assertEquals("direct", json.getAsJsonPrimitive("proxyType").getAsString());
+    assertEquals(1, json.entrySet().size());
+  }
+
   @Test
   public void constructingWithNullKeysWorksAsExpected() {
     Map<String, String> rawProxy = new HashMap<>();