Test annotation processor works correctly with more one interface

Author: Soroosh Sarabadani

operator-framework/pom.xml

@@ -120,6 +120,13 @@
             <version>3.27.0-GA</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.testing.compile</groupId>
+            <artifactId>compile-testing</artifactId>
+            <version>0.19</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
@@ -140,12 +147,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.testing.compile</groupId>
-            <artifactId>compile-testing</artifactId>
-            <version>0.19</version>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 </project>

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

@@ -3,16 +3,17 @@
 import com.google.auto.service.AutoService;
 import com.squareup.javapoet.*;
 import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Type;
 import io.fabric8.kubernetes.api.builder.Function;
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
+import io.javaoperatorsdk.operator.api.ResourceController;
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.JavaFileObject;
 import java.io.IOException;
@@ -39,7 +40,16 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     private void generateDoneableClass(Symbol.ClassSymbol controllerClassSymbol) {
         try {
             // TODO: the resourceType retrieval logic is currently very fragile, done for testing purposes and need to be improved to cover all possible conditions
-            final TypeMirror resourceType = ((DeclaredType) controllerClassSymbol.getInterfaces().head).getTypeArguments().get(0);
+            final Type controllerType = controllerClassSymbol
+                    .getInterfaces()
+                    .stream()
+                    .filter(i -> i.toString()
+                            .startsWith(ResourceController.class.getCanonicalName())
+                    )
+                    .findFirst()
+                    .orElseThrow(() -> new Exception("ResourceController is not implemented by " + controllerClassSymbol.toString()));
+
+            final TypeMirror resourceType = controllerType.getTypeArguments().get(0);
             Symbol.ClassSymbol customerResourceSymbol = (Symbol.ClassSymbol) processingEnv.getElementUtils().getTypeElement(resourceType.toString());
             JavaFileObject builderFile = processingEnv.getFiler()
                     .createSourceFile(customerResourceSymbol.className() + "Doneable");
@@ -48,7 +58,7 @@ private void generateDoneableClass(Symbol.ClassSymbol controllerClassSymbol) {
                         .addModifiers(Modifier.PUBLIC)
                         .addParameter(TypeName.get(resourceType), "resource")
                         .addParameter(Function.class, "function")
-                        .addStatement("super(resource,function);")
+                        .addStatement("super(resource,function)")
                         .build();
                 final TypeSpec typeSpec = TypeSpec.classBuilder(customerResourceSymbol.name + "Doneable")
                         .addAnnotation(RegisterForReflection.class)

operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/ControllerAnnotationProcessorTest.java

@@ -0,0 +1,20 @@
+package io.javaoperatorsdk.operator.processing;
+
+import com.google.testing.compile.*;
+import com.google.testing.compile.Compiler;
+import org.junit.jupiter.api.Test;
+
+import javax.tools.JavaFileObject;
+
+class ControllerAnnotationProcessorTest {
+    @Test
+    public void generateCorrectDoneableClassIfInterfaceIsSecond() {
+        Compilation compilation = Compiler.javac()
+                .withProcessors(new ControllerAnnotationProcessor())
+                .compile(JavaFileObjects.forResource("ControllerImplemented2Interfaces.java"));
+        CompilationSubject.assertThat(compilation).succeeded();
+
+        final JavaFileObject expectedResource = JavaFileObjects.forResource("ControllerImplemented2InterfacesExpected.java");
+        JavaFileObjectSubject.assertThat(compilation.generatedSourceFiles().get(0)).hasSourceEquivalentTo(expectedResource);
+    }
+}

operator-framework/src/test/resources/ControllerImplemented2Interfaces.java

@@ -0,0 +1,37 @@
+package io;
+
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.client.CustomResourceDoneable;
+import io.javaoperatorsdk.operator.api.Context;
+import io.javaoperatorsdk.operator.api.Controller;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.UpdateControl;
+import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.api.model.SecretBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+import java.io.Serializable;
+
+import static java.lang.String.format;
+
+@Controller(crdName = "schemas.mysql.sample.javaoperatorsdk")
+public class ControllerImplemented2Interfaces implements Serializable, ResourceController<ControllerImplemented2Interfaces.MyCustomResource> {
+
+    public static class MyCustomResource extends CustomResource {
+
+    }
+
+    @Override
+    public UpdateControl<MyCustomResource> createOrUpdateResource(MyCustomResource customResource, Context<MyCustomResource> context) {
+        return UpdateControl.updateCustomResource(null);
+    }
+
+    @Override
+    public boolean deleteResource(MyCustomResource customResource, Context<MyCustomResource> context) {
+        return false;
+    }
+}

operator-framework/src/test/resources/ControllerImplemented2InterfacesExpected.java

@@ -0,0 +1,12 @@
+package io;
+
+import io.fabric8.kubernetes.api.builder.Function;
+import io.fabric8.kubernetes.client.CustomResourceDoneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+public class MyCustomResourceDoneable extends CustomResourceDoneable<ControllerImplemented2Interfaces.MyCustomResource> {
+    public MyCustomResourceDoneable(ControllerImplemented2Interfaces.MyCustomResource resource, Function function) {
+        super(resource, function);
+    }
+}