Moving from org.json to gson because the license. Fixes issue 7956

Author: barancev

Diff for: .idea/libraries/simple_json.xml renamed to .idea/libraries/gson.xml

@@ -24,6 +24,7 @@
     <orderEntry type="library" scope="RUNTIME" name="cssparser" level="project" />
     <orderEntry type="library" exported="" name="guava-libraries" level="project" />
     <orderEntry type="library" name="google-protobuffers" level="project" />
+    <orderEntry type="library" exported="" name="gson" level="project" />
     <orderEntry type="library" name="hamcrest" level="project" />
     <orderEntry type="library" name="htmlunit" level="project" />
     <orderEntry type="library" name="jna" level="project" />
@@ -32,7 +33,6 @@
     <orderEntry type="library" exported="" name="operadriver" level="project" />
     <orderEntry type="library" name="phantomjsdriver" level="project" />
     <orderEntry type="library" name="servlet-api" level="project" />
-    <orderEntry type="library" exported="" name="simple-json" level="project" />
     <orderEntry type="library" name="testng" level="project" />
     <orderEntry type="library" name="webbit" level="project" />
     <orderEntry type="library" name="xml-apis" level="project" />

Diff for: java/client/client.iml

@@ -122,8 +122,8 @@ public interface JavascriptExecutor {
    *       "  }" +
    *       "};" +
    *       "xhr.send();");
-   *   JSONObject json = new JSONObject((String) response);
-   *   assertEquals("cheese", json.getString("food"));
+   *   JsonObject json = new JsonParser().parse((String) response);
+   *   assertEquals("cheese", json.get("food").getAsString());
    * </pre></code>
    *
    * <p>

Diff for: java/client/src/org/openqa/selenium/JavascriptExecutor.java

@@ -10,7 +10,6 @@ java_library(
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/guava-libraries:guava-libraries',
-    '//third_party/java/json:json',
   ],
   visibility = [ 'PUBLIC' ],
 )

Diff for: java/client/src/org/openqa/selenium/chrome/BUCK

