Remove customResourceList generation

Author: charlottemach

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

@@ -4,7 +4,6 @@
 import com.github.containersolutions.operator.api.ResourceController;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.fabric8.kubernetes.client.CustomResourceList;
 import javassist.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -29,9 +28,6 @@ static String getCrdName(ResourceController controller) {
         return getAnnotation(controller).crdName();
     }
 
-    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) {
         return createCustomResourceDoneableClass(controller);

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

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

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

@@ -3,7 +3,6 @@
 import com.github.containersolutions.operator.sample.TestCustomResource;
 import com.github.containersolutions.operator.sample.TestCustomResourceController;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.fabric8.kubernetes.client.CustomResourceList;
 import org.junit.jupiter.api.Test;
 
 import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER;
@@ -19,6 +18,5 @@ public void returnsValuesFromControllerAnnotationFinalizer() {
         assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController(null)));
         assertEquals(CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null)));
         assertTrue(CustomResourceDoneable.class.isAssignableFrom(ControllerUtils.getCustomResourceDoneableClass(new TestCustomResourceController(null))));
-        assertEquals(CustomResourceList.class, ControllerUtils.getCustomResourceListClass());
     }
 }

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

@@ -1,13 +1,16 @@
 package com.github.containersolutions.operator;
 
 import com.github.containersolutions.operator.api.ResourceController;
-import com.github.containersolutions.operator.sample.*;
+import com.github.containersolutions.operator.sample.TestCustomResource;
+import com.github.containersolutions.operator.sample.TestCustomResourceController;
+import com.github.containersolutions.operator.sample.TestCustomResourceSpec;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
-import io.fabric8.kubernetes.client.*;
-import io.fabric8.kubernetes.client.dsl.CreateOrReplaceable;
-import io.fabric8.kubernetes.client.dsl.Deletable;
+import io.fabric8.kubernetes.client.CustomResourceDoneable;
+import io.fabric8.kubernetes.client.CustomResourceList;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.utils.Serialization;
@@ -20,7 +23,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceDoneableClass;
-import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceListClass;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -57,9 +59,8 @@ public void cleanup() {
         KubernetesDeserializer.registerCustomKind(crd.getApiVersion(), crd.getKind(), TestCustomResource.class);
 
         ResourceController<TestCustomResource> controller = new TestCustomResourceController(k8sClient);
-        Class listClass = getCustomResourceListClass();
         Class doneableClass = getCustomResourceDoneableClass(controller);
-        crOperations = k8sClient.customResources(crd, TestCustomResource.class, listClass, doneableClass);
+        crOperations = k8sClient.customResources(crd, TestCustomResource.class, CustomResourceList.class, doneableClass);
         crOperations.inNamespace(TEST_NAMESPACE).delete(crOperations.list().getItems());
         //we depend on the actual operator from the startup to handle the finalizers and clean up
         //resources from previous test runs