Merge pull request #1265 from yue9944882/homogenize-kubectl-subcommands

Refactor(kubectl): Homogenize kubectl resource manipulating sub-commands (kubectl create/apply)

Author: k8s-ci-robot

e2e/src/test/groovy/io/kubernetes/client/e2e/kubectl/KubectlApplyTest.groovy

@@ -12,7 +12,7 @@ class KubectlApplyTest extends Specification {
         given:
         def apiClient = ClientBuilder.defaultClient();
         apiClient.setDebugging(true)
-        def appliedNamespace = Kubectl.apply()
+        def appliedNamespace = Kubectl.apply(V1Namespace.class)
                 .apiClient(apiClient)
                 .resource(new V1Namespace()
                         .apiVersion("v1")

e2e/src/test/groovy/io/kubernetes/client/e2e/kubectl/KubectlCreateTest.groovy

@@ -11,7 +11,7 @@ class KubectlCreateTest extends Specification {
     def "Kubectl create namespace should work"() {
         given:
         def apiClient = ClientBuilder.defaultClient();
-        def createdNamespace = Kubectl.create()
+        def createdNamespace = Kubectl.create(V1Namespace.class)
                 .apiClient(apiClient)
                 .resource(new V1Namespace()
                         .apiVersion("v1")

extended/src/main/java/io/kubernetes/client/extended/kubectl/Kubectl.java

@@ -35,6 +35,30 @@ public static <ApiType extends KubernetesObject> KubectlGet<ApiType> get(
     return new KubectlGet<>(apiTypeClass);
   }
 
+  /** Equivalent for `kubectl create` */
+  public static <ApiType extends KubernetesObject> KubectlCreate<ApiType> create(
+      Class<ApiType> clazz) {
+    return new KubectlCreate<>(clazz);
+  }
+
+  /** Equivalent for `kubectl delete` */
+  public static <ApiType extends KubernetesObject> KubectlDelete<ApiType> delete(
+      Class<ApiType> clazz) {
+    return new KubectlDelete<>(clazz);
+  }
+
+  /** Equivalent for `kubectl replace` */
+  public static <ApiType extends KubernetesObject> KubectlReplace<ApiType> replace(
+      Class<ApiType> clazz) {
+    return new KubectlReplace<>(clazz);
+  }
+
+  /** Equivalent for `kubectl apply` */
+  public static <ApiType extends KubernetesObject> KubectlApply<ApiType> apply(
+      Class<ApiType> clazz) {
+    return new KubectlApply(clazz);
+  }
+
   /** Equivalent for `kubectl drain` */
   public static KubectlDrain drain() {
     return new KubectlDrain();
@@ -50,34 +74,6 @@ public static KubectlCordon uncordon() {
     return new KubectlCordon(false);
   }
 
-  /**
-   * Equivalent for `kubectl create`
-   *
-   * @return the kubectl create
-   */
-  public static KubectlCreate create() {
-    return new KubectlCreate();
-  }
-
-  public static <ApiType extends KubernetesObject> KubectlDelete<ApiType> delete(
-      Class<ApiType> clazz) {
-    return new KubectlDelete<ApiType>(clazz);
-  }
-
-  public static <ApiType extends KubernetesObject> KubectlReplace<ApiType> replace(
-      Class<ApiType> clazz) {
-    return new KubectlReplace<ApiType>(clazz);
-  }
-
-  /**
-   * Equivalent for `kubectl apply`
-   *
-   * @return the kubectl create
-   */
-  public static KubectlApply apply() {
-    return new KubectlApply();
-  }
-
   /**
    * Equivalent for `kubectl top`
    *

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlApply.java

@@ -24,31 +24,33 @@
 import io.kubernetes.client.util.generic.KubernetesApiResponse;
 import io.kubernetes.client.util.generic.options.PatchOptions;
 
-public class KubectlApply extends Kubectl.NamespacedApiClientBuilder<KubectlApply>
-    implements Kubectl.Executable<KubernetesObject> {
+public class KubectlApply<ApiType extends KubernetesObject>
+    extends Kubectl.ResourceBuilder<ApiType, KubectlApply<ApiType>>
+    implements Kubectl.Executable<ApiType> {
 
-  private KubernetesObject targetObj;
+  private ApiType targetObj;
   private String fieldManager;
   private boolean forceConflict;
 
   public static final String DEFAULT_FIELD_MANAGER = "kubernetes-java-kubectl-apply";
 
-  KubectlApply() {
+  KubectlApply(Class<ApiType> apiTypeClass) {
+    super(apiTypeClass);
     this.forceConflict = false;
     this.fieldManager = DEFAULT_FIELD_MANAGER;
   }
 
-  public KubectlApply fieldManager(String fieldManager) {
+  public KubectlApply<ApiType> fieldManager(String fieldManager) {
     this.fieldManager = fieldManager;
     return this;
   }
 
-  public KubectlApply forceConflict(boolean isForceConflict) {
+  public KubectlApply<ApiType> forceConflict(boolean isForceConflict) {
     this.forceConflict = isForceConflict;
     return this;
   }
 
-  public KubectlApply resource(KubernetesObject obj) {
+  public KubectlApply<ApiType> resource(ApiType obj) {
     this.targetObj = obj;
     return this;
   }
@@ -60,17 +62,15 @@ private void validate() throws KubectlException {
   }
 
   @Override
-  public KubernetesObject execute() throws KubectlException {
+  public ApiType execute() throws KubectlException {
     validate();
     return executeServerSideApply();
   }
 
-  private KubernetesObject executeServerSideApply() throws KubectlException {
+  private ApiType executeServerSideApply() throws KubectlException {
     refreshDiscovery();
 
-    GenericKubernetesApi<KubernetesObject, KubernetesListObject> api =
-        (GenericKubernetesApi<KubernetesObject, KubernetesListObject>)
-            getGenericApi(this.targetObj.getClass());
+    GenericKubernetesApi<ApiType, KubernetesListObject> api = getGenericApi();
 
     PatchOptions patchOptions = new PatchOptions();
     patchOptions.setForce(this.forceConflict);

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlCreate.java

@@ -22,25 +22,26 @@
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 import io.kubernetes.client.util.generic.options.CreateOptions;
 
-public class KubectlCreate extends Kubectl.NamespacedApiClientBuilder<KubectlCreate>
-    implements Kubectl.Executable<KubernetesObject> {
+public class KubectlCreate<ApiType extends KubernetesObject>
+    extends Kubectl.ResourceBuilder<ApiType, KubectlCreate<ApiType>>
+    implements Kubectl.Executable<ApiType> {
 
-  KubectlCreate() {}
+  KubectlCreate(Class<ApiType> apiTypeClass) {
+    super(apiTypeClass);
+  }
 
-  private KubernetesObject targetObj;
+  private ApiType targetObj;
 
-  public KubectlCreate resource(KubernetesObject obj) {
+  public KubectlCreate<ApiType> resource(ApiType obj) {
     this.targetObj = obj;
     return this;
   }
 
   @Override
-  public KubernetesObject execute() throws KubectlException {
+  public ApiType execute() throws KubectlException {
     refreshDiscovery();
 
-    GenericKubernetesApi<KubernetesObject, KubernetesListObject> api =
-        (GenericKubernetesApi<KubernetesObject, KubernetesListObject>)
-            getGenericApi(this.targetObj.getClass());
+    GenericKubernetesApi<ApiType, KubernetesListObject> api = getGenericApi();
 
     if (ModelMapper.isNamespaced(this.targetObj.getClass())) {
       String targetNamespace =

extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlApplyTest.java

@@ -81,20 +81,19 @@ public void testApplyConfigMap() throws KubectlException, IOException {
                     .withBody(new String(Files.readAllBytes(Paths.get(DISCOVERY_APIV1))))));
 
     V1ConfigMap configMap =
-        (V1ConfigMap)
-            Kubectl.apply()
-                .apiClient(apiClient)
-                .resource(
-                    new V1ConfigMap()
-                        .apiVersion("v1")
-                        .metadata(new V1ObjectMeta().namespace("foo").name("bar"))
-                        .data(
-                            new HashMap<String, String>() {
-                              {
-                                put("key1", "value1");
-                              }
-                            }))
-                .execute();
+        Kubectl.apply(V1ConfigMap.class)
+            .apiClient(apiClient)
+            .resource(
+                new V1ConfigMap()
+                    .apiVersion("v1")
+                    .metadata(new V1ObjectMeta().namespace("foo").name("bar"))
+                    .data(
+                        new HashMap<String, String>() {
+                          {
+                            put("key1", "value1");
+                          }
+                        }))
+            .execute();
     wireMockRule.verify(
         1, patchRequestedFor(urlPathEqualTo("/api/v1/namespaces/foo/configmaps/bar")));
     assertNotNull(configMap);

extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlCreateTest.java

@@ -78,7 +78,7 @@ public void testCreateConfigMap() throws KubectlException, IOException {
 
     V1ConfigMap configMap =
         (V1ConfigMap)
-            Kubectl.create()
+            Kubectl.create(V1ConfigMap.class)
                 .apiClient(apiClient)
                 .resource(
                     new V1ConfigMap()