apply kubernetes common interface to more extended functionalities

yue9944882 · yue9944882 · commit 1debf183c2e7 · 2020-06-30T17:22:31.000+08:00
diff --git a/extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java b/extended/src/main/java/io/kubernetes/client/extended/controller/Controllers.java
@@ -4,8 +4,6 @@
 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;
-import io.kubernetes.client.util.exception.ObjectMetaReflectException;
 import java.util.concurrent.ThreadFactory;
 import java.util.function.Function;
 import org.slf4j.Logger;
@@ -26,13 +24,8 @@ public class Controllers {
   public static <ApiType extends KubernetesObject>
       Function<ApiType, Request> defaultReflectiveKeyFunc() {
     return (ApiType obj) -> {
-      try {
-        V1ObjectMeta objectMeta = ObjectAccessor.objectMetadata(obj);
-        return new Request(objectMeta.getNamespace(), objectMeta.getName());
-      } catch (ObjectMetaReflectException e) {
-        log.error("Fail to access object-meta from {}..", obj.getClass());
-        return null;
-      }
+      V1ObjectMeta objectMeta = obj.getMetadata();
+      return new Request(objectMeta.getNamespace(), objectMeta.getName());
     };
   }
 
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventRecorder.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventRecorder.java
@@ -1,15 +1,16 @@
 package io.kubernetes.client.extended.event.legacy;
 
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.event.EventType;
 import io.kubernetes.client.openapi.models.V1ObjectReference;
 import java.util.Map;
 
 public interface EventRecorder {
 
-  void event(Object object, EventType t, String reason, String format, String... args);
+  void event(KubernetesObject object, EventType t, String reason, String format, String... args);
 
   void event(
-      Object object,
+      KubernetesObject object,
       Map<String, String> attachedAnnotation,
       EventType t,
       String reason,
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/ObjectReferenceResolvingEventRecorder.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/ObjectReferenceResolvingEventRecorder.java
@@ -1,6 +1,7 @@
 package io.kubernetes.client.extended.event.legacy;
 
 import com.google.common.base.Strings;
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.extended.event.EventType;
 import io.kubernetes.client.openapi.models.V1Event;
 import io.kubernetes.client.openapi.models.V1EventBuilder;
@@ -9,10 +10,6 @@
 import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
 import io.kubernetes.client.openapi.models.V1ObjectReference;
 import io.kubernetes.client.openapi.models.V1ObjectReferenceBuilder;
-import io.kubernetes.client.util.ObjectAccessor;
-import io.kubernetes.client.util.TypeAccessor;
-import io.kubernetes.client.util.exception.ObjectMetaReflectException;
-import io.kubernetes.client.util.exception.TypeMetaReflectException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
@@ -36,25 +33,31 @@ public ObjectReferenceResolvingEventRecorder(
   private V1EventSource eventSource;
 
   @Override
-  public void event(Object object, EventType t, String reason, String format, String... args) {
+  public void event(
+      KubernetesObject object, EventType t, String reason, String format, String... args) {
     event(object, new HashMap<>(), t, reason, format, args);
   }
 
   @Override
   public void event(
-      Object object,
+      KubernetesObject object,
       Map<String, String> attachedAnnotation,
       EventType t,
       String reason,
       String format,
       String... args) {
-    generateEvent(object, attachedAnnotation, t, reason, String.format(format, args));
+    generateEvent(
+        constructObjectReference(object),
+        attachedAnnotation,
+        t,
+        reason,
+        String.format(format, args));
   }
 
   @Override
   public void event(
       V1ObjectReference ref, EventType t, String reason, String format, String... args) {
-    event((Object) ref, t, reason, format, args);
+    event(ref, new HashMap<>(), t, reason, format, args);
   }
 
   @Override
@@ -65,35 +68,27 @@ public void event(
       String reason,
       String format,
       String... args) {
-    event((Object) ref, attachedAnnotation, t, reason, format, args);
+    generateEvent(ref, attachedAnnotation, t, reason, String.format(format, args));
+  }
+
+  private V1ObjectReference constructObjectReference(KubernetesObject eventRefObject) {
+    V1ObjectMeta meta = eventRefObject.getMetadata();
+    return new V1ObjectReferenceBuilder()
+        .withApiVersion(eventRefObject.getApiVersion())
+        .withKind(eventRefObject.getKind())
+        .withUid(meta.getUid())
+        .withNamespace(meta.getNamespace())
+        .withName(meta.getName())
+        .withResourceVersion(meta.getResourceVersion())
+        .build();
   }
 
   private void generateEvent(
-      Object eventRefObject,
+      V1ObjectReference eventRef,
       Map<String, String> annotations,
       EventType t,
       String reason,
       String message) {
-    V1ObjectReference eventRef;
-    if (eventRefObject instanceof V1ObjectReference) {
-      eventRef = (V1ObjectReference) eventRefObject;
-    } else {
-      try {
-        V1ObjectMeta meta = ObjectAccessor.objectMetadata(eventRefObject);
-        eventRef =
-            new V1ObjectReferenceBuilder()
-                .withApiVersion(TypeAccessor.apiVersion(eventRefObject))
-                .withKind(TypeAccessor.kind(eventRefObject))
-                .withUid(meta.getUid())
-                .withNamespace(meta.getNamespace())
-                .withName(meta.getName())
-                .withResourceVersion(meta.getResourceVersion())
-                .build();
-      } catch (ObjectMetaReflectException | TypeMetaReflectException e) {
-        logger.error("failed parsing eventRefObject", e);
-        return;
-      }
-    }
 
     // defaulting event namespace for cluster-scoped resources..
     String namespace = eventRef.getNamespace();
diff --git a/extended/src/main/java/io/kubernetes/client/extended/generic/GenericKubernetesApi.java b/extended/src/main/java/io/kubernetes/client/extended/generic/GenericKubernetesApi.java
@@ -6,6 +6,7 @@
 import com.google.gson.reflect.TypeToken;
 import io.kubernetes.client.common.KubernetesListObject;
 import io.kubernetes.client.common.KubernetesObject;
+import io.kubernetes.client.common.KubernetesType;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.extended.generic.options.CreateOptions;
 import io.kubernetes.client.extended.generic.options.DeleteOptions;
@@ -19,11 +20,9 @@
 import io.kubernetes.client.openapi.apis.CustomObjectsApi;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Status;
-import io.kubernetes.client.util.ObjectAccessor;
 import io.kubernetes.client.util.PatchUtils;
 import io.kubernetes.client.util.Watch;
 import io.kubernetes.client.util.Watchable;
-import io.kubernetes.client.util.exception.ObjectMetaReflectException;
 import java.io.IOException;
 import okhttp3.Call;
 import okhttp3.HttpUrl;
@@ -378,12 +377,7 @@ public KubernetesApiResponse<ApiListType> list(String namespace, final ListOptio
    * @return the kubernetes api response
    */
   public KubernetesApiResponse<ApiType> create(ApiType object, final CreateOptions createOptions) {
-    V1ObjectMeta objectMeta;
-    try {
-      objectMeta = ObjectAccessor.objectMetadata(object);
-    } catch (ObjectMetaReflectException e) {
-      throw new IllegalArgumentException("fail to extract object metadata");
-    }
+    V1ObjectMeta objectMeta = object.getMetadata();
 
     return executeCall(
         customObjectsApi.getApiClient(),
@@ -424,12 +418,7 @@ public KubernetesApiResponse<ApiType> create(ApiType object, final CreateOptions
    * @return the kubernetes api response
    */
   public KubernetesApiResponse<ApiType> update(ApiType object, final UpdateOptions updateOptions) {
-    V1ObjectMeta objectMeta;
-    try {
-      objectMeta = ObjectAccessor.objectMetadata(object);
-    } catch (ObjectMetaReflectException e) {
-      throw new IllegalArgumentException("fail to extract object metadata");
-    }
+    V1ObjectMeta objectMeta = object.getMetadata();
     return executeCall(
         customObjectsApi.getApiClient(),
         apiTypeClass,
@@ -674,13 +663,15 @@ public Watchable<ApiType> watch(String namespace, final ListOptions listOptions)
         TypeToken.getParameterized(Watch.Response.class, apiTypeClass).getType());
   }
 
-  private static <DataType> KubernetesApiResponse<DataType> getKubernetesApiResponse(
-      Class<DataType> dataClass, JsonElement element, Gson gson) {
+  private static <DataType extends KubernetesType>
+      KubernetesApiResponse<DataType> getKubernetesApiResponse(
+          Class<DataType> dataClass, JsonElement element, Gson gson) {
     return getKubernetesApiResponse(dataClass, element, gson, 200);
   }
 
-  private static <DataType> KubernetesApiResponse<DataType> getKubernetesApiResponse(
-      Class<DataType> dataClass, JsonElement element, Gson gson, int httpStatusCode) {
+  private static <DataType extends KubernetesType>
+      KubernetesApiResponse<DataType> getKubernetesApiResponse(
+          Class<DataType> dataClass, JsonElement element, Gson gson, int httpStatusCode) {
     JsonElement kindElement = element.getAsJsonObject().get("kind");
     boolean isStatus = kindElement != null && "Status".equals(kindElement.getAsString());
     if (isStatus) {
@@ -689,7 +680,7 @@ private static <DataType> KubernetesApiResponse<DataType> getKubernetesApiRespon
     return new KubernetesApiResponse<>(gson.fromJson(element, dataClass));
   }
 
-  private <DataType> KubernetesApiResponse<DataType> executeCall(
+  private <DataType extends KubernetesType> KubernetesApiResponse<DataType> executeCall(
       ApiClient apiClient, Class<DataType> dataClass, CallBuilder callBuilder) {
     try {
       Call call = callBuilder.build();
diff --git a/extended/src/main/java/io/kubernetes/client/extended/generic/KubernetesApiResponse.java b/extended/src/main/java/io/kubernetes/client/extended/generic/KubernetesApiResponse.java
@@ -1,8 +1,9 @@
 package io.kubernetes.client.extended.generic;
 
+import io.kubernetes.client.common.KubernetesType;
 import io.kubernetes.client.openapi.models.V1Status;
 
-public class KubernetesApiResponse<DataType> {
+public class KubernetesApiResponse<DataType extends KubernetesType> {
 
   private final DataType object;
   private final V1Status status;
diff --git a/extended/src/main/java/io/kubernetes/client/extended/pager/Pager.java b/extended/src/main/java/io/kubernetes/client/extended/pager/Pager.java
@@ -12,10 +12,10 @@
  */
 package io.kubernetes.client.extended.pager;
 
+import io.kubernetes.client.common.KubernetesListObject;
+import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
-import io.kubernetes.client.util.ListAccessor;
-import io.kubernetes.client.util.exception.ObjectMetaReflectException;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Iterator;
@@ -26,7 +26,8 @@
  * Pager encapsulates kubernetes limit/continue-based list pagination into an iterator.
  * Note that pager is thread-safe.
  */
-public class Pager<ApiType, ApiListType> implements Iterable<ApiType> {
+public class Pager<ApiType extends KubernetesObject, ApiListType extends KubernetesListObject>
+    implements Iterable<ApiType> {
   private Integer limit;
   private ApiClient client;
   private Type listType;
@@ -136,15 +137,15 @@ public ApiType next() {
           call = getNextCall(limit, continueToken);
 
           listObjectCurrentPage = executeRequest(call);
-          continueToken = ListAccessor.listMetadata(listObjectCurrentPage).getContinue();
+          continueToken = listObjectCurrentPage.getMetadata().getContinue();
 
           offsetCurrentPage = 0;
-          currentPageSize = ListAccessor.<ApiType>getItems(listObjectCurrentPage).size();
+          currentPageSize = listObjectCurrentPage.getItems().size();
         }
-        return ListAccessor.<ApiType>getItems(listObjectCurrentPage).get(offsetCurrentPage++);
+        return (ApiType) listObjectCurrentPage.getItems().get(offsetCurrentPage++);
       } catch (ApiException e) {
         throw new RuntimeException(e.getResponseBody());
-      } catch (ObjectMetaReflectException | IOException e) {
+      } catch (IOException e) {
         throw new RuntimeException(e);
       }
     }
diff --git a/util/src/main/java/io/kubernetes/client/informer/cache/Caches.java b/util/src/main/java/io/kubernetes/client/informer/cache/Caches.java
@@ -3,8 +3,6 @@
 import com.google.common.base.Strings;
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import io.kubernetes.client.util.ObjectAccessor;
-import io.kubernetes.client.util.exception.ObjectMetaReflectException;
 import java.util.Collections;
 import java.util.List;
 
@@ -54,16 +52,11 @@ public static String metaNamespaceKeyFunc(KubernetesObject obj) {
    * @param obj specific object
    * @return the indexed value
    */
-  public static List<String> metaNamespaceIndexFunc(Object obj) {
-    try {
-      V1ObjectMeta metadata = ObjectAccessor.objectMetadata(obj);
-      if (metadata == null) {
-        return Collections.emptyList();
-      }
-      return Collections.singletonList(metadata.getNamespace());
-    } catch (ObjectMetaReflectException e) {
-      // NOTE(yue9944882): might want to handle this as a checked exception
-      throw new RuntimeException(e);
+  public static List<String> metaNamespaceIndexFunc(KubernetesObject obj) {
+    V1ObjectMeta metadata = obj.getMetadata();
+    if (metadata == null) {
+      return Collections.emptyList();
     }
+    return Collections.singletonList(metadata.getNamespace());
   }
 }
diff --git a/util/src/main/java/io/kubernetes/client/informer/cache/ReflectorRunnable.java b/util/src/main/java/io/kubernetes/client/informer/cache/ReflectorRunnable.java
@@ -48,9 +48,9 @@ public void run() {
 
       ApiListType list = listerWatcher.list(new CallGeneratorParams(Boolean.FALSE, null, null));
 
-      V1ListMeta listMeta = ListAccessor.listMetadata(list);
+      V1ListMeta listMeta = list.getMetadata();
       String resourceVersion = listMeta.getResourceVersion();
-      List<ApiType> items = ListAccessor.getItems(list);
+      List<? extends KubernetesObject> items = list.getItems();
 
       if (log.isDebugEnabled()) {
         log.debug("{}#Extract resourceVersion {} list meta", apiTypeClass, resourceVersion);
@@ -118,7 +118,7 @@ public void stop() {
     isActive.set(false);
   }
 
-  private void syncWith(List<ApiType> items, String resourceVersion) {
+  private void syncWith(List<? extends KubernetesObject> items, String resourceVersion) {
     this.store.replace(
         (List<KubernetesObject>) items, resourceVersion); // down-casting is safe here
   }
