Qute: convert BeanConfiguratorBase.creator() usages to Gizmo 2

Author: Ladicek

extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java

@@ -70,7 +70,6 @@
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
-import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo2.ClassOutput;
 import io.quarkus.gizmo2.Const;
 import io.quarkus.gizmo2.Expr;
@@ -81,6 +80,7 @@
 import io.quarkus.gizmo2.creator.BlockCreator;
 import io.quarkus.gizmo2.creator.ClassCreator;
 import io.quarkus.gizmo2.desc.ClassMethodDesc;
+import io.quarkus.gizmo2.desc.ConstructorDesc;
 import io.quarkus.gizmo2.desc.MethodDesc;
 import io.quarkus.qute.EvalContext;
 import io.quarkus.qute.EvaluatedParams;
@@ -274,22 +274,25 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
 
         // Generate implementations
         // name -> impl class
-        Map<String, String> generatedImplementations = generateImplementations(bundles, generatedClasses, generatedResources,
+        Map<String, ClassDesc> generatedImplementations = generateImplementations(bundles, generatedClasses, generatedResources,
                 messageTemplateMethods, index);
 
         // Register synthetic beans
         for (MessageBundleBuildItem bundle : bundles) {
             ClassInfo bundleInterface = bundle.getDefaultBundleInterface();
-            beanRegistration.getContext().configure(bundleInterface.name()).addType(bundle.getDefaultBundleInterface().name())
+            beanRegistration.getContext().configure(bundleInterface.name())
+                    .addType(bundle.getDefaultBundleInterface().name())
                     // The default message bundle - add both @Default and @Localized
                     .addQualifier(DotNames.DEFAULT).addQualifier().annotation(Names.LOCALIZED)
                     .addValue("value", getDefaultLocale(bundleInterface.declaredAnnotation(Names.BUNDLE), locales)).done()
                     .unremovable()
-                    .scope(Singleton.class).creator(mc -> {
+                    .scope(Singleton.class)
+                    .creator(cg -> {
+                        BlockCreator bc = cg.createMethod();
+
                         // Just create a new instance of the generated class
-                        mc.returnValue(
-                                mc.newInstance(MethodDescriptor
-                                        .ofConstructor(generatedImplementations.get(bundleInterface.name().toString()))));
+                        bc.return_(bc.new_(ConstructorDesc.of(
+                                generatedImplementations.get(bundleInterface.name().toString()))));
                     }).done();
 
             // Localized interfaces
@@ -298,11 +301,13 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
                         .addType(bundle.getDefaultBundleInterface().name())
                         .addQualifier(localizedInterface.declaredAnnotation(Names.LOCALIZED))
                         .unremovable()
-                        .scope(Singleton.class).creator(mc -> {
+                        .scope(Singleton.class)
+                        .creator(cg -> {
+                            BlockCreator bc = cg.createMethod();
+
                             // Just create a new instance of the generated class
-                            mc.returnValue(
-                                    mc.newInstance(MethodDescriptor.ofConstructor(
-                                            generatedImplementations.get(localizedInterface.name().toString()))));
+                            bc.return_(bc.new_(ConstructorDesc.of(
+                                    generatedImplementations.get(localizedInterface.name().toString()))));
                         }).done();
             }
             // Localized files
@@ -312,11 +317,12 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
                         .addQualifier().annotation(Names.LOCALIZED)
                         .addValue("value", entry.getKey()).done()
                         .unremovable()
-                        .scope(Singleton.class).creator(mc -> {
+                        .scope(Singleton.class).creator(cg -> {
+                            BlockCreator bc = cg.createMethod();
+
                             // Just create a new instance of the generated class
-                            mc.returnValue(
-                                    mc.newInstance(MethodDescriptor
-                                            .ofConstructor(generatedImplementations.get(entry.getValue().toString()))));
+                            bc.return_(bc.new_(ConstructorDesc.of(
+                                    generatedImplementations.get(entry.getValue().toString()))));
                         }).done();
             }
         }
@@ -723,13 +729,13 @@ void generateExamplePropertiesFiles(List<MessageBundleMethodBuildItem> messageBu
         }
     }
 
-    private Map<String, String> generateImplementations(List<MessageBundleBuildItem> bundles,
+    private Map<String, ClassDesc> generateImplementations(List<MessageBundleBuildItem> bundles,
             BuildProducer<GeneratedClassBuildItem> generatedClasses,
             BuildProducer<GeneratedResourceBuildItem> generatedResources,
             BuildProducer<MessageBundleMethodBuildItem> messageTemplateMethods,
             IndexView index) throws IOException {
 
-        Map<String, String> generatedTypes = new HashMap<>();
+        Map<String, ClassDesc> generatedTypes = new HashMap<>();
 
         ClassOutput defaultClassOutput = new GeneratedClassGizmo2Adaptor(generatedClasses, generatedResources,
                 new AppClassPredicate());
@@ -745,7 +751,7 @@ private Map<String, String> generateImplementations(List<MessageBundleBuildItem>
             // Generate implementation for the default bundle interface
             String bundleImpl = generateImplementation(bundle, null, null, bundleInterfaceWrapper,
                     defaultClassOutput, messageTemplateMethods, defaultKeyToMap, null, index);
-            generatedTypes.put(bundleInterface.name().toString(), bundleImpl);
+            generatedTypes.put(bundleInterface.name().toString(), ClassDesc.of(bundleImpl));
 
             // Generate imeplementation for each localized interface
             for (Entry<String, ClassInfo> entry : bundle.getLocalizedInterfaces().entrySet()) {
@@ -758,8 +764,8 @@ private Map<String, String> generateImplementations(List<MessageBundleBuildItem>
                         keyToMap);
 
                 generatedTypes.put(entry.getValue().name().toString(),
-                        generateImplementation(bundle, bundleInterface, bundleImpl, localizedInterfaceWrapper,
-                                defaultClassOutput, messageTemplateMethods, keyToMap, null, index));
+                        ClassDesc.of(generateImplementation(bundle, bundleInterface, bundleImpl, localizedInterfaceWrapper,
+                                defaultClassOutput, messageTemplateMethods, keyToMap, null, index)));
             }
 
             // Generate implementation for each localized file
@@ -780,8 +786,9 @@ public String apply(String className) {
                             }
                         }));
                 generatedTypes.put(localizedFile.toString(),
-                        generateImplementation(bundle, bundleInterface, bundleImpl, new SimpleClassInfoWrapper(bundleInterface),
-                                localeAwareGizmoAdaptor, messageTemplateMethods, keyToTemplate, locale, index));
+                        ClassDesc.of(generateImplementation(bundle, bundleInterface, bundleImpl,
+                                new SimpleClassInfoWrapper(bundleInterface), localeAwareGizmoAdaptor, messageTemplateMethods,
+                                keyToTemplate, locale, index)));
             }
         }
         return generatedTypes;

extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java

@@ -17,6 +17,7 @@
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.builder.BuildContext;
 import io.quarkus.builder.BuildStep;
+import io.quarkus.gizmo2.Const;
 import io.quarkus.qute.Qute;
 import io.quarkus.qute.Template;
 import io.quarkus.qute.deployment.Hello;
@@ -40,8 +41,8 @@ public void execute(BuildContext context) {
                         context.produce(SyntheticBeanBuildItem.configure(String.class)
                                 .addQualifier().annotation(Identifier.class).addValue("value", "synthetic").done()
                                 .name("synthetic")
-                                .creator(mc -> {
-                                    mc.returnValue(mc.load("Yes!"));
+                                .creator(cg -> {
+                                    cg.createMethod().return_(Const.of("Yes!"));
                                 })
                                 .done());
                     }