refactor: share more codes for kubectl entry methods

Author: yue9944882

examples/src/main/java/io/kubernetes/client/examples/KubectlExample.java

@@ -96,7 +96,8 @@ public static void main(String[] args)
           String[] parts = from.split(":");
           name = parts[0];
           from = parts[1];
-          copy(client)
+          copy()
+              .apiClient(client)
               .namespace(ns)
               .name(name)
               .container(cli.getOptionValue("c", ""))
@@ -107,7 +108,8 @@ public static void main(String[] args)
           String[] parts = to.split(":");
           name = parts[0];
           to = parts[1];
-          copy(client)
+          copy()
+              .apiClient(client)
               .namespace(ns)
               .name(name)
               .container(cli.getOptionValue("c", ""))
@@ -133,9 +135,9 @@ public static void main(String[] args)
           String effect = ix == -1 ? null : taintSpec.substring(ix + 1);
 
           if (effect == null) {
-            taint(client).name(name).removeTaint(key).execute();
+            taint().apiClient(client).name(name).removeTaint(key).execute();
           } else {
-            taint(client).name(name).removeTaint(key, effect).execute();
+            taint().apiClient(client).name(name).removeTaint(key, effect).execute();
           }
           System.exit(0);
         }
@@ -148,14 +150,14 @@ public static void main(String[] args)
         String effect = taintSpec.substring(ix2 + 1);
 
         if (value == null) {
-          taint(client).name(name).addTaint(key, effect).execute();
+          taint().apiClient(client).name(name).addTaint(key, effect).execute();
         } else {
-          taint(client).name(name).addTaint(key, value, effect).execute();
+          taint().apiClient(client).name(name).addTaint(key, value, effect).execute();
         }
         System.exit(0);
       case "portforward":
         name = args[1];
-        KubectlPortForward forward = portforward(client).name(name).namespace(ns);
+        KubectlPortForward forward = portforward().apiClient(client).name(name).namespace(ns);
         for (int i = 2; i < args.length; i++) {
           String port = args[i];
           String[] ports = port.split(":");
@@ -167,7 +169,12 @@ public static void main(String[] args)
       case "log":
         name = args[1];
         ByteStreams.copy(
-            log(client).name(name).namespace(ns).container(cli.getOptionValue("c", "")).execute(),
+            log()
+                .apiClient(client)
+                .name(name)
+                .namespace(ns)
+                .container(cli.getOptionValue("c", ""))
+                .execute(),
             System.out);
         System.exit(0);
       case "scale":
@@ -178,11 +185,16 @@ public static void main(String[] args)
           System.exit(-3);
         }
         int replicas = Integer.parseInt(cli.getOptionValue("r"));
-        scale(client, getClassForKind(kind)).namespace(ns).name(name).replicas(replicas).execute();
+        scale(getClassForKind(kind))
+            .apiClient(client)
+            .namespace(ns)
+            .name(name)
+            .replicas(replicas)
+            .execute();
         System.out.println("Deployment scaled.");
         System.exit(0);
       case "version":
-        System.out.println(version(client));
+        System.out.println(version().apiClient(client));
         System.exit(0);
       case "label":
         kind = args[1];
@@ -194,20 +206,21 @@ public static void main(String[] args)
           System.err.println("Unknown kind: " + kind);
           System.exit(-2);
         }
-        label(client, clazz).namespace(ns).name(name).addLabel(labelKey, labelValue);
+        label(clazz).apiClient(client).namespace(ns).name(name).addLabel(labelKey, labelValue);
         System.exit(0);
       case "exec":
         name = args[1];
         String[] command = Arrays.copyOfRange(args, 2, args.length);
         KubectlExec e =
-            exec(client)
+            exec()
+                .apiClient(client)
                 .namespace(ns)
                 .name(name)
                 .command(command)
                 .container(cli.getOptionValue("c", ""));
         System.exit(e.execute());
       case "api-resources":
