Merge pull request #66 from ContainerSolutions/remove-doneable

Remove doneable

Author: csviri

README.md

@@ -48,9 +48,7 @@ The Controller implements the business logic and describes all the classes neede
 
 ```java
 @Controller(customResourceClass = WebServer.class,
-        crdName = "webservers.sample.javaoperatorsdk",
-        customResourceListClass = WebServerList.class,
-        customResourceDonebaleClass = WebServerDoneable.class)
+        crdName = "webservers.sample.javaoperatorsdk")
 public class WebServerController implements ResourceController<WebServer> {
 
     @Override

operator-framework/pom.xml

@@ -73,5 +73,10 @@
             <version>4.0.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.8.0.GA</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -2,12 +2,26 @@
 
 import com.github.containersolutions.operator.api.Controller;
 import com.github.containersolutions.operator.api.ResourceController;
+import io.fabric8.kubernetes.api.builder.Function;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.fabric8.kubernetes.client.CustomResourceList;
+import javassist.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
 
 class ControllerUtils {
 
+    private final static Logger log = LoggerFactory.getLogger(Operator.class);
+
+    // this is just to support testing, this way we don't try to create class multiple times in memory with same name.
+    // note that other solution is to add a random string to doneable class name
+    private static Map<Class<? extends CustomResource>, Class<? extends CustomResourceDoneable<? extends CustomResource>>>
+            doneableClassCache = new HashMap<>();
+
     static String getDefaultFinalizer(ResourceController controller) {
         return getAnnotation(controller).finalizerName();
     }
@@ -20,16 +34,37 @@ static String getCrdName(ResourceController controller) {
         return getAnnotation(controller).crdName();
     }
 
-    static <R extends CustomResource> Class<? extends CustomResourceList<R>> getCustomResourceListClass(ResourceController controller) {
-        return (Class<? extends CustomResourceList<R>>) getAnnotation(controller).customResourceListClass();
-    }
 
-    static <R extends CustomResource> Class<? extends CustomResourceDoneable<R>> getCustomResourceDonebaleClass(ResourceController controller) {
-        return (Class<? extends CustomResourceDoneable<R>>) getAnnotation(controller).customResourceDoneableClass();
+    public static <T extends CustomResource> Class<? extends CustomResourceDoneable<T>>
+    getCustomResourceDoneableClass(ResourceController<T> controller) {
+        try {
+            Class<? extends CustomResource> customResourceClass = getAnnotation(controller).customResourceClass();
+            String className = customResourceClass.getPackage().getName() + "." + customResourceClass.getSimpleName() + "CustomResourceDoneable";
+
+            if (doneableClassCache.containsKey(customResourceClass)) {
+                return (Class<? extends CustomResourceDoneable<T>>) doneableClassCache.get(customResourceClass);
+            }
+
+            ClassPool pool = ClassPool.getDefault();
+            pool.appendClassPath(new LoaderClassPath(Thread.currentThread().getContextClassLoader()));
+
+            CtClass superClass = pool.get(CustomResourceDoneable.class.getName());
+            CtClass function = pool.get(Function.class.getName());
+            CtClass customResource = pool.get(customResourceClass.getName());
+            CtClass[] argTypes = {customResource, function};
+            CtClass customDoneable = pool.makeClass(className, superClass);
+            CtConstructor ctConstructor = CtNewConstructor.make(argTypes, null, "super($1, $2);", customDoneable);
+            customDoneable.addConstructor(ctConstructor);
+
+            Class<? extends CustomResourceDoneable<T>> doneableClass = customDoneable.toClass();
+            doneableClassCache.put(customResourceClass, doneableClass);
+            return doneableClass;
+        } catch (CannotCompileException | NotFoundException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     private static Controller getAnnotation(ResourceController controller) {
         return controller.getClass().getAnnotation(Controller.class);
     }
-
 }

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

@@ -7,7 +7,6 @@
 import com.github.containersolutions.operator.processing.retry.Retry;
 import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.fabric8.kubernetes.client.CustomResourceList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -59,9 +58,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 = getCustomResourceListClass(controller);
-        Class<? extends CustomResourceDoneable<R>> doneable = getCustomResourceDonebaleClass(controller);
-        MixedOperation client = k8sClient.customResources(crd, resClass, list, doneable);
+        MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, getCustomResourceDoneableClass(controller));
         EventDispatcher eventDispatcher = new EventDispatcher(controller,
                 getDefaultFinalizer(controller), new EventDispatcher.CustomResourceReplaceFacade(client));
         EventScheduler eventScheduler = new EventScheduler(eventDispatcher, retry);

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,10 +17,5 @@
 
     Class<? extends CustomResource> customResourceClass();
 
-    Class<? extends CustomResourceList<? extends CustomResource>> customResourceListClass();
-
-    Class<? extends CustomResourceDoneable<? extends CustomResource>> customResourceDoneableClass();
-
     String finalizerName() default DEFAULT_FINALIZER;
-
-}
+}

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

@@ -1,6 +1,7 @@
 package com.github.containersolutions.operator;
 
 import com.github.containersolutions.operator.sample.TestCustomResource;
+import com.github.containersolutions.operator.sample.TestCustomResourceController;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.*;
@@ -50,6 +51,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedExcepti
                 .untilAsserted(() -> {
                     List<ConfigMap> items = integrationTest.getK8sClient().configMaps()
                             .inNamespace(TEST_NAMESPACE)
+                            .withLabel("managedBy", TestCustomResourceController.class.getSimpleName())
                             .list().getItems();
                     assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED);
                 });
@@ -75,6 +77,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedExcepti
                 .untilAsserted(() -> {
                     List<ConfigMap> items = integrationTest.getK8sClient().configMaps()
                             .inNamespace(TEST_NAMESPACE)
+                            .withLabel("managedBy", TestCustomResourceController.class.getSimpleName())
                             .list().getItems();
                     assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
 

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

@@ -2,23 +2,21 @@
 
 import com.github.containersolutions.operator.sample.TestCustomResource;
 import com.github.containersolutions.operator.sample.TestCustomResourceController;
-import com.github.containersolutions.operator.sample.TestCustomResourceDoneable;
-import com.github.containersolutions.operator.sample.TestCustomResourceList;
+import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import org.junit.jupiter.api.Test;
 
 import static com.github.containersolutions.operator.api.Controller.DEFAULT_FINALIZER;
 import static com.github.containersolutions.operator.sample.TestCustomResourceController.CRD_NAME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ControllerUtilsTest {
 
     @Test
     public void returnsValuesFromControllerAnnotationFinalizer() {
         assertEquals(DEFAULT_FINALIZER, ControllerUtils.getDefaultFinalizer(new TestCustomResourceController(null)));
         assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(new TestCustomResourceController(null)));
-        assertEquals(TestCustomResourceDoneable.class, ControllerUtils.getCustomResourceDonebaleClass(new TestCustomResourceController(null)));
-        assertEquals(TestCustomResourceList.class, ControllerUtils.getCustomResourceListClass(new TestCustomResourceController(null)));
         assertEquals(CRD_NAME, ControllerUtils.getCrdName(new TestCustomResourceController(null)));
+        assertTrue(CustomResourceDoneable.class.isAssignableFrom(ControllerUtils.getCustomResourceDoneableClass(new TestCustomResourceController(null))));
     }
-
 }

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

@@ -1,9 +1,14 @@
 package com.github.containersolutions.operator;
 
-import com.github.containersolutions.operator.sample.*;
+import com.github.containersolutions.operator.api.ResourceController;
+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.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;
@@ -17,6 +22,7 @@
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 
+import static com.github.containersolutions.operator.ControllerUtils.getCustomResourceDoneableClass;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
@@ -26,8 +32,8 @@ public class IntegrationTestSupport {
     public static final String TEST_CUSTOM_RESOURCE_PREFIX = "test-custom-resource-";
     private final static Logger log = LoggerFactory.getLogger(IntegrationTestSupport.class);
     private KubernetesClient k8sClient;
-    private MixedOperation<TestCustomResource, TestCustomResourceList, TestCustomResourceDoneable,
-            Resource<TestCustomResource, TestCustomResourceDoneable>> crOperations;
+    private MixedOperation<TestCustomResource, CustomResourceList, CustomResourceDoneable,
+            Resource<TestCustomResource, CustomResourceDoneable>> crOperations;
     private Operator operator;
 
 
@@ -52,7 +58,9 @@ public void cleanup() {
         k8sClient.customResourceDefinitions().createOrReplace(crd);
         KubernetesDeserializer.registerCustomKind(crd.getApiVersion(), crd.getKind(), TestCustomResource.class);
 
-        crOperations = k8sClient.customResources(crd, TestCustomResource.class, TestCustomResourceList.class, TestCustomResourceDoneable.class);
+        ResourceController<TestCustomResource> controller = new TestCustomResourceController(k8sClient);
+        Class doneableClass = getCustomResourceDoneableClass(controller);
+        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
@@ -69,7 +77,9 @@ public void cleanup() {
 
         await("all config maps cleaned up").atMost(60, TimeUnit.SECONDS)
                 .untilAsserted(() -> {
-                    assertThat(k8sClient.configMaps().inNamespace(TEST_NAMESPACE).list().getItems()).isEmpty();
+                    assertThat(k8sClient.configMaps().inNamespace(TEST_NAMESPACE)
+                            .withLabel("managedBy", TestCustomResourceController.class.getSimpleName())
+                            .list().getItems().isEmpty());
                 });
 
         log.info("Cleaned up namespace " + TEST_NAMESPACE);
@@ -105,7 +115,7 @@ public KubernetesClient getK8sClient() {
         return k8sClient;
     }
 
-    public MixedOperation<TestCustomResource, TestCustomResourceList, TestCustomResourceDoneable, Resource<TestCustomResource, TestCustomResourceDoneable>> getCrOperations() {
+    public MixedOperation<TestCustomResource, CustomResourceList, CustomResourceDoneable, Resource<TestCustomResource, CustomResourceDoneable>> getCrOperations() {
         return crOperations;
     }
 

operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java

@@ -15,9 +15,7 @@
 
 @Controller(
         crdName = TestCustomResourceController.CRD_NAME,
-        customResourceClass = TestCustomResource.class,
-        customResourceListClass = TestCustomResourceList.class,
-        customResourceDoneableClass = TestCustomResourceDoneable.class)
+        customResourceClass = TestCustomResource.class)
 public class TestCustomResourceController implements ResourceController<TestCustomResource> {
 
     private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);