Add toJson to various classes

The reflective call to `toJson` was a relatively
late addition in the development of Selenium. It
is now time to use it.

Author: shs96c

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

@@ -71,4 +71,8 @@ public Iterator<LogEntry> iterator() {
     return entries.iterator();
   }
 
+  @Beta
+  public List<LogEntry> toJson() {
+    return getAll();
+  }
 }

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

@@ -17,6 +17,8 @@
 
 package org.openqa.selenium.logging;
 
+import org.openqa.selenium.Beta;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -84,7 +86,8 @@ public String toString() {
                          DATE_FORMAT.get().format(new Date(timestamp)), level, message);
   }
 
-  public Map<String, Object> toMap() {
+  @Beta
+  public Map<String, Object> toJson() {
     Map<String, Object> map = new HashMap<>();
     map.put("timestamp", timestamp);
     map.put("level", level);

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

@@ -17,11 +17,14 @@
 
 package org.openqa.selenium.logging;
 
+import org.openqa.selenium.Beta;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.logging.Level;
 
 /**
@@ -83,4 +86,13 @@ public LoggingPreferences addPreferences(LoggingPreferences prefs) {
     }
     return this;
   }
+
+  @Beta
+  public Map<String, Object> toJson() {
+    TreeMap<String, Object> converted = new TreeMap<>();
+    for (String logType : getEnabledLogTypes()) {
+      converted.put(logType, LogLevelMapping.getName(getLevel(logType)));
+    }
+    return converted;
+  }
 }

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

@@ -77,4 +77,9 @@ public static SessionLogs fromJSON(JsonObject rawSessionLogs) {
     }
     return sessionLogs;
   }
+
+  @Beta
+  public Map<String, LogEntries> toJson() {
+    return getAll();
+  }
 }

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

@@ -28,10 +28,7 @@
 
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogLevelMapping;
-import org.openqa.selenium.logging.LoggingPreferences;
-import org.openqa.selenium.logging.SessionLogs;
 
 import java.io.File;
 import java.lang.reflect.Array;
@@ -114,23 +111,6 @@ private JsonElement convertObject(Object toConvert, int maxDepth) throws Excepti
       return new JsonPrimitive(toConvert.toString());
     }
 
-    if (toConvert instanceof LoggingPreferences) {
-      LoggingPreferences prefs = (LoggingPreferences) toConvert;
-      JsonObject converted = new JsonObject();
-      for (String logType : prefs.getEnabledLogTypes()) {
-        converted.addProperty(logType, LogLevelMapping.getName(prefs.getLevel(logType)));
-      }
-      return converted;
-    }
-
-    if (toConvert instanceof SessionLogs) {
-      return convertObject(((SessionLogs)toConvert).getAll(), maxDepth - 1);
-    }
-
-    if (toConvert instanceof LogEntries) {
-      return convertObject(((LogEntries)toConvert).getAll(), maxDepth - 1);
-    }
-
     if (toConvert instanceof Map) {
       Map<String, Object> map = (Map<String, Object>) toConvert;
       if (map.size() == 1 && map.containsKey("w3c cookie")) {

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

@@ -183,11 +183,7 @@ private <T> T convert(Class<T> clazz, Object source, int depth) {
     if (fromJson != null) {
       try {
         return (T) fromJson.invoke(null, source.toString());
-      } catch (IllegalArgumentException e) {
-        throw new WebDriverException(e);
-      } catch (IllegalAccessException e) {
-        throw new WebDriverException(e);
-      } catch (InvocationTargetException e) {
+      } catch (ReflectiveOperationException e) {
         throw new WebDriverException(e);
       }
     }