Merge pull request kubernetes-client#242 from archcosmo/intorstring-yaml-load

Add custom Constructor to Yaml to fix issue kubernetes-client#241

Author: brendandburns

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

@@ -13,6 +13,7 @@
 package io.kubernetes.client.util;
 
 import com.google.common.reflect.ClassPath;
+import io.kubernetes.client.custom.IntOrString;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -23,9 +24,13 @@
 import java.util.Set;
 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,23 @@ 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

@@ -15,6 +15,7 @@
 import static org.junit.Assert.*;
 
 import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1ServicePort;
 import java.io.StringReader;
 import java.lang.reflect.Method;
 import org.junit.Test;
@@ -57,4 +58,25 @@ 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);
+    }
+  }
 }