Fixing broken remote logs fetching: reverting back toJson method in

LogEntry (and dependency on json lib is back too)
nimeacuerdo · Feb 27, 2013 · 3a511f1 · 3a511f1
1 parent 930ad8d
commit 3a511f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/logging/LogEntry.java b/java/client/src/org/openqa/selenium/logging/LogEntry.java
@@ -21,8 +21,12 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 
+import org.json.JSONObject;
+
 /**
  * Represents a single log statement.
  */
@@ -91,5 +95,13 @@ private SimpleDateFormat getDateFormat() {
 
     return format;
   }
+
+  public JSONObject toJson() {
+    Map<String, Object> map = new HashMap<String, Object>();
+    map.put("timestamp", timestamp);
+    map.put("level", level);
+    map.put("message", message);
+    return new JSONObject(map);
+  }
 
 }
diff --git a/java/client/src/org/openqa/selenium/logging/build.desc b/java/client/src/org/openqa/selenium/logging/build.desc
@@ -7,6 +7,7 @@ java_library(
     ],
     deps = [
         "//java/client/src/org/openqa/selenium:beta",
+        "//third_party/java/json",
     ])
 
 java_library(

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteLogs.java b/java/client/src/org/openqa/selenium/remote/RemoteLogs.java
@@ -62,14 +62,12 @@ public LogEntries get(String logType) {
   }
 
   private LogEntries getRemoteEntries(String logType) {
-    System.out.println("Getting log " + logType);
     Object raw = executeMethod.execute(DriverCommand.GET_LOG, ImmutableMap.of(TYPE_KEY, logType));
     @SuppressWarnings("unchecked")
     List<Map<String, Object>> rawList = (List<Map<String, Object>>) raw;
     List<LogEntry> remoteEntries = Lists.newArrayListWithCapacity(rawList.size());
 
     for (Map<String, Object> obj : rawList) {
-      System.out.println(obj);
       remoteEntries.add(new LogEntry(LogLevelMapping.toLevel((String)obj.get(LEVEL)),
           (Long) obj.get(TIMESTAMP),
           (String) obj.get(MESSAGE)));