Merge pull request #370 from kondapally1989/master

add constructDateTime to snakeYaml CustomConstructor

Author: k8s-ci-robot

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

@@ -9,7 +9,7 @@
 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.util;
 
 import com.google.common.reflect.ClassPath;
@@ -31,6 +31,8 @@
 import okio.ByteString;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.DumperOptions;
@@ -324,6 +326,11 @@ protected Object constructObject(Node node) {
       if (node.getType() == byte[].class) {
         return constructByteArray((ScalarNode) node);
       }
+
+      if (node.getType() == org.joda.time.DateTime.class) {
+        return constructDateTime((ScalarNode) node);
+      }
+
       return super.constructObject(node);
     }
 
@@ -338,6 +345,10 @@ private IntOrString constructIntOrString(ScalarNode node) {
     private byte[] constructByteArray(ScalarNode node) {
       return ByteString.decodeBase64(node.getValue()).toByteArray();
     }
+
+    private Object constructDateTime(ScalarNode node) {
+      return new DateTime(((ScalarNode) node).getValue(), DateTimeZone.UTC);
+    }
   }
 
   public static class CustomRepresenter extends Representer {

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

@@ -9,14 +9,15 @@
 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.util;
 
 import static org.junit.Assert.*;
 
 import com.google.common.io.Resources;
 import io.kubernetes.client.models.AppsV1beta1Deployment;
 import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1Pod;
 import io.kubernetes.client.models.V1Secret;
 import io.kubernetes.client.models.V1Service;
 import io.kubernetes.client.models.V1ServicePort;
@@ -181,4 +182,27 @@ public void testLoadBytes() {
       assertNull("Unexpected exception: " + ex.toString(), ex);
     }
   }
+
+  @Test
+  public void testDateTime() {
+    try {
+      String strInput =
+          "apiVersion: v1\n"
+              + "kind: Pod\n"
+              + "metadata:\n"
+              + "  creationTimestamp: 2018-09-06T15:12:24Z";
+
+      V1Pod pod = Yaml.loadAs(strInput, V1Pod.class);
+
+      assertEquals(
+          "Incorrect value loaded for creationTimestamp",
+          "2018-09-06T15:12:24.000Z",
+          new String(
+              pod.getMetadata().getCreationTimestamp().toString().getBytes(),
+              StandardCharsets.UTF_8));
+
+    } catch (Exception ex) {
+      assertNull("Unexpected exception: " + ex.toString(), ex);
+    }
+  }
 }