feat: switch to SyntheticBean (sync commit)

Author: metacosm

quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java

@@ -1,19 +1,32 @@
 package io.javaoperatorsdk.quarkus.extension.deployment;
 
+import java.lang.reflect.Modifier;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javax.inject.Singleton;
+
+import io.fabric8.kubernetes.client.CustomResourceDoneable;
 import io.javaoperatorsdk.operator.api.ControllerUtils;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.quarkus.extension.ConfigurationServiceRecorder;
 import io.javaoperatorsdk.quarkus.extension.QuarkusConfigurationService;
 import io.javaoperatorsdk.quarkus.extension.QuarkusControllerConfiguration;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
@@ -36,18 +49,23 @@ FeatureBuildItem feature() {
 
 
     @BuildStep
-    void createOperator(CombinedIndexBuildItem combinedIndexBuildItem,
-                        BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildItem) {
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void createDoneableClasses(CombinedIndexBuildItem combinedIndexBuildItem,
+                               BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
+                               BuildProducer<GeneratedClassBuildItem> generatedClass,
+                               ConfigurationServiceRecorder recorder) {
         final var index = combinedIndexBuildItem.getIndex();
         final var resourceControllers = index.getAllKnownImplementors(RESOURCE_CONTROLLER);
         final var controllerConfigs = resourceControllers.stream()
-            .map(this::createControllerConfiguration)
+            .map(ci -> createControllerConfiguration(ci, new GeneratedClassGizmoAdaptor(generatedClass, true)))
             .collect(Collectors.toList());
-        final var configService = AdditionalBeanBuildItem.unremovableOf(QuarkusConfigurationService.class);
-        additionalBeanBuildItemBuildItem.produce(configService);
+        syntheticBeanBuildItemBuildProducer.produce(SyntheticBeanBuildItem.configure(QuarkusConfigurationService.class)
+            .scope(Singleton.class)
+            .supplier(recorder.configurationServiceSupplier(controllerConfigs))
+            .done());
     }
 
-    private ControllerConfiguration createControllerConfiguration(ClassInfo info) {
+    private ControllerConfiguration createControllerConfiguration(ClassInfo info, ClassOutput classOutput) {
         // first retrieve the custom resource class
         final var rcInterface = info.interfaceTypes().stream()
             .filter(t -> t.name().equals(RESOURCE_CONTROLLER))
@@ -62,19 +80,18 @@ private ControllerConfiguration createControllerConfiguration(ClassInfo info) {
             throw new IllegalArgumentException("Couldn't find class " + crType);
         }
 
-        
         // generate associated Doneable class
-        /*final var doneableClassName = crType + "Doneable";
+        final var doneableClassName = crType + "Doneable";
         try (ClassCreator cc = ClassCreator.builder()
-//            .classOutput(classOutput)
+            .classOutput(classOutput)
             .className(doneableClassName)
             .superClass(CustomResourceDoneable.class)
             .build()) {
 
             MethodCreator ctor = cc.getMethodCreator("<init>", void.class, crClass);
             ctor.setModifiers(Modifier.PUBLIC);
             ctor.invokeSpecialMethod(MethodDescriptor.ofConstructor(CustomResourceDoneable.class, crClass, Function.class), ctor.getThis(), ctor.getMethodParam(0), ctor.invokeStaticMethod(MethodDescriptor.ofMethod(Function.class, "identity", Function.class)));
-        }*/
+        }
 
         // get Controller annotation
         final var controllerAnnotation = info.classAnnotation(CONTROLLER);
@@ -89,8 +106,8 @@ private ControllerConfiguration createControllerConfiguration(ClassInfo info) {
             valueOrDefault(controllerAnnotation, "isClusterScoped", AnnotationValue::asBoolean, () -> false),
             valueOrDefault(controllerAnnotation, "namespaces", AnnotationValue::asStringArray, () -> new String[]{}),
             crClass,
-            null,
-            null
+            null,  // todo: fix-me
+            null // todo: fix-me
         );
     }
 

quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/ResourceControllerBuildItem.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ *
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.quarkus.extension.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * @author <a href="[email protected]">Christophe Laprun</a>
+ */
+public class ResourceControllerBuildItem extends MultiBuildItem {
+
+}

quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ConfigurationServiceRecorder.java

@@ -0,0 +1,16 @@
+package io.javaoperatorsdk.quarkus.extension;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class ConfigurationServiceRecorder {
+    
+    public Supplier<ConfigurationService> configurationServiceSupplier(List<ControllerConfiguration> controllerConfigs) {
+        return () -> new QuarkusConfigurationService(controllerConfigs);
+    }
+}

quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusConfigurationService.java

@@ -1,6 +1,10 @@
 package io.javaoperatorsdk.quarkus.extension;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
@@ -20,9 +24,20 @@ public class QuarkusConfigurationService implements ConfigurationService {
     @Inject
     io.fabric8.kubernetes.client.KubernetesClient client;
 
+    private final Map<String, ControllerConfiguration> controllerConfigurations;
+    
+    public QuarkusConfigurationService(List<ControllerConfiguration> configurations) {
+        if (configurations != null && !configurations.isEmpty()) {
+            controllerConfigurations = new ConcurrentHashMap<>(configurations.size());
+            configurations.forEach(c -> controllerConfigurations.put(c.getName(), c));
+        } else {
+            controllerConfigurations = Collections.emptyMap();
+        }
+    }
+    
     @Override
     public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(ResourceController<R> controller) {
-        return null;
+        return controllerConfigurations.get(controller.getName());
     }
 
     @Override

samples/quarkus/src/main/java/io/javaoperatorsdk/operator/sample/TestResourceController.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ *
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.sample;
+
+import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.api.Context;
+import io.javaoperatorsdk.operator.api.DeleteControl;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.UpdateControl;
+
+/**
+ * @author <a href="[email protected]">Christophe Laprun</a>
+ */
+public class TestResourceController implements ResourceController<TestResourceController.TestResource> {
+    
+    @Override
+    public DeleteControl deleteResource(TestResource resource, Context<TestResource> context) {
+        return null;
+    }
+    
+    @Override
+    public UpdateControl<TestResource> createOrUpdateResource(TestResource resource, Context<TestResource> context) {
+        return null;
+    }
+    
+    public static class TestResource extends CustomResource {
+    }
+}