Use reflection to get getCustomResourceDoneableClass

Author: Soroosh Sarabadani

operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java

@@ -1,14 +1,13 @@
 package io.javaoperatorsdk.operator;
 
-import io.javaoperatorsdk.operator.api.Controller;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import io.fabric8.kubernetes.api.builder.Function;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import javassist.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.javaoperatorsdk.operator.api.Controller;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 
+import java.lang.reflect.ParameterizedType;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,7 +36,8 @@ static boolean getGenerationEventProcessing(ResourceController controller) {
     }
 
     static <R extends CustomResource> Class<R> getCustomResourceClass(ResourceController<R> controller) {
-        return (Class<R>) getAnnotation(controller).customResourceClass();
+        final Class<R> type = Arrays.stream(controller.getClass().getGenericInterfaces()).filter(i -> i instanceof ParameterizedType).map(i -> (ParameterizedTypeImpl) i).findFirst().map(i -> (Class<R>) i.getActualTypeArguments()[0]).get();
+        return type;
     }
 
     static String getCrdName(ResourceController controller) {
@@ -48,34 +48,11 @@ static String getCrdName(ResourceController controller) {
     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;
-            if (JAVA_VERSION >= 9) {
-                doneableClass = (Class<? extends CustomResourceDoneable<T>>) customDoneable.toClass(customResourceClass);
-            } else {
-                doneableClass = (Class<? extends CustomResourceDoneable<T>>) customDoneable.toClass();
-            }
-            doneableClassCache.put(customResourceClass, doneableClass);
-            return doneableClass;
-        } catch (CannotCompileException | NotFoundException e) {
-            throw new IllegalStateException(e);
+            final Class<T> customResourceClass = getCustomResourceClass(controller);
+            return (Class<? extends CustomResourceDoneable<T>>) Class.forName(customResourceClass.getCanonicalName() + "Doneable");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+            return null;
         }
     }