Cleanup

Author: charlottemach

operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java

@@ -29,8 +29,8 @@ static String getCrdName(ResourceController controller) {
         return getAnnotation(controller).crdName();
     }
 
-    public static Class<? extends CustomResourceList> getCustomResourceListClass() {
-        return CustomResourceList.class;
+    public static <R extends CustomResource> Class<? extends CustomResourceList<R>>  getCustomResourceListClass() {
+        return (Class<? extends CustomResourceList<R>>) CustomResourceList.class;
     }
 
     public static <R extends CustomResource> Class<? extends CustomResourceDoneable<R>> getCustomResourceDoneableClass(ResourceController<R> controller) {

operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java

@@ -59,8 +59,7 @@ private <R extends CustomResource> void registerController(ResourceController<R>
         CustomResourceDefinition crd = getCustomResourceDefinitionForController(controller);
         KubernetesDeserializer.registerCustomKind(getApiVersion(crd), getKind(crd), resClass);
 
-        Class<? extends CustomResourceList<R>> list = (Class<? extends CustomResourceList<R>>) getCustomResourceListClass();
-
+        Class<? extends CustomResourceList<R>> list = getCustomResourceListClass();
         Class<? extends CustomResourceDoneable<R>> doneable = getCustomResourceDoneableClass(controller);
         MixedOperation client = k8sClient.customResources(crd, resClass, list, doneable);
         EventDispatcher eventDispatcher = new EventDispatcher(controller,

operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java

@@ -1,8 +1,6 @@
 package com.github.containersolutions.operator.api;
 
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.fabric8.kubernetes.client.CustomResourceList;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -19,9 +17,5 @@
 
     Class<? extends CustomResource> customResourceClass();
 
-    Class<? extends CustomResourceDoneable> customResourceDoneableClass() default CustomResourceDoneable.class;
-
-    Class<? extends CustomResourceList> customResourceListClass() default CustomResourceList.class;
-
     String finalizerName() default DEFAULT_FINALIZER;
-}
+}

operator-framework/src/test/java/com/github/containersolutions/operator/IntegrationTestSupport.java

@@ -32,8 +32,6 @@ public class IntegrationTestSupport {
     private KubernetesClient k8sClient;
     private MixedOperation<TestCustomResource, CustomResourceList, CustomResourceDoneable,
             Resource<TestCustomResource, CustomResourceDoneable>> crOperations;
-    private CreateOrReplaceable<TestCustomResource, TestCustomResource, CustomResourceDoneable> createOrReplaceable;
-    private Deletable<TestCustomResource> deleteable;
     private Operator operator;