handle abstract CustomResource!

Author: Soroosh Sarabadani

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/annotation/ControllerAnnotationProcessor.java

@@ -11,6 +11,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import io.fabric8.kubernetes.api.builder.Function;
+import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import java.io.PrintWriter;
@@ -42,6 +43,7 @@ public class ControllerAnnotationProcessor extends AbstractProcessor {
   private AccumulativeMappingWriter doneablesResourceWriter;
   private TypeParameterResolver typeParameterResolver;
   private final Set<String> generatedDoneableClassFiles = new HashSet<>();
+  private DeclaredType fallbackCustomResourceType;
 
   @Override
   public synchronized void init(ProcessingEnvironment processingEnv) {
@@ -53,7 +55,17 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
         new AccumulativeMappingWriter(DONEABLES_RESOURCE_PATH, processingEnv)
             .loadExistingMappings();
 
+    doneablesResourceWriter.add(
+        CustomResource.class.getCanonicalName(), CustomResourceDoneable.class.getCanonicalName());
+
     typeParameterResolver = initializeResolver(processingEnv);
+    fallbackCustomResourceType =
+        processingEnv
+            .getTypeUtils()
+            .getDeclaredType(
+                processingEnv
+                    .getElementUtils()
+                    .getTypeElement(CustomResourceDoneable.class.getCanonicalName()));
   }
 
   @Override
@@ -89,13 +101,16 @@ private TypeParameterResolver initializeResolver(ProcessingEnvironment processin
 
   private void generateDoneableClass(TypeElement controllerClassSymbol) {
     try {
-      System.out.println(controllerClassSymbol.toString());
       final TypeMirror resourceType = findResourceType(controllerClassSymbol);
-      System.out.println("the resource type is " + resourceType);
+      if (resourceType == null) {
+        controllersResourceWriter.add(
+            controllerClassSymbol.getQualifiedName().toString(),
+            CustomResource.class.getCanonicalName());
+        return;
+      }
 
       TypeElement customerResourceTypeElement =
           processingEnv.getElementUtils().getTypeElement(resourceType.toString());
-      System.out.println("the customerResourceTypeElement  is " + customerResourceTypeElement);
 
       final String doneableClassName = customerResourceTypeElement.getSimpleName() + "Doneable";
       final String destinationClassFileName =
@@ -155,6 +170,7 @@ private TypeMirror findResourceType(TypeElement controllerClassSymbol) {
     try {
       return typeParameterResolver.resolve(
           processingEnv.getTypeUtils(), (DeclaredType) controllerClassSymbol.asType());
+
     } catch (Exception e) {
       e.printStackTrace();
       return null;

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/annotation/TypeParameterResolver.java

@@ -29,40 +29,47 @@ public TypeParameterResolver(DeclaredType interestedClass, int interestedTypeArg
   public TypeMirror resolve(Types typeUtils, DeclaredType declaredType) {
     final var chain = findChain(typeUtils, declaredType);
     var lastIndex = chain.size() - 1;
-    String typeName;
+    String typeName = "";
     final List<? extends TypeMirror> typeArguments = (chain.get(lastIndex)).getTypeArguments();
-    if (typeArguments.get(0).getKind() == TYPEVAR) {
-      typeName = ((TypeVariable) typeArguments.get(0)).asElement().getSimpleName().toString();
-    } else if (typeArguments.get(0).getKind() == DECLARED) {
+    if (typeArguments.isEmpty()) {
+      return null;
+    }
+    if (typeArguments.get(interestedTypeArgumentIndex).getKind() == TYPEVAR) {
+      typeName =
+          ((TypeVariable) typeArguments.get(interestedTypeArgumentIndex))
+              .asElement()
+              .getSimpleName()
+              .toString();
+    } else if (typeArguments.get(interestedTypeArgumentIndex).getKind() == DECLARED) {
       return typeArguments.get(0);
-    } else {
-      typeName = "";
     }
 
     while (lastIndex > 0) {
       lastIndex -= 1;
       final List<? extends TypeMirror> tArguments = (chain.get(lastIndex)).getTypeArguments();
       final List<? extends TypeParameterElement> typeParameters =
           ((TypeElement) ((chain.get(lastIndex)).asElement())).getTypeParameters();
-      final String tName = typeName;
-      final var typeIndex =
-          IntStream.range(0, typeParameters.size())
-              .filter(i -> typeParameters.get(i).getSimpleName().toString().equals(tName))
-              .findFirst()
-              .getAsInt();
+
+      final var typeIndex = getTypeIndexWithName(typeName, typeParameters);
 
       final TypeMirror matchedType = tArguments.get(typeIndex);
       if (matchedType.getKind() == TYPEVAR) {
         typeName = ((TypeVariable) matchedType).asElement().getSimpleName().toString();
       } else if (matchedType.getKind() == DECLARED) {
         return matchedType;
-      } else {
-        typeName = "";
       }
     }
     return null;
   }
 
+  private int getTypeIndexWithName(
+      String typeName, List<? extends TypeParameterElement> typeParameters) {
+    return IntStream.range(0, typeParameters.size())
+        .filter(i -> typeParameters.get(i).getSimpleName().toString().equals(typeName))
+        .findFirst()
+        .getAsInt();
+  }
+
   private List<DeclaredType> findChain(Types typeUtils, DeclaredType declaredType) {
 
     final var result = new ArrayList<DeclaredType>();