@@ -25,9 +25,9 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.io.Files;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.openqa.selenium.internal.Base64Encoder;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
@@ -198,13 +198,10 @@ public Object getExperimentalOption(String name) {
    * @return The JSON representation of these options.
    * @throws IOException If an error occurs while reading the
    *     {@link #addExtensions(java.util.List) extension files} from disk.
-   * @throws JSONException If an error occurs while encoding these options as
-   *     JSON.
    */
-  public JSONObject toJson() throws IOException, JSONException {
-    JSONObject options = new JSONObject();
-    // copy experimental options, instead of passing to the JSONObject constructor
-    // because the JSON library will mutate the map passed in.
+  public JsonElement toJson() throws IOException {
+    Map<String, Object> options = Maps.newHashMap();
+
     for (String key : experimentalOptions.keySet()) {
       options.put(key, experimentalOptions.get(key));
     }
@@ -224,7 +221,7 @@ public JSONObject toJson() throws IOException, JSONException {
     encoded_extensions.addAll(extensions);
     options.put("extensions", encoded_extensions);
 
-    return options;
+    return new Gson().toJsonTree(options);
   }
 
   /**

Diff for: java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -8,5 +8,4 @@ java_library(name = "chrome",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote/service",
     "//third_party/java/guava-libraries",
-    "//third_party/java/json",
   ])

Diff for: java/client/src/org/openqa/selenium/chrome/build.desc

@@ -24,18 +24,15 @@
 import com.google.common.io.CharStreams;
 import com.google.common.io.LineReader;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.io.IOUtils;
-import org.openqa.selenium.remote.JsonException;
+import org.openqa.selenium.remote.JsonToBeanConverter;
 
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -95,26 +92,20 @@ public Preferences(Reader defaults, Reader reader) {
   private void readDefaultPreferences(Reader defaultsReader) {
     try {
       String rawJson = CharStreams.toString(defaultsReader);
-      JSONObject jsonPrefs = new JSONObject(rawJson);
+      Map<String, Object> map = new JsonToBeanConverter().convert(Map.class, rawJson);
 
-      JSONObject frozen = jsonPrefs.getJSONObject("frozen");
-      Iterator keys = frozen.keys();
-      while (keys.hasNext()) {
-        String key = (String) keys.next();
-        Object value = frozen.get(key);
+      Map<String, Object> frozen = (Map<String, Object>) map.get("frozen");
+      for (Map.Entry<String, Object> entry : frozen.entrySet()) {
+        String key = entry.getKey();
+        Object value = entry.getValue();
         setPreference(key, value);
         immutablePrefs.put(key, value);
       }
 
-      JSONObject mutable = jsonPrefs.getJSONObject("mutable");
-      keys = mutable.keys();
-      while (keys.hasNext()) {
-        String key = (String) keys.next();
-        Object value = mutable.get(key);
-        setPreference(key, value);
+      Map<String, Object> mutable = (Map<String, Object>) map.get("mutable");
+      for (Map.Entry<String, Object> entry : mutable.entrySet()) {
+        setPreference(entry.getKey(), entry.getValue());
       }
-    } catch (JSONException e) {
-      throw new JsonException(e);
     } catch (IOException e) {
       throw new WebDriverException(e);
     }

Diff for: java/client/src/org/openqa/selenium/firefox/Preferences.java

@@ -19,7 +19,7 @@ java_library(name = 'logging',
     ':api',
     '//java/client/src/org/openqa/selenium:beta',
     '//third_party/java/guava-libraries:guava-libraries',
-    '//third_party/java/json:json',
+    '//third_party/java/gson:gson',
   ],
   visibility = ['PUBLIC'],
 )

Diff for: java/client/src/org/openqa/selenium/logging/BUCK

@@ -17,11 +17,10 @@
 
 package org.openqa.selenium.logging;
 
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 public class SessionLogHandler {
@@ -32,16 +31,14 @@ public class SessionLogHandler {
    *  
    * @param rawSessionMap The raw session map.
    * @return The session logs mapped to session IDs.
-   * @throws Exception If something goes wrong in server communication or JSON parsing.
    */
-  public static Map<String, SessionLogs> getSessionLogs(JSONObject rawSessionMap)
-      throws JSONException {
+  public static Map<String, SessionLogs> getSessionLogs(JsonObject rawSessionMap) {
     Map<String, SessionLogs> sessionLogsMap = new HashMap<String, SessionLogs>();
-    for (Iterator keyItr = rawSessionMap.keys(); keyItr.hasNext();) {
-      String sessionId = (String) keyItr.next();
-      SessionLogs sessionLogs = SessionLogs.fromJSON(rawSessionMap.getJSONObject(sessionId));
+    for (Map.Entry<String, JsonElement> entry : rawSessionMap.entrySet()) {
+      String sessionId = entry.getKey();
+      SessionLogs sessionLogs = SessionLogs.fromJSON(entry.getValue().getAsJsonObject());
       sessionLogsMap.put(sessionId, sessionLogs);
     }
-    return sessionLogsMap;    
+    return sessionLogsMap;
   }
 }

Diff for: java/client/src/org/openqa/selenium/logging/SessionLogHandler.java

@@ -17,16 +17,15 @@
 
 package org.openqa.selenium.logging;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 import org.openqa.selenium.Beta;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -61,17 +60,19 @@ public Map<String, LogEntries> getAll() {
     return Collections.unmodifiableMap(logTypeToEntriesMap);
   }
 
-  public static SessionLogs fromJSON(JSONObject rawSessionLogs) throws JSONException {
+  public static SessionLogs fromJSON(JsonObject rawSessionLogs) {
     SessionLogs sessionLogs = new SessionLogs();
-    for (Iterator logTypeItr = rawSessionLogs.keys(); logTypeItr.hasNext();) {
-      String logType = (String) logTypeItr.next();
-      JSONArray rawLogEntries = rawSessionLogs.getJSONArray(logType);
+    for (Map.Entry<String, JsonElement> entry : rawSessionLogs.entrySet()) {
+      String logType = entry.getKey();
+      JsonArray rawLogEntries = entry.getValue().getAsJsonArray();
       List<LogEntry> logEntries = new ArrayList<LogEntry>();
-      for (int index = 0; index < rawLogEntries.length(); index++) {
-        JSONObject rawEntry = rawLogEntries.getJSONObject(index);
-        logEntries.add(new LogEntry(LogLevelMapping.toLevel(rawEntry.getString("level")),
-            rawEntry.getLong("timestamp"), rawEntry.getString("message")));
-      }        
+      for (int index = 0; index < rawLogEntries.size(); index++) {
+        JsonObject rawEntry = rawLogEntries.get(index).getAsJsonObject();
+        logEntries.add(new LogEntry(LogLevelMapping.toLevel(
+            rawEntry.get("level").getAsString()),
+            rawEntry.get("timestamp").getAsLong(),
+            rawEntry.get("message").getAsString()));
+      }
       sessionLogs.addLog(logType, new LogEntries(logEntries));
     }
     return sessionLogs;

Diff for: java/client/src/org/openqa/selenium/logging/SessionLogs.java

@@ -33,6 +33,6 @@ java_library(
         ":api",
         "//java/client/src/org/openqa/selenium:base",
         "//third_party/java/guava-libraries",
-        "//third_party/java/json",
+        "//third_party/java/gson",
     ])
 

Diff for: java/client/src/org/openqa/selenium/logging/build.desc

@@ -18,9 +18,8 @@
 
 import java.util.Map;
 
-import org.json.JSONObject;
-
 import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
 
 public class HttpProfilerLogEntry extends ProfilerLogEntry {
 
@@ -33,7 +32,7 @@ private static String constructMessage(EventType eventType, String commandName,
       "event", eventType.toString(),
       "command", commandName,
       "startorend", isStart ? "start" : "end");
-    return new JSONObject(map).toString();
+    return new Gson().toJson(map);
   }
 
 }

Diff for: java/client/src/org/openqa/selenium/logging/profiler/HttpProfilerLogEntry.java

@@ -91,7 +91,7 @@ java_library(name = 'remote',
     '//java/client/src/org/openqa/selenium/net:net',
     '//third_party/java/apache-httpclient:apache-httpclient',
     '//third_party/java/guava-libraries:guava-libraries',
-    '//third_party/java/json:json',
+    '//third_party/java/gson:gson',
   ],
   visibility = ['PUBLIC'],
 )