Add more GizmoAdaptor stuff

core/deployment/src/main/java/io/quarkus/deployment/GizmoAdaptor.java → core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java

@@ -4,12 +4,12 @@
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.gizmo.ClassOutput;
 
-public class GizmoAdaptor implements ClassOutput {
+public class GeneratedClassGizmoAdaptor implements ClassOutput {
 
     private final BuildProducer<GeneratedClassBuildItem> classOutput;
     private final boolean applicationClass;
 
-    public GizmoAdaptor(BuildProducer<GeneratedClassBuildItem> classOutput, boolean applicationClass) {
+    public GeneratedClassGizmoAdaptor(BuildProducer<GeneratedClassBuildItem> classOutput, boolean applicationClass) {
         this.classOutput = classOutput;
         this.applicationClass = applicationClass;
     }

core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java

@@ -33,7 +33,7 @@
 
 import io.quarkus.deployment.AccessorFinder;
 import io.quarkus.deployment.ApplicationArchive;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
@@ -321,7 +321,7 @@ void finalizeConfigLoader(
             Consumer<BytecodeRecorderObjectLoaderBuildItem> objectLoaderConsumer,
             List<ConfigurationTypeBuildItem> configTypeItems,
             List<RunTimeConfigurationSourceBuildItem> runTimeSources) {
-        final ClassOutput classOutput = new GizmoAdaptor(classConsumer, true);
+        final ClassOutput classOutput = new GeneratedClassGizmoAdaptor(classConsumer, true);
 
         // General run time setup
 

core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java

@@ -12,7 +12,7 @@
 import org.graalvm.nativeimage.ImageInfo;
 
 import io.quarkus.builder.Version;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationClassNameBuildItem;
@@ -70,7 +70,7 @@ MainClassBuildItem build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
         appClassNameProducer.produce(new ApplicationClassNameBuildItem(APP_CLASS));
 
         // Application class
-        GizmoAdaptor gizmoOutput = new GizmoAdaptor(generatedClass, true);
+        GeneratedClassGizmoAdaptor gizmoOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
         ClassCreator file = new ClassCreator(gizmoOutput, APP_CLASS, null,
                 Application.class.getName());
 

extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java

@@ -31,6 +31,7 @@
 import io.quarkus.agroal.runtime.TransactionIntegration;
 import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -220,12 +221,7 @@ UnremovableBeanBuildItem markBeansAsUnremovable() {
      */
     private void createDataSourceProducerBean(BuildProducer<GeneratedBeanBuildItem> generatedBean,
             String dataSourceProducerClassName) {
-        ClassOutput classOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedBean.produce(new GeneratedBeanBuildItem(name, data));
-            }
-        };
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(generatedBean);
 
         ClassCreator classCreator = ClassCreator.builder().classOutput(classOutput)
                 .className(dataSourceProducerClassName)

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

@@ -0,0 +1,19 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.gizmo.ClassOutput;
+
+public class GeneratedBeanGizmoAdaptor implements ClassOutput {
+
+    private final BuildProducer<GeneratedBeanBuildItem> classOutput;
+
+    public GeneratedBeanGizmoAdaptor(BuildProducer<GeneratedBeanBuildItem> classOutput) {
+        this.classOutput = classOutput;
+    }
+
+    @Override
+    public void write(String s, byte[] bytes) {
+        classOutput.produce(new GeneratedBeanBuildItem(s, bytes));
+    }
+
+}

extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java

@@ -21,7 +21,8 @@
 import io.quarkus.arc.config.ConfigProperties;
 import io.quarkus.arc.deployment.ConfigPropertyBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
@@ -48,14 +49,8 @@ void setup(CombinedIndexBuildItem combinedIndex,
             return;
         }
 
-        ClassOutput beansClassOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedBeans.produce(new GeneratedBeanBuildItem(name, data));
-            }
-        };
-
-        ClassOutput nonBeansClassOutput = new GizmoAdaptor(generatedClasses, true);
+        ClassOutput beansClassOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
+        ClassOutput nonBeansClassOutput = new GeneratedClassGizmoAdaptor(generatedClasses, true);
 
         /*
          * We generate CDI producer bean containing one method for each of the @ConfigProperties

extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java

@@ -28,6 +28,7 @@
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -138,12 +139,7 @@ void generateCustomizer(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
             return;
         }
 
-        ClassOutput classOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedBeans.produce(new GeneratedBeanBuildItem(name, data));
-            }
-        };
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
 
         try (ClassCreator classCreator = ClassCreator.builder().classOutput(classOutput)
                 .className("io.quarkus.jackson.customizer.RegisterSerializersAndDeserializersCustomizer")

extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java

@@ -27,6 +27,7 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.deployment.Capabilities;
@@ -135,12 +136,7 @@ void generateCustomizer(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
             return;
         }
 
-        ClassOutput classOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedBeans.produce(new GeneratedBeanBuildItem(name, data));
-            }
-        };
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
 
         try (ClassCreator classCreator = ClassCreator.builder().classOutput(classOutput)
                 .className("io.quarkus.jsonb.customizer.RegisterSerializersAndDeserializersCustomizer")

extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java

@@ -34,7 +34,7 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -126,7 +126,7 @@ public void build(CombinedIndexBuildItem indexBuildItem, BuildProducer<Reflectiv
     @BuildStep
     public void replaceJava9Code(BuildProducer<GeneratedClassBuildItem> producer) {
         // make our own class output to ensure that our step is run.
-        ClassOutput classOutput = new GizmoAdaptor(producer, false);
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(producer, false);
         try (ClassCreator cc = ClassCreator.builder().className(TARGET_JAVA_9_CHECKSUM_FACTORY)
                 .classOutput(classOutput).setFinal(true).superClass(Object.class).build()) {
 

extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java

@@ -43,7 +43,7 @@
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
@@ -215,7 +215,7 @@ public void build(SchedulerConfig config, SchedulerRecorder recorder, BeanContai
 
         feature.produce(new FeatureBuildItem(FeatureBuildItem.SCHEDULER));
         List<ScheduledMethodMetadata> scheduledMethods = new ArrayList<>();
-        ClassOutput classOutput = new GizmoAdaptor(generatedClass, true);
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
 
         for (ScheduledBusinessMethodItem businessMethod : scheduledBusinessMethods) {
             ScheduledMethodMetadata scheduledMethod = new ScheduledMethodMetadata();

extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/ext/GenereateBeanBuildStep.java

@@ -4,6 +4,7 @@
 import javax.enterprise.context.ApplicationScoped;
 
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.gizmo.ClassCreator;
@@ -15,12 +16,7 @@ public class GenereateBeanBuildStep {
     @BuildStep
     public void generateSecuredBean(BuildProducer<GeneratedBeanBuildItem> generatedBeans) {
 
-        ClassOutput beansClassOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedBeans.produce(new GeneratedBeanBuildItem(name, data));
-            }
-        };
+        ClassOutput beansClassOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
         ClassCreator creator = ClassCreator.builder().className("io.quarkus.security.test.GeneratedBean")
                 .interfaces(io.quarkus.security.test.cdi.ext.GeneratedBean.class)
                 .classOutput(beansClassOutput).build();

extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java

@@ -38,7 +38,7 @@
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.InjectionPointInfo;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
@@ -206,7 +206,7 @@ public void build(SmallRyeReactiveMessagingRecorder recorder, RecorderContext re
 
         List<QuarkusMediatorConfiguration> configurations = new ArrayList<>(mediatorMethods.size());
 
-        ClassOutput classOutput = new GizmoAdaptor(generatedClass, true);
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
 
         /*
          * Go through the collected MediatorMethods and build up the corresponding MediaConfiguration

extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java

@@ -23,6 +23,7 @@
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -98,12 +99,7 @@ private void implementCrudRepositories(BuildProducer<GeneratedBeanBuildItem> gen
             BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             List<ClassInfo> crudRepositoriesToImplement, IndexView index) {
 
-        ClassOutput classOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedBeans.produce(new GeneratedBeanBuildItem(name, data));
-            }
-        };
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
 
         // index the Spring Data repository interfaces that extend Repository because we need to pull the generic types from it
         Indexer indexer = new Indexer();

extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java

@@ -35,6 +35,7 @@
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -337,12 +338,7 @@ public void generateExceptionMapperProviders(BeanArchiveIndexBuildItem beanArchi
         // Look for all exception classes that are annotated with @ResponseStatus
 
         IndexView index = beanArchiveIndexBuildItem.getIndex();
-        ClassOutput classOutput = new ClassOutput() {
-            @Override
-            public void write(String name, byte[] data) {
-                generatedExceptionMappers.produce(new GeneratedClassBuildItem(true, name, data));
-            }
-        };
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedExceptionMappers, false);
         generateMappersForResponseStatusOnException(providersProducer, index, classOutput, typesUtil);
         generateMappersForExceptionHandlerInControllerAdvice(providersProducer, reflectiveClassProducer, index, classOutput,
                 typesUtil);

extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java

@@ -30,7 +30,7 @@
 import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
@@ -132,7 +132,7 @@ void addAdditionalRoutes(
             BodyHandlerBuildItem bodyHandler,
             BuildProducer<RouteBuildItem> routeProducer) throws IOException {
 
-        ClassOutput classOutput = new GizmoAdaptor(generatedClass, true);
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
         for (AnnotatedRouteHandlerBuildItem businessMethod : routeHandlerBusinessMethods) {
             String handlerClass = generateHandler(businessMethod.getBean(), businessMethod.getMethod(), classOutput);
             reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, handlerClass));

extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java

@@ -26,7 +26,7 @@
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.GizmoAdaptor;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
@@ -71,7 +71,7 @@ VertxBuildItem build(CoreVertxBuildItem internalVertx, VertxRecorder recorder, B
             BuildProducer<ServiceStartBuildItem> serviceStart,
             List<MessageCodecBuildItem> codecs, RecorderContext recorderContext) {
         Map<String, ConsumeEvent> messageConsumerConfigurations = new HashMap<>();
-        ClassOutput classOutput = new GizmoAdaptor(generatedClass, true);
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
         for (EventConsumerBusinessMethodItem businessMethod : messageConsumerBusinessMethods) {
             String invokerClass = EventBusConsumer.generateInvoker(businessMethod.getBean(), businessMethod.getMethod(),
                     businessMethod.getConsumeEvent(), classOutput);