-        apiResources(client).execute().stream()
+        apiResources().apiClient(client).execute().stream()
             .forEach(
                 r ->
                     System.out.printf(

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

@@ -25,16 +25,7 @@ public class Kubectl {
 
   /** Equivalence for `kubectl taint`. */
   public static KubectlTaint taint() {
-    return taint(Configuration.getDefaultApiClient());
-  }
-
-  /**
-   * Equivalence for `kubectl taint`
-   *
-   * @param apiClient The client to use
-   */
-  public static KubectlTaint taint(ApiClient apiClient) {
-    return new KubectlTaint(apiClient);
+    return new KubectlTaint();
   }
 
   /**
@@ -43,17 +34,7 @@ public static KubectlTaint taint(ApiClient apiClient) {
    * @return the kubectl copy
    */
   public static KubectlCopy copy() {
-    return copy(Configuration.getDefaultApiClient());
-  }
-
-  /**
-   * Equivalence for `kubectl cp`.
-   *
-   * @param apiClient the api client instance
-   * @return the kubectl copy
-   */
-  public static KubectlCopy copy(ApiClient apiClient) {
-    return new KubectlCopy(apiClient);
+    return new KubectlCopy();
   }
 
   /**
@@ -65,20 +46,7 @@ public static KubectlCopy copy(ApiClient apiClient) {
    */
   public static <ApiType extends KubernetesObject> KubectlLabel<ApiType> label(
       Class<ApiType> apiTypeClass) {
-    return label(Configuration.getDefaultApiClient(), apiTypeClass);
-  }
-
-  /**
-   * Equivalence for `kubectl label`.
-   *
-   * @param <ApiType> the target api type
-   * @param apiClient the api client instance
-   * @param apiTypeClass the api type class
-   * @return the kubectl label
-   */
-  public static <ApiType extends KubernetesObject> KubectlLabel<ApiType> label(
-      ApiClient apiClient, Class<ApiType> apiTypeClass) {
-    return new KubectlLabel<>(apiClient, apiTypeClass);
+    return new KubectlLabel<>(apiTypeClass);
   }
 
   /**
@@ -90,20 +58,7 @@ public static <ApiType extends KubernetesObject> KubectlLabel<ApiType> label(
    */
   public static <ApiType extends KubernetesObject> KubectlAnnotate<ApiType> annotate(
       Class<ApiType> apiTypeClass) {
-    return annotate(Configuration.getDefaultApiClient(), apiTypeClass);
-  }
-
-  /**
-   * Equivalence for `kubectl annotate`.
-   *
-   * @param <ApiType> the target api type
-   * @param apiClient the api client instance
-   * @param apiTypeClass the api type class
-   * @return the kubectl annotation
-   */
-  public static <ApiType extends KubernetesObject> KubectlAnnotate<ApiType> annotate(
-      ApiClient apiClient, Class<ApiType> apiTypeClass) {
-    return new KubectlAnnotate<>(apiClient, apiTypeClass);
+    return new KubectlAnnotate<>(apiTypeClass);
   }
 
   /**
@@ -112,17 +67,7 @@ public static <ApiType extends KubernetesObject> KubectlAnnotate<ApiType> annota
    * @return the kubectl version
    */
   public static KubectlVersion version() {
-    return version(Configuration.getDefaultApiClient());
-  }
-
-  /**
-   * Equivalence for `kubectl version`.
-   *
-   * @param apiClient the api client instance
-   * @return the kubectl version
-   */
-  public static KubectlVersion version(ApiClient apiClient) {
-    return new KubectlVersion(apiClient);
+    return new KubectlVersion();
   }
 
   /*
@@ -134,30 +79,7 @@ public static KubectlVersion version(ApiClient apiClient) {
    */
   public static <ApiType extends KubernetesObject> KubectlScale<ApiType> scale(
       Class<ApiType> apiTypeClass) {
-    return scale(Configuration.getDefaultApiClient(), apiTypeClass);
-  }
-
-  /**
-   * Equivalent for `kubectl scale`
-   *
-   * @param <ApiType> the target api type
-   * @param apiClient The api client instance
-   * @param apiTypeClass the api type class
-   * @return the kubectl scale operator
-   */
-  public static <ApiType extends KubernetesObject> KubectlScale<ApiType> scale(
-      ApiClient apiClient, Class<ApiType> apiTypeClass) {
-    return new KubectlScale<>(apiClient, apiTypeClass);
-  }
-
-  /**
-   * Equivalent for `kubectl exec`
-   *
-   * @param apiClient The api client instance
-   * @return the kubectl exec operator
-   */
-  public static KubectlExec exec(ApiClient apiClient) {
-    return new KubectlExec(apiClient);
+    return new KubectlScale<>(apiTypeClass);
   }
 
   /**
@@ -166,17 +88,7 @@ public static KubectlExec exec(ApiClient apiClient) {
    * @return the kubectl exec operator
    */
   public static KubectlExec exec() {
-    return exec(Configuration.getDefaultApiClient());
-  }
-
-  /**
-   * Equivalent for `kubectl log`
-   *
-   * @param apiClient The api client instance
-   * @return the kubectl log operator
-   */
-  public static KubectlLog log(ApiClient apiClient) {
-    return new KubectlLog(apiClient);
+    return new KubectlExec();
   }
 
   /**
@@ -185,23 +97,15 @@ public static KubectlLog log(ApiClient apiClient) {
    * @return the kubectl log operator
    */
   public static KubectlLog log() {
-    return log(Configuration.getDefaultApiClient());
+    return new KubectlLog();
   }
 
   public static KubectlPortForward portforward() {
-    return portforward(Configuration.getDefaultApiClient());
-  }
-
-  public static KubectlPortForward portforward(ApiClient apiClient) {
-    return new KubectlPortForward(apiClient);
+    return new KubectlPortForward();
   }
 
   public static KubectlApiResources apiResources() {
-    return apiResources(Configuration.getDefaultApiClient());
-  }
-
-  public static KubectlApiResources apiResources(ApiClient apiClient) {
-    return new KubectlApiResources(apiClient);
+    return new KubectlApiResources();
   }
 
   /**
@@ -220,18 +124,27 @@ public static interface Executable<OUTPUT> {
     OUTPUT execute() throws KubectlException;
   }
 
+  abstract static class ApiClientBuilder<T extends ApiClientBuilder> {
+
+    ApiClient apiClient = Configuration.getDefaultApiClient();
+
+    public T apiClient(ApiClient apiClient) {
+      this.apiClient = apiClient;
+      return (T) this;
+    }
+  }
+
   abstract static class ResourceBuilder<
-      ApiType extends KubernetesObject, T extends ResourceBuilder<ApiType, T>> {
-    final ApiClient apiClient;
+          ApiType extends KubernetesObject, T extends ResourceBuilder<ApiType, T>>
+      extends ApiClientBuilder<T> {
     final Class<ApiType> apiTypeClass;
     String namespace;
     String name;
     String apiGroup;
     String apiVersion;
     String resourceNamePlural;
 
-    ResourceBuilder(ApiClient client, Class<ApiType> apiTypeClass) {
-      this.apiClient = client;
+    ResourceBuilder(Class<ApiType> apiTypeClass) {
       this.apiTypeClass = apiTypeClass;
     }
 
@@ -266,8 +179,8 @@ abstract static class ResourceAndContainerBuilder<
       extends ResourceBuilder<ApiType, T> {
     String container;
 
-    ResourceAndContainerBuilder(ApiClient client, Class<ApiType> apiTypeClass) {
-      super(client, apiTypeClass);
+    ResourceAndContainerBuilder(Class<ApiType> apiTypeClass) {
+      super(apiTypeClass);
     }
 
     public T container(String container) {

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

@@ -15,7 +15,6 @@
 import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.util.annotations.Annotations;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 import io.kubernetes.client.util.generic.KubernetesApiResponse;
@@ -29,8 +28,8 @@ public class KubectlAnnotate<ApiType extends KubernetesObject>
 
   private final Map<String, String> addingAnnotations;
 
-  KubectlAnnotate(ApiClient apiClient, Class<ApiType> apiTypeClass) {
-    super(apiClient, apiTypeClass);
+  KubectlAnnotate(Class<ApiType> apiTypeClass) {
+    super(apiTypeClass);
     this.addingAnnotations = new HashMap<>();
   }
 

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

@@ -14,22 +14,17 @@
 
 import io.kubernetes.client.Discovery;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import java.util.Set;
 
-public class KubectlApiResources implements Kubectl.Executable<Set<Discovery.APIResource>> {
-
-  private final Discovery discovery;
-
-  KubectlApiResources(ApiClient apiClient) {
-    this.discovery = new Discovery(apiClient);
-  }
+public class KubectlApiResources extends Kubectl.ApiClientBuilder<KubectlApiResources>
+    implements Kubectl.Executable<Set<Discovery.APIResource>> {
 
   @Override
   public Set<Discovery.APIResource> execute() throws KubectlException {
+    Discovery discovery = new Discovery(this.apiClient);
     try {
-      return this.discovery.findAll();
+      return discovery.findAll();
     } catch (ApiException e) {
       throw new KubectlException(e);
     }

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

@@ -16,7 +16,6 @@
 
 import io.kubernetes.client.Copy;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
-import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1Pod;
 import io.kubernetes.client.util.exception.CopyNotSupportedException;
@@ -30,8 +29,8 @@ public class KubectlCopy extends Kubectl.ResourceAndContainerBuilder<V1Pod, Kube
   private Boolean toPod;
   private boolean dir;
 
-  KubectlCopy(ApiClient client) {
-    super(client, V1Pod.class);
+  KubectlCopy() {
+    super(V1Pod.class);
     this.toPod = null;
   }