refactor: simplify and streamline things

Author: metacosm

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

@@ -13,19 +13,18 @@
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ControllerUtils;
 import io.javaoperatorsdk.operator.api.ResourceController;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.quarkus.extension.ConfigurationServiceRecorder;
+import io.javaoperatorsdk.quarkus.extension.OperatorProducer;
 import io.javaoperatorsdk.quarkus.extension.QuarkusConfigurationService;
 import io.javaoperatorsdk.quarkus.extension.QuarkusControllerConfiguration;
-import io.javaoperatorsdk.quarkus.extension.QuarkusOperator;
 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.Consume;
 import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Produce;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -57,45 +56,34 @@ FeatureBuildItem feature() {
 
 
     @BuildStep
-    List<ControllerConfigurationBuildItem> createControllerBeans(CombinedIndexBuildItem combinedIndexBuildItem,
-                                                                 BuildProducer<GeneratedClassBuildItem> generatedClass,
-                                                                 BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void createConfigurationServiceAndOperator(CombinedIndexBuildItem combinedIndexBuildItem,
+                                               BuildProducer<GeneratedClassBuildItem> generatedClass,
+                                               BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
+                                               BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+                                               KubernetesClientBuildItem clientBuildItem,
+                                               ConfigurationServiceRecorder recorder) {
         final var index = combinedIndexBuildItem.getIndex();
         final var resourceControllers = index.getAllKnownImplementors(RESOURCE_CONTROLLER);
 
         final var classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
-        return resourceControllers.stream()
+        final List<ControllerConfiguration> controllerConfigs = resourceControllers.stream()
             .map(ci -> createControllerConfiguration(ci, classOutput, additionalBeans))
             .collect(Collectors.toList());
-    }
-    
-    
-    @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    @Produce(ConfigurationServiceDoneBuildItem.class)
-    void createConfigurationService(BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
-                                    List<ControllerConfigurationBuildItem> configurations,
-                                    KubernetesClientBuildItem clientBuildItem,
-                                    ConfigurationServiceRecorder recorder) {
-        final List<ControllerConfiguration> controllerConfigs = configurations.stream()
-            .map(ControllerConfigurationBuildItem::getConfiguration)
-            .collect(Collectors.toList());
-        final var supplier = recorder.configurationServiceSupplier(controllerConfigs, clientBuildItem.getClient());
+        
+        final var supplier = recorder.configurationServiceSupplier(controllerConfigs);
         syntheticBeanBuildItemBuildProducer.produce(SyntheticBeanBuildItem.configure(QuarkusConfigurationService.class)
             .scope(Singleton.class)
             .addType(ConfigurationService.class)
             .setRuntimeInit()
             .supplier(supplier)
             .done());
+        
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(OperatorProducer.class));
     }
 
-    @BuildStep
-    @Consume(ConfigurationServiceDoneBuildItem.class)
-    void createOperator(BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
-        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(QuarkusOperator.class));
-    }
 
-    private ControllerConfigurationBuildItem createControllerConfiguration(ClassInfo info, ClassOutput classOutput, BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+    private ControllerConfiguration createControllerConfiguration(ClassInfo info, ClassOutput classOutput, BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
         // first retrieve the custom resource class
         final var rcInterface = info.interfaceTypes().stream()
             .filter(t -> t.name().equals(RESOURCE_CONTROLLER))
@@ -142,7 +130,7 @@ private ControllerConfigurationBuildItem createControllerConfiguration(ClassInfo
             null // todo: fix-me
         );
 
-        return new ControllerConfigurationBuildItem(configuration);
+        return configuration;
     }
 
 

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

@@ -3,15 +3,14 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import io.fabric8.kubernetes.client.KubernetesClient;
 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, KubernetesClient client) {
-        return () -> new QuarkusConfigurationService(controllerConfigs, client);
+    public Supplier<ConfigurationService> configurationServiceSupplier(List<ControllerConfiguration> controllerConfigs) {
+        return () -> new QuarkusConfigurationService(controllerConfigs);
     }
 }

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

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.quarkus.extension;
 
 import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -10,24 +9,12 @@
 import io.quarkus.arc.DefaultBean;
 
 @Singleton
-@DefaultBean
-public class QuarkusOperator {
-    @Inject
-    KubernetesClient k8sClient;
-    
-    @Inject
-    ConfigurationService configurationService;
-    
-    private final Operator operator;
-    
-    public QuarkusOperator() {
-        operator = new Operator(k8sClient, configurationService);
-    }
+public class OperatorProducer {
 
     @Produces
     @DefaultBean
     @Singleton
-    Operator operator() {
-        return operator;
+    Operator operator(KubernetesClient client, ConfigurationService configuration) {
+        return new Operator(client, configuration);
     }
 }

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

@@ -5,6 +5,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.inject.Inject;
+
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -14,10 +16,10 @@
 
 public class QuarkusConfigurationService implements ConfigurationService {
     private final Map<String, ControllerConfiguration> controllerConfigurations;
-    private final KubernetesClient client;
+    @Inject
+    KubernetesClient client;
 
-    public QuarkusConfigurationService(List<ControllerConfiguration> configurations, KubernetesClient client) {
-        this.client = client;
+    public QuarkusConfigurationService(List<ControllerConfiguration> configurations) {
         if (configurations != null && !configurations.isEmpty()) {
             controllerConfigurations = new ConcurrentHashMap<>(configurations.size());
             configurations.forEach(c -> controllerConfigurations.put(c.getName(), c));