forked from kubernetes-client/java
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathjson.diff
More file actions
89 lines (83 loc) · 3.86 KB
/
json.diff
File metadata and controls
89 lines (83 loc) · 3.86 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
index 870629244..d7d2d5579 100644
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
@@ -23,6 +23,9 @@ import com.google.gson.JsonElement;
import io.gsonfire.GsonFireBuilder;
import io.gsonfire.TypeSelector;
+import io.kubernetes.client.gson.V1MetadataExclusionStrategy;
+import io.kubernetes.client.gson.V1StatusPreProcessor;
+import io.kubernetes.client.openapi.models.V1Status;
import okio.ByteString;
import java.io.IOException;
@@ -35,6 +38,9 @@ import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
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.Locale;
import java.util.Map;
@@ -50,9 +56,20 @@ import java.util.TimeZone;
public class JSON {
private static Gson gson;
private static boolean isLenientOnJson = false;
+
+ private static final DateTimeFormatter RFC3339MICRO_FORMATTER =
+ new DateTimeFormatterBuilder()
+ .parseDefaulting(ChronoField.OFFSET_SECONDS, 0)
+ .append(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"))
+ .optionalStart()
+ .appendFraction(ChronoField.NANO_OF_SECOND, 6, 6, true)
+ .optionalEnd()
+ .appendLiteral("Z")
+ .toFormatter();
+
private static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
private static SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
- private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
+ private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter(RFC3339MICRO_FORMATTER);
private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
@@ -65,8 +82,11 @@ public class JSON {
public static GsonBuilder createGson() {
GsonFireBuilder fireBuilder = new GsonFireBuilder()
;
- GsonBuilder builder = fireBuilder.createGsonBuilder();
- return builder;
+ GsonBuilder builder =
+ fireBuilder
+ .registerPreProcessor(V1Status.class, new V1StatusPreProcessor())
+ .createGsonBuilder();
+ return builder.setExclusionStrategies(new V1MetadataExclusionStrategy());
}
private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
@@ -793,11 +813,14 @@ public class JSON {
@Override
public void write(JsonWriter out, byte[] value) throws IOException {
+ boolean oldHtmlSafe = out.isHtmlSafe();
+ out.setHtmlSafe(false);
if (value == null) {
out.nullValue();
} else {
out.value(ByteString.of(value).base64());
}
+ out.setHtmlSafe(oldHtmlSafe);
}
@Override
@@ -853,7 +876,12 @@ public class JSON {
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);
+ }
}
}
}