Merge pull request #3127 from wkclz/wkclz/JacksonSerializerOfIntOrString

fix: Add JacksonSerializer to serialize IntOrString

Author: k8s-ci-robot

kubernetes/pom.xml

@@ -163,6 +163,10 @@
       <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>

kubernetes/src/main/java/io/kubernetes/client/custom/IntOrString.java

@@ -12,6 +12,7 @@
 */
 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;
@@ -21,6 +22,7 @@
 import java.util.Objects;
 
 @JsonAdapter(IntOrString.IntOrStringAdapter.class)
+@JsonSerialize(using = IntOrStringJacksonSerializer.class)
 public class IntOrString {
   private final boolean isInt;
   private final String strValue;
@@ -67,7 +69,9 @@ public boolean equals(Object o) {
   }
 
   private boolean equals(IntOrString o) {
-    if (isInt != o.isInt) return false;
+    if (isInt != o.isInt) {
+      return false;
+    }
     return isInt ? Objects.equals(intValue, o.intValue) : Objects.equals(strValue, o.strValue);
   }
 

kubernetes/src/main/java/io/kubernetes/client/custom/IntOrStringJacksonSerializer.java

@@ -0,0 +1,39 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.custom;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+
+public class IntOrStringJacksonSerializer extends StdSerializer<IntOrString> {
+
+  public IntOrStringJacksonSerializer() {
+    this(null);
+  }
+
+  public IntOrStringJacksonSerializer(Class<IntOrString> t) {
+    super(IntOrString.class);
+  }
+
+  @Override
+  public void serialize(IntOrString value, JsonGenerator jg, SerializerProvider provider) throws IOException {
+    if (value.isInteger()) {
+      jg.writeNumber(value.getIntValue());
+    } else {
+      jg.writeString(value.getStrValue());
+    }
+  }
+}

kubernetes/src/test/java/io/kubernetes/client/custom/IntOrStringTest.java

@@ -17,6 +17,8 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 
 public class IntOrStringTest {
@@ -115,4 +117,14 @@ public void whenCreatedWithString_notEqualAnotherWithDifferentValue() {
 
     assertThat(intOrString1, not(equalTo(intOrString2)));
   }
+
+  @Test
+  public void jacksonSerializer_writeValueAsString() throws JsonProcessingException {
+    IntOrString intOrString1 = new IntOrString(17);
+    IntOrString intOrString2 = new IntOrString("17");
+
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.writeValueAsString(intOrString1);
+    mapper.writeValueAsString(intOrString2);
+  }
 }