promote apiGroup/apiVersion/resourceName to resourceBuilder

Author: yue9944882

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

@@ -177,6 +177,9 @@ abstract static class ResourceBuilder<
     final Class<ApiType> apiTypeClass;
     String namespace;
     String name;
+    String apiGroup;
+    String apiVersion;
+    String resourceNamePlural;
 
     ResourceBuilder(ApiClient client, Class<ApiType> apiTypeClass) {
       this.apiClient = client;
@@ -192,6 +195,21 @@ public T namespace(String namespace) {
       this.namespace = namespace;
       return (T) this;
     }
+
+    public T apiGroup(String apiGroup) {
+      this.apiGroup = apiGroup;
+      return (T) this;
+    }
+
+    public T apiVersion(String apiVersion) {
+      this.apiVersion = apiVersion;
+      return (T) this;
+    }
+
+    public T resourceNamePlural(String resourceNamePlural) {
+      this.resourceNamePlural = resourceNamePlural;
+      return (T) this;
+    }
   }
 
   abstract static class ResourceAndContainerBuilder<

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

@@ -27,45 +27,18 @@ public class KubectlAnnotate<ApiType extends KubernetesObject>
     extends Kubectl.ResourceBuilder<ApiType, KubectlAnnotate<ApiType>>
     implements Kubectl.Executable<ApiType> {
 
-  private final ApiClient apiClient;
-  private final Class<ApiType> apiTypeClass;
   private final Map<String, String> addingAnnotations;
 
-  private String apiGroup;
-  private String apiVersion;
-  private String resourceNamePlural;
-
   KubectlAnnotate(ApiClient apiClient, Class<ApiType> apiTypeClass) {
     super(apiClient, apiTypeClass);
     this.addingAnnotations = new HashMap<>();
-    this.apiTypeClass = apiTypeClass;
-    this.apiClient = apiClient;
-  }
-
-  public KubectlAnnotate<ApiType> apiGroup(String apiGroup) {
-    this.apiGroup = apiGroup;
-    return this;
-  }
-
-  public KubectlAnnotate<ApiType> apiVersion(String apiVersion) {
-    this.apiVersion = apiVersion;
-    return this;
-  }
-
-  public KubectlAnnotate<ApiType> resourceNamePlural(String resourceNamePlural) {
-    this.resourceNamePlural = resourceNamePlural;
-    return this;
   }
 
   public KubectlAnnotate<ApiType> addAnnotation(String key, String value) {
     this.addingAnnotations.put(key, value);
     return this;
   }
 
-  private boolean isNamespaced() {
-    return !StringUtils.isEmpty(namespace);
-  }
-
   @Override
   public ApiType execute() throws KubectlException {
     verifyArguments();
@@ -103,6 +76,10 @@ public ApiType execute() throws KubectlException {
     }
   }
 
+  public boolean isNamespaced() {
+    return !StringUtils.isEmpty(namespace);
+  }
+
   private void verifyArguments() throws KubectlException {
     if (null == apiGroup) {
       throw new KubectlException("missing apiGroup argument");

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

@@ -26,40 +26,19 @@
 public class KubectlLabel<ApiType extends KubernetesObject>
     extends Kubectl.ResourceBuilder<ApiType, KubectlLabel<ApiType>>
     implements Kubectl.Executable<ApiType> {
+
   private final Map<String, String> addingLabels;
-  private String apiGroup;
-  private String apiVersion;
-  private String resourceNamePlural;
 
   KubectlLabel(ApiClient apiClient, Class<ApiType> apiTypeClass) {
     super(apiClient, apiTypeClass);
     this.addingLabels = new HashMap<>();
   }
 
-  public KubectlLabel<ApiType> apiGroup(String apiGroup) {
-    this.apiGroup = apiGroup;
-    return this;
-  }
-
-  public KubectlLabel<ApiType> apiVersion(String apiVersion) {
-    this.apiVersion = apiVersion;
-    return this;
-  }
-
-  public KubectlLabel<ApiType> resourceNamePlural(String resourceNamePlural) {
-    this.resourceNamePlural = resourceNamePlural;
-    return this;
-  }
-
   public KubectlLabel<ApiType> addLabel(String key, String value) {
     this.addingLabels.put(key, value);
     return this;
   }
 
-  private boolean isNamespaced() {
-    return !StringUtils.isEmpty(namespace);
-  }
-
   @Override
   public ApiType execute() throws KubectlException {
     verifyArguments();
@@ -97,6 +76,10 @@ public ApiType execute() throws KubectlException {
     }
   }
 
+  public boolean isNamespaced() {
+    return !StringUtils.isEmpty(namespace);
+  }
+
   private void verifyArguments() throws KubectlException {
     if (null == apiGroup) {
       throw new KubectlException("missing apiGroup argument");