1- From eeb5069c974d3146495f8a9dc52653f029d3cc2d Mon Sep 17 00:00:00 2001
1+ From 2370e0221bcf2fb03c5a6469403d2990638a4cdf Mon Sep 17 00:00:00 2001
22From: Min Jin <minkimzz@amazon.com>
3- Date: Tue, 4 Feb 2025 11:59:25 -0800
3+ Date: Wed, 12 Feb 2025 15:04:16 -0800
44Subject: [PATCH] manually apply JSON patch
55
6+ Signed-off-by: Min Jin <minkimzz@amazon.com>
67---
78 .../io/kubernetes/client/openapi/JSON.java | 36 ++++++++++++++++---
89 1 file changed, 32 insertions(+), 4 deletions(-)
910
1011diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
11- index dda3ec708..fe902b293 100644
12+ index 811bc84b9..ed34c6597 100644
1213--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
1314+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
1415@@ -23,6 +23,9 @@ import com.google.gson.JsonElement;
@@ -18,23 +19,23 @@ index dda3ec708..fe902b293 100644
1819+ import io.kubernetes.client.gson.V1MetadataExclusionStrategy;
1920+ import io.kubernetes.client.gson.V1StatusPreProcessor;
2021+ import io.kubernetes.client.openapi.models.V1Status;
22+ import io.kubernetes.client.openapi.models.*;
2123 import okio.ByteString;
2224
23- import java.io.IOException;
24- @@ -35,6 +38,9 @@ import java.time.OffsetDateTime;
25- import java.time.ZoneId;
26- import java.time.ZoneOffset;
25+ @@ -35,6 +38,9 @@ import java.text.ParsePosition;
26+ import java.time.LocalDate;
27+ import java.time.OffsetDateTime;
2728 import java.time.format.DateTimeFormatter;
2829+ import java.time.format.DateTimeFormatterBuilder;
2930+ import java.time.format.DateTimeParseException;
3031+ import java.time.temporal.ChronoField;
3132 import java.util.Date;
3233 import java.util.Locale;
3334 import java.util.Map;
34- @@ -50,9 +56,20 @@ import java.util.TimeZone ;
35+ @@ -43,17 +49,31 @@ import java.util.HashMap ;
3536 public class JSON {
36- private static Gson gson;
37- private static boolean isLenientOnJson = false;
37+ private Gson gson;
38+ private boolean isLenientOnJson = false;
3839+
3940+ private static final DateTimeFormatter RFC3339MICRO_FORMATTER =
4041+ new DateTimeFormatterBuilder()
@@ -46,14 +47,13 @@ index dda3ec708..fe902b293 100644
4647+ .appendLiteral("Z")
4748+ .toFormatter();
4849+
49- private static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
50- private static SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
51- - private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
52- + private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter(RFC3339MICRO_FORMATTER);
53- private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
54- private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
50+ private DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
51+ private SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
52+ - private OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
53+ + private OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter(RFC3339MICRO_FORMATTER);
54+ private LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
55+ private ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
5556
56- @@ -65,8 +82,11 @@ public class JSON {
5757 public static GsonBuilder createGson() {
5858 GsonFireBuilder fireBuilder = new GsonFireBuilder()
5959 ;
@@ -67,7 +67,7 @@ index dda3ec708..fe902b293 100644
6767 }
6868
6969 private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {
70- @@ -793 ,11 +813 ,14 @@ public class JSON {
70+ @@ -161 ,11 +181 ,14 @@ public class JSON {
7171
7272 @Override
7373 public void write(JsonWriter out, byte[] value) throws IOException {
@@ -82,7 +82,7 @@ index dda3ec708..fe902b293 100644
8282 }
8383
8484 @Override
85- @@ -853 ,7 +876 ,12 @@ public class JSON {
85+ @@ -221 ,7 +244 ,12 @@ public class JSON {
8686 if (date.endsWith("+0000")) {
8787 date = date.substring(0, date.length()-5) + "Z";
8888 }
0 commit comments