backward-compatibiity for ISO8601 timestamps from older version client

yue9944882 · yue9944882 · commit 36ec40501383 · 2021-01-06T23:27:20.000+08:00
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
@@ -33,6 +33,7 @@
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoField;
 import java.util.Date;
 import java.util.Map;
@@ -244,7 +245,12 @@ public OffsetDateTime read(JsonReader in) throws IOException {
           if (date.endsWith("+0000")) {
             date = date.substring(0, date.length() - 5) + "Z";
           }
-          return OffsetDateTime.parse(date, formatter);
+          try {
+            return OffsetDateTime.parse(date, formatter);
+          } catch (DateTimeParseException e) {
+            // backward-compatibility for ISO8601 timestamp format
+            return OffsetDateTime.parse(date, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+          }
       }
     }
   }
diff --git a/kubernetes/src/test/java/io/kubernetes/client/openapi/JSONTest.java b/kubernetes/src/test/java/io/kubernetes/client/openapi/JSONTest.java
@@ -21,9 +21,10 @@
 
 public class JSONTest {
 
+  private final JSON json = new JSON();
+
   @Test
   public void testSerializeByteArray() {
-    final JSON json = new JSON();
     final String plainText = "string that contains '=' when encoded";
     final String base64String = json.serialize(plainText.getBytes());
     // serialize returns string surrounded by quotes: "\"[base64]\""
@@ -40,19 +41,28 @@ public void testSerializeByteArray() {
 
   @Test
   public void testOffsetDateTime1e6Parse() {
-    System.out.println(JSON.RFC3339MICRO_FORMATTER.format(OffsetDateTime.now()));
-    String timeStr = "2018-04-03T11:32:26.123456Z";
-    OffsetDateTime t = OffsetDateTime.parse(timeStr, JSON.RFC3339MICRO_FORMATTER);
-    String serializedTsStr = JSON.RFC3339MICRO_FORMATTER.format(t);
+    String timeStr = "\"2018-04-03T11:32:26.123456Z\"";
+    OffsetDateTime dateTime = json.deserialize(timeStr, OffsetDateTime.class);
+    String serializedTsStr = json.serialize(dateTime);
     assertEquals(timeStr, serializedTsStr);
   }
 
   @Test
   public void testOffsetDateTime1e4Parse() {
-    String timeStr = "2018-04-03T11:32:26.123400Z";
-    OffsetDateTime t = OffsetDateTime.parse(timeStr, JSON.RFC3339MICRO_FORMATTER);
-    String serializedTsStr = JSON.RFC3339MICRO_FORMATTER.format(t);
-    assertEquals(timeStr, serializedTsStr);
+    String timeStr = "\"2018-04-03T11:32:26.1234Z\"";
+    OffsetDateTime dateTime = json.deserialize(timeStr, OffsetDateTime.class);
+    String serializedTsStr = json.serialize(dateTime);
+    String expectedStr = "\"2018-04-03T11:32:26.123400Z\"";
+    assertEquals(expectedStr, serializedTsStr);
+  }
+
+  @Test
+  public void testOffsetDateTime1e3Parse() {
+    String timeStr = "\"2018-04-03T11:32:26.123Z\"";
+    OffsetDateTime dateTime = json.deserialize(timeStr, OffsetDateTime.class);
+    String serializedTsStr = json.serialize(dateTime);
+    String expectedStr = "\"2018-04-03T11:32:26.123000Z\"";
+    assertEquals(expectedStr, serializedTsStr);
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`import java.time.OffsetDateTime;`
`34`	`34`	`import java.time.format.DateTimeFormatter;`
`35`	`35`	`import java.time.format.DateTimeFormatterBuilder;`
	`36`	`+import java.time.format.DateTimeParseException;`
`36`	`37`	`import java.time.temporal.ChronoField;`
`37`	`38`	`import java.util.Date;`
`38`	`39`	`import java.util.Map;`
`@@ -244,7 +245,12 @@ public OffsetDateTime read(JsonReader in) throws IOException {`
`244`	`245`	`if (date.endsWith("+0000")) {`
`245`	`246`	`date = date.substring(0, date.length() - 5) + "Z";`
`246`	`247`	`}`
`247`		`- return OffsetDateTime.parse(date, formatter);`
	`248`	`+ try {`
	`249`	`+ return OffsetDateTime.parse(date, formatter);`
	`250`	`+ } catch (DateTimeParseException e) {`
	`251`	`+ // backward-compatibility for ISO8601 timestamp format`
	`252`	`+ return OffsetDateTime.parse(date, DateTimeFormatter.ISO_OFFSET_DATE_TIME);`
	`253`	`+ }`
`248`	`254`	`}`
`249`	`255`	`}`
`250`	`256`	`}`