Skip to content

Commit 3651f8c

Browse files
brendandburnsbrendandburns
committed
Fix up patches for new codegen.
1 parent f93790e commit 3651f8c

File tree

8 files changed

+68
-36
lines changed

8 files changed

+68
-36
lines changed

‎kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import io.gsonfire.GsonFireBuilder;
2424
import io.gsonfire.TypeSelector;
2525

26+
import io.kubernetes.client.gson.V1StatusPreProcessor;
27+
import io.kubernetes.client.openapi.models.V1Status;
2628
import okio.ByteString;
2729

2830
import java.io.IOException;
@@ -34,7 +36,9 @@
3436
import java.time.OffsetDateTime;
3537
import java.time.ZoneId;
3638
import java.time.ZoneOffset;
37-
import java.time.format.DateTimeFormatter;
39+
import java.time.format.DateTimeFormatterBuilder;
40+
import java.time.format.DateTimeParseException;
41+
import java.time.temporal.ChronoField;
3842
import java.util.Date;
3943
import java.util.Locale;
4044
import java.util.Map;
@@ -50,9 +54,19 @@
5054
public class JSON {
5155
private static Gson gson;
5256
private static boolean isLenientOnJson = false;
57+
private static final DateTimeFormatter RFC3339MICRO_FORMATTER =
58+
new DateTimeFormatterBuilder()
59+
.parseDefaulting(ChronoField.OFFSET_SECONDS, 0)
60+
.append(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"))
61+
.optionalStart()
62+
.appendFraction(ChronoField.NANO_OF_SECOND, 6, 6, true)
63+
.optionalEnd()
64+
.appendLiteral("Z")
65+
.toFormatter();
66+
5367
private static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
5468
private static SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
55-
private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
69+
private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter(RFC3339MICRO_FORMATTER);
5670
private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
5771
private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
5872

@@ -65,7 +79,10 @@ public class JSON {
6579
public static GsonBuilder createGson() {
6680
GsonFireBuilder fireBuilder = new GsonFireBuilder()
6781
;
68-
GsonBuilder builder = fireBuilder.createGsonBuilder();
82+
GsonBuilder builder =
83+
fireBuilder
84+
.registerPreProcessor(V1Status.class, new V1StatusPreProcessor())
85+
.createGsonBuilder();
6986
return builder;
7087
}
7188

@@ -784,11 +801,15 @@ public static class ByteArrayAdapter extends TypeAdapter<byte[]> {
784801

785802
@Override
786803
public void write(JsonWriter out, byte[] value) throws IOException {
804+
boolean oldHtmlSafe = out.isHtmlSafe();
805+
out.setHtmlSafe(false);
806+
787807
if (value == null) {
788808
out.nullValue();
789809
} else {
790810
out.value(ByteString.of(value).base64());
791811
}
812+
out.setHtmlSafe(oldHtmlSafe);
792813
}
793814

794815
@Override
@@ -844,6 +865,12 @@ public OffsetDateTime read(JsonReader in) throws IOException {
844865
if (date.endsWith("+0000")) {
845866
date = date.substring(0, date.length()-5) + "Z";
846867
}
868+
try {
869+
return OffsetDateTime.parse(date, formatter);
870+
} catch (DateTimeParseException e) {
871+
// backward-compatibility for ISO8601 timestamp format
872+
return OffsetDateTime.parse(date, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
873+
}
847874
return OffsetDateTime.parse(date, formatter);
848875
}
849876
}

‎kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ public void write(JsonWriter out, V1ListMeta value) throws IOException {
258258
@Override
259259
public V1ListMeta read(JsonReader in) throws IOException {
260260
JsonElement jsonElement = elementAdapter.read(in);
261-
validateJsonElement(jsonElement);
261+
// Disable validation so delete API can tolerate non-status return object (graceful deletion)
262+
// validateJsonObject(jsonObj);
262263
return thisAdapter.fromJsonTree(jsonElement);
263264
}
264265

‎kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.google.gson.annotations.SerializedName;
1919
import com.google.gson.stream.JsonReader;
2020
import com.google.gson.stream.JsonWriter;
21+
import io.kubernetes.client.custom.MapUtils;
2122
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2223
import java.io.IOException;
2324
import java.util.Arrays;
@@ -244,7 +245,7 @@ public boolean equals(Object o) {
244245
}
245246
V1Secret v1Secret = (V1Secret) o;
246247
return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
247-
Objects.equals(this.data, v1Secret.data) &&
248+
MapUtils.equals(this.data, v1Secret.data) &&
248249
Objects.equals(this.immutable, v1Secret.immutable) &&
249250
Objects.equals(this.kind, v1Secret.kind) &&
250251
Objects.equals(this.metadata, v1Secret.metadata) &&

‎kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@ public void write(JsonWriter out, V1Status value) throws IOException {
378378
@Override
379379
public V1Status read(JsonReader in) throws IOException {
380380
JsonElement jsonElement = elementAdapter.read(in);
381-
validateJsonElement(jsonElement);
381+
// Disable validation so delete API can tolerate non-status return object (graceful deletion)
382+
// validateJsonObject(jsonObj);
382383
return thisAdapter.fromJsonTree(jsonElement);
383384
}
384385

‎scripts/patches/json.diff

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
2-
index 4406c2199..f56413a25 100644
2+
index 8d0f4c47d..cff284332 100644
33
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
44
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
55
@@ -23,6 +23,8 @@ import com.google.gson.JsonElement;
@@ -11,21 +11,21 @@ index 4406c2199..f56413a25 100644
1111
import okio.ByteString;
1212

1313
import java.io.IOException;
14-
@@ -34,6 +36,9 @@ import java.text.ParsePosition;
15-
import java.time.LocalDate;
14+
@@ -34,7 +36,9 @@ import java.time.LocalDate;
1615
import java.time.OffsetDateTime;
17-
import java.time.format.DateTimeFormatter;
16+
import java.time.ZoneId;
17+
import java.time.ZoneOffset;
18+
-import java.time.format.DateTimeFormatter;
1819
+import java.time.format.DateTimeFormatterBuilder;
1920
+import java.time.format.DateTimeParseException;
2021
+import java.time.temporal.ChronoField;
2122
import java.util.Date;
2223
import java.util.Locale;
2324
import java.util.Map;
24-
@@ -48,9 +53,19 @@ import java.util.HashMap;
25+
@@ -50,9 +54,19 @@ import java.util.TimeZone;
2526
public class JSON {
2627
private static Gson gson;
2728
private static boolean isLenientOnJson = false;
28-
+
2929
+ private static final DateTimeFormatter RFC3339MICRO_FORMATTER =
3030
+ new DateTimeFormatterBuilder()
3131
+ .parseDefaulting(ChronoField.OFFSET_SECONDS, 0)
@@ -35,31 +35,33 @@ index 4406c2199..f56413a25 100644
3535
+ .optionalEnd()
3636
+ .appendLiteral("Z")
3737
+ .toFormatter();
38+
+
3839
private static DateTypeAdapter dateTypeAdapter = new DateTypeAdapter();
3940
private static SqlDateTypeAdapter sqlDateTypeAdapter = new SqlDateTypeAdapter();
4041
- private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
4142
+ private static OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter(RFC3339MICRO_FORMATTER);
4243
private static LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();
4344
private static ByteArrayAdapter byteArrayAdapter = new ByteArrayAdapter();
4445

45-
@@ -58,7 +73,10 @@ public class JSON {
46+
@@ -65,7 +79,10 @@ public class JSON {
4647
public static GsonBuilder createGson() {
4748
GsonFireBuilder fireBuilder = new GsonFireBuilder()
4849
;
4950
- GsonBuilder builder = fireBuilder.createGsonBuilder();
5051
+ GsonBuilder builder =
51-
+ fireBuilder
52-
+ .registerPreProcessor(V1Status.class, new V1StatusPreProcessor())
53-
+ .createGsonBuilder();
52+
+ fireBuilder
53+
+ .registerPreProcessor(V1Status.class, new V1StatusPreProcessor())
54+
+ .createGsonBuilder();
5455
return builder;
5556
}
5657

57-
@@ -721,11 +739,14 @@ public class JSON {
58+
@@ -784,11 +801,15 @@ public class JSON {
5859

5960
@Override
6061
public void write(JsonWriter out, byte[] value) throws IOException {
6162
+ boolean oldHtmlSafe = out.isHtmlSafe();
6263
+ out.setHtmlSafe(false);
64+
+
6365
if (value == null) {
6466
out.nullValue();
6567
} else {
@@ -69,17 +71,16 @@ index 4406c2199..f56413a25 100644
6971
}
7072

7173
@Override
72-
@@ -781,7 +802,12 @@ public class JSON {
74+
@@ -844,6 +865,12 @@ public class JSON {
7375
if (date.endsWith("+0000")) {
7476
date = date.substring(0, date.length()-5) + "Z";
7577
}
76-
- return OffsetDateTime.parse(date, formatter);
7778
+ try {
7879
+ return OffsetDateTime.parse(date, formatter);
7980
+ } catch (DateTimeParseException e) {
8081
+ // backward-compatibility for ISO8601 timestamp format
8182
+ return OffsetDateTime.parse(date, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
8283
+ }
84+
return OffsetDateTime.parse(date, formatter);
8385
}
8486
}
85-
}

‎scripts/patches/list-meta.diff

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java
2-
index 60381b312..7fb47e230 100644
2+
index f161284a2..d3d563bbb 100644
33
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java
44
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java
5-
@@ -266,7 +266,9 @@ public class V1ListMeta {
5+
@@ -258,7 +258,8 @@ public class V1ListMeta {
66
@Override
77
public V1ListMeta read(JsonReader in) throws IOException {
8-
JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
9-
- validateJsonObject(jsonObj);
10-
+
8+
JsonElement jsonElement = elementAdapter.read(in);
9+
- validateJsonElement(jsonElement);
1110
+ // Disable validation so delete API can tolerate non-status return object (graceful deletion)
1211
+ // validateJsonObject(jsonObj);
13-
return thisAdapter.fromJsonTree(jsonObj);
12+
return thisAdapter.fromJsonTree(jsonElement);
1413
}
1514

‎scripts/patches/secret.diff

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
2-
index 8fdadaac6..5fe296242 100644
2+
index 5684f4776..aa77bd40f 100644
33
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
44
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
5-
@@ -19,6 +19,7 @@ import com.google.gson.annotations.JsonAdapter;
5+
@@ -18,6 +18,7 @@ import com.google.gson.annotations.JsonAdapter;
66
import com.google.gson.annotations.SerializedName;
77
import com.google.gson.stream.JsonReader;
88
import com.google.gson.stream.JsonWriter;
99
+import io.kubernetes.client.custom.MapUtils;
1010
import io.kubernetes.client.openapi.models.V1ObjectMeta;
1111
import java.io.IOException;
12-
import java.util.HashMap;
13-
@@ -259,7 +260,7 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
12+
import java.util.Arrays;
13+
@@ -243,8 +244,8 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
14+
return false;
1415
}
1516
V1Secret v1Secret = (V1Secret) o;
16-
return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
17+
- return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
1718
- Objects.equals(this.data, v1Secret.data) &&
19+
+ return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
1820
+ MapUtils.equals(this.data, v1Secret.data) &&
1921
Objects.equals(this.immutable, v1Secret.immutable) &&
2022
Objects.equals(this.kind, v1Secret.kind) &&

‎scripts/patches/status.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
2-
index b2b6db803..8a8a9765d 100644
2+
index b529e3455..c2268419a 100644
33
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
44
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
5-
@@ -394,7 +394,8 @@ public class V1Status {
5+
@@ -378,7 +378,8 @@ public class V1Status {
66
@Override
77
public V1Status read(JsonReader in) throws IOException {
8-
JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
9-
- validateJsonObject(jsonObj);
8+
JsonElement jsonElement = elementAdapter.read(in);
9+
- validateJsonElement(jsonElement);
1010
+ // Disable validation so delete API can tolerate non-status return object (graceful deletion)
1111
+ // validateJsonObject(jsonObj);
12-
return thisAdapter.fromJsonTree(jsonObj);
12+
return thisAdapter.fromJsonTree(jsonElement);
1313
}
1414

0 commit comments

Comments
 (0)