feat: dynamic shortcut utiltities

Author: yue9944882

util/src/main/java/io/kubernetes/client/util/generic/dynamic/DynamicKubernetesObject.java

@@ -14,7 +14,6 @@
 
 import com.google.gson.JsonObject;
 import io.kubernetes.client.common.KubernetesObject;
-import io.kubernetes.client.openapi.Configuration;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import java.util.Objects;
 
@@ -36,8 +35,7 @@ public DynamicKubernetesObject(JsonObject obj) {
 
   @Override
   public V1ObjectMeta getMetadata() {
-    return Configuration.getDefaultApiClient()
-        .getJSON()
+    return Dynamics.internalJSONCodec
         .getGson()
         .fromJson(this.raw.get("metadata"), V1ObjectMeta.class);
   }
@@ -65,8 +63,7 @@ public void setKind(String kind) {
   }
 
   public void setMetadata(V1ObjectMeta objectMeta) {
-    this.raw.add(
-        "metadata", Configuration.getDefaultApiClient().getJSON().getGson().toJsonTree(objectMeta));
+    this.raw.add("metadata", Dynamics.internalJSONCodec.getGson().toJsonTree(objectMeta));
   }
 
   @Override

util/src/main/java/io/kubernetes/client/util/generic/dynamic/Dynamics.java

@@ -14,12 +14,17 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import io.kubernetes.client.openapi.Configuration;
+import io.kubernetes.client.openapi.JSON;
+import java.util.Map;
+import org.yaml.snakeyaml.Yaml;
 
 public class Dynamics {
 
+  static final JSON internalJSONCodec = new JSON();
+  static final Yaml internalYamlCodec = new Yaml();
+
   public static DynamicKubernetesObject newFromJson(String jsonContent) {
-    return newFromJson(Configuration.getDefaultApiClient().getJSON().getGson(), jsonContent);
+    return newFromJson(internalJSONCodec.getGson(), jsonContent);
   }
 
   public static DynamicKubernetesObject newFromJson(Gson gson, String jsonContent) {
@@ -28,11 +33,39 @@ public static DynamicKubernetesObject newFromJson(Gson gson, String jsonContent)
   }
 
   public static DynamicKubernetesListObject newListFromJson(String jsonContent) {
-    return newListFromJson(Configuration.getDefaultApiClient().getJSON().getGson(), jsonContent);
+    return newListFromJson(internalJSONCodec.getGson(), jsonContent);
   }
 
   public static DynamicKubernetesListObject newListFromJson(Gson gson, String jsonContent) {
     JsonElement raw = gson.fromJson(jsonContent, JsonElement.class);
     return new DynamicKubernetesListObject(raw.getAsJsonObject());
   }
+
+  public static DynamicKubernetesObject newFromYaml(String yamlContent) {
+    return newFromYaml(internalYamlCodec, yamlContent);
+  }
+
+  public static DynamicKubernetesObject newFromYaml(Yaml yamlCodec, String yamlContent) {
+    return newFromJson(
+        internalJSONCodec.getGson(),
+        fromYamlToJson(yamlCodec, internalJSONCodec.getGson(), yamlContent));
+  }
+
+  public static String fromYamlToJson(String yamlContent) {
+    return fromYamlToJson(internalYamlCodec, internalJSONCodec.getGson(), yamlContent);
+  }
+
+  public static String fromJsonToYaml(String jsonContent) {
+    return fromJsonToYaml(internalYamlCodec, internalJSONCodec.getGson(), jsonContent);
+  }
+
+  public static String fromYamlToJson(Yaml yamlCodec, Gson gson, String yamlContent) {
+    Map<String, Object> rawYamlObj = yamlCodec.load(yamlContent);
+    return gson.toJson(rawYamlObj);
+  }
+
+  public static String fromJsonToYaml(Yaml yamlCodec, Gson gson, String jsonContent) {
+    Map<String, Object> rawJsonObj = gson.fromJson(jsonContent, Map.class);
+    return yamlCodec.dump(rawJsonObj);
+  }
 }

util/src/test/java/io/kubernetes/client/util/generic/dynamic/DynamicsTest.java

@@ -0,0 +1,71 @@
+/*
+Copyright 2021 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.util.generic.dynamic;
+
+import static org.junit.Assert.*;
+
+import com.google.gson.JsonObject;
+import io.kubernetes.client.Resources;
+import io.kubernetes.client.openapi.JSON;
+import io.kubernetes.client.util.Yaml;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import org.junit.Test;
+
+public class DynamicsTest {
+
+  private static final String TEST_POD_YAML_FILE = Resources.getResource("test-pod.yaml").getPath();
+
+  private static final String TEST_POD_JSON_FILE = Resources.getResource("test-pod.json").getPath();
+
+  private JSON json = new JSON();
+
+  @Test
+  public void testYamlToJson() throws IOException {
+    String podYamlContent = new String(Files.readAllBytes(Paths.get(TEST_POD_YAML_FILE)));
+    String podJsonContent = new String(Files.readAllBytes(Paths.get(TEST_POD_JSON_FILE)));
+    String convertedJsonContent = Dynamics.fromYamlToJson(podYamlContent);
+
+    assertEquals(
+        json.getGson().fromJson(podJsonContent, JsonObject.class),
+        json.getGson().fromJson(convertedJsonContent, JsonObject.class));
+  }
+
+  @Test
+  public void testJsonToYaml() throws IOException {
+    String podYamlContent = new String(Files.readAllBytes(Paths.get(TEST_POD_YAML_FILE)));
+    String podJsonContent = new String(Files.readAllBytes(Paths.get(TEST_POD_JSON_FILE)));
+    String convertedYamlContent = Dynamics.fromJsonToYaml(podJsonContent);
+
+    assertEquals(Yaml.load(podYamlContent), Yaml.load(convertedYamlContent));
+  }
+
+  @Test
+  public void testLoadingJsonToDynamicObj() throws IOException {
+    String podJsonContent = new String(Files.readAllBytes(Paths.get(TEST_POD_JSON_FILE)));
+    DynamicKubernetesObject obj = Dynamics.newFromJson(podJsonContent);
+
+    assertEquals(obj.getApiVersion(), "v1");
+    assertEquals(obj.getKind(), "Pod");
+  }
+
+  @Test
+  public void testLoadingYamlToDynamicObj() throws IOException {
+    String podYamlContent = new String(Files.readAllBytes(Paths.get(TEST_POD_YAML_FILE)));
+    DynamicKubernetesObject obj = Dynamics.newFromYaml(podYamlContent);
+
+    assertEquals(obj.getApiVersion(), "v1");
+    assertEquals(obj.getKind(), "Pod");
+  }
+}

util/src/test/resources/test-pod.json

@@ -0,0 +1,15 @@
+{
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "creationTimestamp": "2018-12-23T01:09:18Z",
+    "generateName": "test-776d6c86cc-",
+    "labels": {
+      "app": "test",
+      "app-version": "19911",
+      "pod-template-hash": "3328274277"
+    },
+    "name": "test-776d6c86cc-4zwj5",
+    "namespace": "default"
+  }
+}