operator-framework · metacosm · Feb 22, 2021 · Feb 22, 2021 · Feb 22, 2021 · Feb 22, 2021
diff --git a/.../main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java b/.../main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java
@@ -26,6 +26,7 @@
 import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.util.JandexUtil;
+import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -75,6 +76,7 @@ void createConfigurationServiceAndOperator(
 
     final List<ControllerConfiguration> controllerConfigs =
         resourceControllers.stream()
+            .filter(ci -> !Modifier.isAbstract(ci.flags()))
             .map(ci -> createControllerConfiguration(ci, additionalBeans, reflectionClasses, index))
             .collect(Collectors.toList());
 
@@ -124,7 +126,7 @@ private ControllerConfiguration createControllerConfiguration(
     try {
       cr = crClass.getConstructor().newInstance();
     } catch (Exception e) {
-      throw new IllegalArgumentException(e.getCause());
+      throw new IllegalArgumentException("Cannot instantiate '" + crType + "' CR class", e);
     }
 
     // retrieve CRD name from CR type

diff --git a/operator-framework-quarkus-extension/tests/pom.xml b/operator-framework-quarkus-extension/tests/pom.xml
@@ -33,6 +33,11 @@
       <artifactId>quarkus-junit5-internal</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-test-kubernetes-client</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
@@ -74,6 +79,18 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/...arkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/AbstractController.java b/...arkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/AbstractController.java
@@ -0,0 +1,19 @@
+package io.javaoperatorsdk.quarkus.it;
+
+import io.javaoperatorsdk.operator.api.Context;
+import io.javaoperatorsdk.operator.api.DeleteControl;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.UpdateControl;
+
+public abstract class AbstractController<T extends TestResource> implements ResourceController<T> {
+
+  @Override
+  public DeleteControl deleteResource(T resource, Context<T> context) {
+    return null;
+  }
+
+  @Override
+  public UpdateControl<T> createOrUpdateResource(T resource, Context<T> context) {
+    return null;
+  }
+}
diff --git a/...uarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/ChildTestResource.java b/...uarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/ChildTestResource.java
@@ -0,0 +1,8 @@
+package io.javaoperatorsdk.quarkus.it;
+
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Group("example.com")
+@Version("v1")
+public class ChildTestResource extends TestResource {}
diff --git a/...kus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/ConfiguredController.java b/...kus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/ConfiguredController.java
@@ -1,24 +1,9 @@
 package io.javaoperatorsdk.quarkus.it;
 
-import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
-import io.javaoperatorsdk.operator.api.DeleteControl;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.UpdateControl;
 
 @Controller(name = ConfiguredController.NAME, namespaces = "foo")
-public class ConfiguredController implements ResourceController<TestResource> {
+public class ConfiguredController extends AbstractController<ChildTestResource> {
 
   public static final String NAME = "annotation";
-
-  @Override
-  public DeleteControl deleteResource(TestResource resource, Context<TestResource> context) {
-    return null;
-  }
-
-  @Override
-  public UpdateControl<TestResource> createOrUpdateResource(
-      TestResource resource, Context<TestResource> context) {
-    return null;
-  }
 }
diff --git a/...k-quarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/TestController.java b/...k-quarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/TestController.java
@@ -1,23 +1,8 @@
 package io.javaoperatorsdk.quarkus.it;
 
-import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
-import io.javaoperatorsdk.operator.api.DeleteControl;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.UpdateControl;
 
 @Controller(name = TestController.NAME)
-public class TestController implements ResourceController<TestResource> {
+public class TestController extends AbstractController<ChildTestResource> {
   public static final String NAME = "test";
-
-  @Override
-  public DeleteControl deleteResource(TestResource resource, Context<TestResource> context) {
-    return null;
-  }
-
-  @Override
-  public UpdateControl<TestResource> createOrUpdateResource(
-      TestResource resource, Context<TestResource> context) {
-    return null;
-  }
 }
diff --git a/...ork-quarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/TestResource.java b/...ork-quarkus-extension/tests/src/main/java/io/javaoperatorsdk/quarkus/it/TestResource.java
@@ -6,4 +6,4 @@
 
 @Group("example.com")
 @Version("v1")
-public class TestResource extends CustomResource {}
+public abstract class TestResource extends CustomResource<String, Void> {}
diff --git a/...sion/tests/src/test/java/io/javaoperatorsdk/quarkus/it/QuarkusExtensionProcessorTest.java b/...sion/tests/src/test/java/io/javaoperatorsdk/quarkus/it/QuarkusExtensionProcessorTest.java
@@ -5,33 +5,19 @@
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 
-import io.quarkus.test.QuarkusProdModeTest;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.kubernetes.client.KubernetesMockServerTestResource;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
 
 /**
  * This tests creates and starts an application accessed over REST to assess that injected values
  * are present and what we expect.
  */
+@QuarkusTest
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
 public class QuarkusExtensionProcessorTest {
 
-  @RegisterExtension
-  static final QuarkusProdModeTest config =
-      new QuarkusProdModeTest()
-          .setArchiveProducer(
-              () ->
-                  ShrinkWrap.create(JavaArchive.class)
-                      .addClasses(
-                          TestOperatorApp.class,
-                          TestController.class,
-                          ConfiguredController.class,
-                          TestResource.class))
-          .setApplicationName("basic-app")
-          .setApplicationVersion("0.1-SNAPSHOT")
-          .setRun(true);
-
   @Test
   void controllerShouldExist() {
     // first check that we're not always returning true for any controller name :)
@@ -46,7 +32,7 @@ void controllerShouldExist() {
   void configurationForControllerShouldExist() {
     // check that the config for the test controller can be retrieved and is conform to our
     // expectations
-    final var resourceName = TestResource.class.getCanonicalName();
+    final var resourceName = ChildTestResource.class.getCanonicalName();
     given()
         .when()
         .get("/operator/" + TestController.NAME + "/config")