Skip to content

Remove Jackson serialized from IntOrString, use default JSON #4990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove Jackson serialized from IntOrString, use default JSON #4990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d511be
Initial plan
Copilot Nov 5, 2026
5351a02
Make Jackson IntOrString serializer pluggable
Copilot Nov 5, 2026
38b43d8
Use Gson for IntOrString serialization
Copilot Nov 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions kubernetes/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ java_library(
srcs = glob(["src/main/java/**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"@maven//:com_fasterxml_jackson_core_jackson_annotations",
"@maven//:com_fasterxml_jackson_core_jackson_core",
"@maven//:com_fasterxml_jackson_core_jackson_databind",
"@maven//:com_google_code_gson_gson",
"@maven//:com_squareup_okhttp3_logging_interceptor",
"@maven//:com_squareup_okhttp3_okhttp_jvm",
Expand All @@ -28,8 +25,6 @@ java_test_suite(
runner = "junit5",
deps = [
":client-java-api",
"@maven//:com_fasterxml_jackson_core_jackson_core",
"@maven//:com_fasterxml_jackson_core_jackson_databind",
"@maven//:com_google_code_gson_gson",
"@maven//:com_squareup_okhttp3_okhttp_jvm",
"@maven//:com_squareup_okio_okio_jvm",
Expand Down
4 changes: 0 additions & 4 deletions kubernetes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>io.gsonfire</groupId>
<artifactId>gson-fire</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions kubernetes/src/main/java/io/kubernetes/client/custom/IntOrString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*/
package io.kubernetes.client.custom;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.stream.JsonReader;
Expand All @@ -22,7 +21,6 @@
import java.util.Objects;

@JsonAdapter(IntOrString.IntOrStringAdapter.class)
@JsonSerialize(using = IntOrStringJacksonSerializer.class)
public class IntOrString {
private final boolean isInt;
private final String strValue;
Expand Down
39 changes: 0 additions & 39 deletions kubernetes/src/main/java/io/kubernetes/client/custom/IntOrStringJacksonSerializer.java
View file
Open in desktop

This file was deleted.

17 changes: 9 additions & 8 deletions kubernetes/src/test/java/io/kubernetes/client/custom/IntOrStringTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.kubernetes.client.openapi.JSON;
import org.junit.jupiter.api.Test;

// Note: Do not use AssertJ .isEquqlTo to test .equals, as this doesn't necessarily invoke it!
Expand Down Expand Up @@ -116,12 +115,14 @@ void whenCreatedWithString_notEqualAnotherWithDifferentValue() {
}

@Test
void jacksonSerializer_writeValueAsString() throws JsonProcessingException {
IntOrString intOrString1 = new IntOrString(17);
IntOrString intOrString2 = new IntOrString("17");
void gsonAdapter_serializesAsIntOrString() {
assertThat(JSON.getGson().toJson(new IntOrString(17))).isEqualTo("17");
assertThat(JSON.getGson().toJson(new IntOrString("17"))).isEqualTo("\"17\"");
}

ObjectMapper mapper = new ObjectMapper();
mapper.writeValueAsString(intOrString1);
mapper.writeValueAsString(intOrString2);
@Test
void gsonAdapter_deserializesAsIntOrString() {
assertThat(JSON.getGson().fromJson("17", IntOrString.class).getIntValue()).isEqualTo(17);
assertThat(JSON.getGson().fromJson("\"17\"", IntOrString.class).getStrValue()).isEqualTo("17");
}
}
Loading