applies common object interfaces to utils

Author: yue9944882

extended/src/main/java/io/kubernetes/client/extended/controller/ControllerWatch.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.extended.controller;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.informer.ResourceEventHandler;
 import java.time.Duration;
 
@@ -8,7 +9,7 @@
  *
  * @param <ApiType> the type parameter
  */
-public interface ControllerWatch<ApiType> {
+public interface ControllerWatch<ApiType extends KubernetesObject> {
   /**
    * Gets the watching resource class.
    *

extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java

@@ -1,6 +1,7 @@
 package io.kubernetes.client.extended.controller;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.controller.reconciler.Request;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.util.ObjectAccessor;
@@ -22,7 +23,8 @@ public class Controllers {
    * @param <ApiType> the type parameter
    * @return the function
    */
-  public static <ApiType> Function<ApiType, Request> defaultReflectiveKeyFunc() {
+  public static <ApiType extends KubernetesObject>
+      Function<ApiType, Request> defaultReflectiveKeyFunc() {
     return (ApiType obj) -> {
       try {
         V1ObjectMeta objectMeta = ObjectAccessor.objectMetadata(obj);

extended/src/main/java/io/kubernetes/client/extended/controller/DefaultControllerWatch.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.extended.controller;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.controller.reconciler.Request;
 import io.kubernetes.client.extended.workqueue.WorkQueue;
 import io.kubernetes.client.informer.ResourceEventHandler;
@@ -13,7 +14,8 @@
  *
  * @param <ApiType> the type parameter
  */
-public class DefaultControllerWatch<ApiType> implements ControllerWatch<ApiType> {
+public class DefaultControllerWatch<ApiType extends KubernetesObject>
+    implements ControllerWatch<ApiType> {
 
   private final WorkQueue<Request> workQueue;
   private final Function<ApiType, Request> workKeyGenerator;

extended/src/main/java/io/kubernetes/client/extended/controller/builder/ControllerBuilder.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.extended.controller.builder;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.controller.reconciler.Request;
 import io.kubernetes.client.extended.workqueue.WorkQueue;
 import io.kubernetes.client.informer.SharedInformerFactory;
@@ -33,8 +34,9 @@ public static ControllerManagerBuilder controllerManagerBuilder(SharedInformerFa
    *
    * @return the controller watch builder
    */
-  public static <ApiType> ControllerWatchBuilder<ApiType> controllerWatchBuilder(
-      Class<ApiType> apiTypeClass, WorkQueue<Request> workQueue) {
+  public static <ApiType extends KubernetesObject>
+      ControllerWatchBuilder<ApiType> controllerWatchBuilder(
+          Class<ApiType> apiTypeClass, WorkQueue<Request> workQueue) {
     return new ControllerWatchBuilder(apiTypeClass, workQueue);
   }
 }

extended/src/main/java/io/kubernetes/client/extended/controller/builder/ControllerWatchBuilder.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.extended.controller.builder;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.controller.Controllers;
 import io.kubernetes.client.extended.controller.DefaultControllerWatch;
 import io.kubernetes.client.extended.controller.reconciler.Request;
@@ -9,7 +10,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-public class ControllerWatchBuilder<ApiType> {
+public class ControllerWatchBuilder<ApiType extends KubernetesObject> {
 
   private Function<ApiType, Request> workKeyGenerator;
   private WorkQueue<Request> workQueue;

extended/src/main/java/io/kubernetes/client/extended/controller/builder/DefaultControllerBuilder.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.extended.controller.builder;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.controller.*;
 import io.kubernetes.client.extended.controller.reconciler.Reconciler;
 import io.kubernetes.client.extended.controller.reconciler.Request;
@@ -50,7 +51,7 @@ public class DefaultControllerBuilder {
    * @param controllerWatchGetter the controller watch getter
    * @return the controller builder . controller watch builder
    */
-  public <ApiType> DefaultControllerBuilder watch(
+  public <ApiType extends KubernetesObject> DefaultControllerBuilder watch(
       Function<WorkQueue<Request>, ControllerWatch<ApiType>> controllerWatchGetter) {
     ControllerWatch<ApiType> watch = controllerWatchGetter.apply(this.workQueue);
     Class<ApiType> apiTypeClass = watch.getResourceClass();

extended/src/main/java/io/kubernetes/client/extended/generic/GenericKubernetesApi.java

@@ -4,6 +4,8 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
+import io.kubernetes.client.common.KubernetesListObject;
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.extended.generic.options.CreateOptions;
 import io.kubernetes.client.extended.generic.options.DeleteOptions;
@@ -39,7 +41,8 @@
  * @param <ApiType> the api type parameter
  * @param <ApiListType> the api list type parameter
  */
-public class GenericKubernetesApi<ApiType, ApiListType> {
+public class GenericKubernetesApi<
+    ApiType extends KubernetesObject, ApiListType extends KubernetesListObject> {
 
   // TODO(yue9944882): supports status operations..
   // TODO(yue9944882): supports generic sub-resource operations..

extended/src/test/java/io/kubernetes/client/extended/generic/FooCustomResource.java

@@ -1,8 +1,9 @@
 package io.kubernetes.client.extended.generic;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 
-public class FooCustomResource {
+public class FooCustomResource implements KubernetesObject {
   private V1ObjectMeta metadata;
 
   public V1ObjectMeta getMetadata() {
@@ -27,4 +28,14 @@ public boolean equals(Object o) {
   public int hashCode() {
     return metadata != null ? metadata.hashCode() : 0;
   }
+
+  @Override
+  public String getApiVersion() {
+    return "";
+  }
+
+  @Override
+  public String getKind() {
+    return "";
+  }
 }

extended/src/test/java/io/kubernetes/client/extended/generic/FooCustomResourceList.java

@@ -1,9 +1,10 @@
 package io.kubernetes.client.extended.generic;
 
+import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.openapi.models.V1ListMeta;
 import java.util.List;
 
-public class FooCustomResourceList {
+public class FooCustomResourceList implements KubernetesListObject {
   private V1ListMeta metadata;
   private List<FooCustomResource> items;
 
@@ -40,4 +41,14 @@ public int hashCode() {
     result = 31 * result + (items != null ? items.hashCode() : 0);
     return result;
   }
+
+  @Override
+  public String getApiVersion() {
+    return "";
+  }
+
+  @Override
+  public String getKind() {
+    return "";
+  }
 }

spring/src/main/java/io/kubernetes/client/spring/extended/controller/KubernetesInformerFactoryProcessor.java

@@ -1,5 +1,6 @@
 package io.kubernetes.client.spring.extended.controller;
 
+import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.extended.generic.GenericKubernetesApi;
 import io.kubernetes.client.extended.generic.KubernetesApiResponse;
 import io.kubernetes.client.extended.generic.options.ListOptions;
@@ -108,8 +109,8 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
       SharedIndexInformer sharedIndexInformer =
           sharedInformerFactory.sharedIndexInformerFor(
               new ListerWatcher() {
-                public Object list(CallGeneratorParams params) throws ApiException {
-                  KubernetesApiResponse resp =
+                public KubernetesListObject list(CallGeneratorParams params) throws ApiException {
+                  KubernetesApiResponse<KubernetesListObject> resp =
                       api.list(
                           new ListOptions() {
                             {