Merge pull request #12107 from mkouba/command-line-args

Replace CommandLineArgumentsProducer with a synthetic bean

extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CommandLineArgumentsProcessor.java

@@ -1,26 +1,27 @@
 package io.quarkus.arc.deployment;
 
-import io.quarkus.arc.runtime.ArcRecorder;
-import io.quarkus.arc.runtime.CommandLineArgumentsProducer;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+
+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.RawCommandLineArgumentsBuildItem;
 import io.quarkus.runtime.annotations.CommandLineArguments;
 
 public class CommandLineArgumentsProcessor {
 
     @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    BeanContainerListenerBuildItem commandLineArgs(RawCommandLineArgumentsBuildItem rawCommandLineArgumentsBuildItem,
-            ArcRecorder arcRecorder) {
-        //todo: this should be filtered
-        return new BeanContainerListenerBuildItem(arcRecorder.initCommandLineArgs(rawCommandLineArgumentsBuildItem));
-    }
+    SyntheticBeanBuildItem commandLineArgs(RawCommandLineArgumentsBuildItem rawCommandLineArgumentsBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        additionalBeans.produce(new AdditionalBeanBuildItem(CommandLineArguments.class));
 
-    @BuildStep
-    AdditionalBeanBuildItem qualifier() {
-        return AdditionalBeanBuildItem.builder().setUnremovable()
-                .addBeanClasses(CommandLineArguments.class, CommandLineArgumentsProducer.class).build();
+        Type stringArray = Type.create(DotName.createSimple(String[].class.getName()), Kind.ARRAY);
+        // implClazz is ignored because a provider type is set
+        return SyntheticBeanBuildItem.configure(Object.class).providerType(stringArray).addType(stringArray)
+                .addQualifier(CommandLineArguments.class)
+                .setRuntimeInit().supplier(rawCommandLineArgumentsBuildItem)
+                .unremovable().done();
     }
+
 }

extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcRecorder.java

@@ -75,13 +75,4 @@ public Object get() {
         };
     }
 
-    public BeanContainerListener initCommandLineArgs(Supplier<String[]> args) {
-        return new BeanContainerListener() {
-            @Override
-            public void created(BeanContainer container) {
-                container.instance(CommandLineArgumentsProducer.class).setCommandLineArgs(args);
-            }
-        };
-    }
-
 }