[java] Replacing SimpleDateFormat with a more modern class DateTimeFormatter

Author: barancev

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

@@ -17,10 +17,8 @@
 
 package org.openqa.selenium.logging;
 
-import org.openqa.selenium.Beta;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -30,9 +28,6 @@
  */
 public class LogEntry {
 
-  private static final ThreadLocal<SimpleDateFormat> DATE_FORMAT =
-      ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"));
-
   private final Level level;
   private final long timestamp;
   private final String message;
@@ -77,11 +72,11 @@ public String getMessage() {
 
   @Override
   public String toString() {
-    return String.format("[%s] [%s] %s",
-                         DATE_FORMAT.get().format(new Date(timestamp)), level, message);
+    return String.format(
+        "[%s] [%s] %s",
+        DateTimeFormatter.ISO_INSTANT.format(Instant.ofEpochMilli(timestamp)), level, message);
   }
 
-  @Beta
   public Map<String, Object> toJson() {
     Map<String, Object> map = new HashMap<>();
     map.put("timestamp", timestamp);

java/client/test/org/openqa/selenium/logging/LoggingTest.java

@@ -28,6 +28,7 @@
 
 import org.junit.Test;
 
+import java.util.Map;
 import java.util.logging.Level;
 
 public class LoggingTest {
@@ -54,4 +55,22 @@ public void canCompareLoggingPreferences() {
     prefs2.enable(LogType.BROWSER, Level.ALL);
     assertThat(prefs2).isEqualTo(prefs1);
   }
+
+  @Test
+  public void canRepresentLogEntryAsJson() {
+    long timestamp = 1572882588202L;
+    LogEntry entry = new LogEntry(INFO, timestamp, "There is no more cheese");
+    Map<String, Object> json = entry.toJson();
+    assertThat(json)
+        .containsEntry("timestamp", timestamp)
+        .containsEntry("level", INFO)
+        .containsEntry("message", "There is no more cheese");
+  }
+
+  @Test
+  public void canRepresentLogEntryAsString() {
+    long timestamp = 1572882588202L;
+    LogEntry entry = new LogEntry(INFO, timestamp, "There is no more cheese");
+    assertThat(entry.toString()).isEqualTo("[2019-11-04T15:49:48.202Z] [INFO] There is no more cheese");
+  }
 }