Add custom Constructor to Yaml to fix issue #241

Author: archcosmo

util/src/main/java/io/kubernetes/client/util/Yaml.java

@@ -21,11 +21,16 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
+import io.kubernetes.client.custom.IntOrString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.nodes.ScalarNode;
 
 public class Yaml {
-  private static org.yaml.snakeyaml.Yaml yaml = new org.yaml.snakeyaml.Yaml();
+  private static org.yaml.snakeyaml.Yaml yaml = new org.yaml.snakeyaml.Yaml(new CustomConstructor());
   private static Map<String, Class<?>> classes = new HashMap<>();
 
   static final Logger logger = LoggerFactory.getLogger(Yaml.class);
@@ -185,4 +190,26 @@ public static <T> T loadAs(File f, Class<T> clazz) throws IOException {
   public static <T> T loadAs(Reader reader, Class<T> clazz) {
     return yaml.loadAs(reader, clazz);
   }
+
+
+  /**
+   * Defines constructor logic for custom types in this library.
+   */
+  public static class CustomConstructor extends Constructor {
+    @Override
+    protected Object constructObject(Node node) {
+      if(node.getType() == IntOrString.class) {
+        return constructIntOrString((ScalarNode)node);
+      }
+      return super.constructObject(node);
+    }
+
+    private IntOrString constructIntOrString(ScalarNode node) {
+      try {
+        return new IntOrString(Integer.parseInt(node.getValue()));
+      } catch (NumberFormatException err) {
+        return new IntOrString(node.getValue());
+      }
+    }
+  }
 }

util/src/test/java/io/kubernetes/client/util/YamlTest.java

@@ -12,40 +12,44 @@
 */
 package io.kubernetes.client.util;
 
-import static org.junit.Assert.*;
-
+import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1Service;
+import io.kubernetes.client.models.V1ServicePort;
+import org.junit.Test;
+
 import java.io.StringReader;
 import java.lang.reflect.Method;
-import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 public class YamlTest {
   @Test
   public void testLoad() {
-    String[] kinds = new String[] {"Pod", "Deployment", "ClusterRole", "APIService", "Scale"};
+    String[] kinds = new String[]{"Pod", "Deployment", "ClusterRole", "APIService", "Scale"};
     String[] apiVersions =
-        new String[] {"v1", "v1beta2", "v1alpha1", "v1beta1", "extensions/v1beta1"};
+            new String[]{"v1", "v1beta2", "v1alpha1", "v1beta1", "extensions/v1beta1"};
     String[] classNames =
-        new String[] {
-          "V1Pod",
-          "V1beta2Deployment",
-          "V1alpha1ClusterRole",
-          "V1beta1APIService",
-          "ExtensionsV1beta1Scale"
-        };
+            new String[]{
+                    "V1Pod",
+                    "V1beta2Deployment",
+                    "V1alpha1ClusterRole",
+                    "V1beta1APIService",
+                    "ExtensionsV1beta1Scale"
+            };
     for (int i = 0; i < kinds.length; i++) {
       String kind = kinds[i];
       String className = classNames[i];
       try {
         String input =
-            "kind: "
-                + kind
-                + "\n"
-                + "apiVersion: "
-                + apiVersions[i]
-                + "\n"
-                + "metadata:\n"
-                + "  name: foo";
+                "kind: "
+                        + kind
+                        + "\n"
+                        + "apiVersion: "
+                        + apiVersions[i]
+                        + "\n"
+                        + "metadata:\n"
+                        + "  name: foo";
         Object obj = Yaml.load(new StringReader(input));
         Method m = obj.getClass().getMethod("getMetadata");
         V1ObjectMeta metadata = (V1ObjectMeta) m.invoke(obj);
@@ -57,4 +61,21 @@ public void testLoad() {
       }
     }
   }
+
+  @Test
+  public void testLoadIntOrString() {
+    try {
+      String strInput = "targetPort: test";
+      String intInput = "targetPort: 1";
+
+      V1ServicePort stringPort = Yaml.loadAs(strInput, V1ServicePort.class);
+      V1ServicePort intPort = Yaml.loadAs(intInput, V1ServicePort.class);
+
+      assertFalse("Target port for 'stringPort' was parsed to an integer, string expected.", stringPort.getTargetPort().isInteger());
+      assertTrue("Target port for 'intPort' was parsed to a string, integer expected.", intPort.getTargetPort().isInteger());
+
+    } catch (Exception ex) {
+      assertNull("Unexpected exception: " + ex.toString(), ex);
+    }
+  }
 }