From 6d0025c192c9fd48609ec364e8e9bd10e27bdf20 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 21 Nov 2019 19:44:19 +0200 Subject: [PATCH 1/2] Introduce leftover occurrence of GizmoAdaptor --- .../quarkus/spring/web/deployment/SpringWebProcessor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java index 380d198714b47..de736a13d4d87 100644 --- a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java +++ b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java @@ -17,6 +17,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Providers; +import io.quarkus.deployment.GizmoAdaptor; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; @@ -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 GizmoAdaptor(generatedExceptionMappers, false); generateMappersForResponseStatusOnException(providersProducer, index, classOutput, typesUtil); generateMappersForExceptionHandlerInControllerAdvice(providersProducer, reflectiveClassProducer, index, classOutput, typesUtil); From 8d5772bc6c86cf6575d20bcdc5567853aaf2629d Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 21 Nov 2019 20:02:55 +0200 Subject: [PATCH 2/2] Rename GizmoAdaptor to GeneratedClassGizmoAdaptor and introduce GeneratedBeanGizmoAdaptor --- ...r.java => GeneratedClassGizmoAdaptor.java} | 4 ++-- .../deployment/steps/ConfigurationSetup.java | 4 ++-- .../deployment/steps/MainClassBuildStep.java | 4 ++-- .../agroal/deployment/AgroalProcessor.java | 8 ++------ .../deployment/GeneratedBeanGizmoAdaptor.java | 19 +++++++++++++++++++ .../ConfigPropertiesBuildStep.java | 13 ++++--------- .../jackson/deployment/JacksonProcessor.java | 8 ++------ .../jsonb/deployment/JsonbProcessor.java | 8 ++------ .../client/deployment/KafkaProcessor.java | 4 ++-- .../deployment/SchedulerProcessor.java | 4 ++-- .../test/cdi/ext/GenereateBeanBuildStep.java | 8 ++------ .../SmallRyeReactiveMessagingProcessor.java | 4 ++-- .../deployment/SpringDataJPAProcessor.java | 8 ++------ .../web/deployment/SpringWebProcessor.java | 4 ++-- .../web/deployment/VertxWebProcessor.java | 4 ++-- .../vertx/deployment/VertxProcessor.java | 4 ++-- 16 files changed, 51 insertions(+), 57 deletions(-) rename core/deployment/src/main/java/io/quarkus/deployment/{GizmoAdaptor.java => GeneratedClassGizmoAdaptor.java} (75%) create mode 100644 extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/GeneratedBeanGizmoAdaptor.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/GizmoAdaptor.java b/core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java similarity index 75% rename from core/deployment/src/main/java/io/quarkus/deployment/GizmoAdaptor.java rename to core/deployment/src/main/java/io/quarkus/deployment/GeneratedClassGizmoAdaptor.java index 4780490c3e131..e0ae8ff8ae39a 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/GizmoAdaptor.java +++ b/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 classOutput; private final boolean applicationClass; - public GizmoAdaptor(BuildProducer classOutput, boolean applicationClass) { + public GeneratedClassGizmoAdaptor(BuildProducer classOutput, boolean applicationClass) { this.classOutput = classOutput; this.applicationClass = applicationClass; } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java index 8ee89e4147677..e72455a90b75a 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java +++ b/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 objectLoaderConsumer, List configTypeItems, List runTimeSources) { - final ClassOutput classOutput = new GizmoAdaptor(classConsumer, true); + final ClassOutput classOutput = new GeneratedClassGizmoAdaptor(classConsumer, true); // General run time setup diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java index 4d9bdd310ae38..a7db493d10a0f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java +++ b/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 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()); diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java index 5a05a1893edc0..3e74f95b06f67 100644 --- a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java +++ b/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 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) diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/GeneratedBeanGizmoAdaptor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/GeneratedBeanGizmoAdaptor.java new file mode 100644 index 0000000000000..a0fdab5ff8376 --- /dev/null +++ b/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 classOutput; + + public GeneratedBeanGizmoAdaptor(BuildProducer classOutput) { + this.classOutput = classOutput; + } + + @Override + public void write(String s, byte[] bytes) { + classOutput.produce(new GeneratedBeanBuildItem(s, bytes)); + } + +} diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java index 359047c0d3142..547f39fe2640f 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java +++ b/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 diff --git a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java index 7a5b9b314c790..ec7837e443642 100755 --- a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java +++ b/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 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") diff --git a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java index b565525dac04d..701d237f99dd0 100755 --- a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java +++ b/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 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") diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index ee62db4654fb3..3a1468169b202 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/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 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()) { diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java index 5777e40308cf2..c41bc5ef6ca7c 100644 --- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java +++ b/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 scheduledMethods = new ArrayList<>(); - ClassOutput classOutput = new GizmoAdaptor(generatedClass, true); + ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true); for (ScheduledBusinessMethodItem businessMethod : scheduledBusinessMethods) { ScheduledMethodMetadata scheduledMethod = new ScheduledMethodMetadata(); diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/ext/GenereateBeanBuildStep.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/ext/GenereateBeanBuildStep.java index bdb4124c0af51..00f81016201a5 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/ext/GenereateBeanBuildStep.java +++ b/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 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(); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java index 8a11f3cea4b85..85dcf93459609 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java +++ b/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 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 diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java index 180c35e0b02b9..b32e2435b55a0 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java +++ b/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 gen BuildProducer additionalBeans, List 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(); diff --git a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java index de736a13d4d87..7457e9d8ef817 100644 --- a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java +++ b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java @@ -17,7 +17,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Providers; -import io.quarkus.deployment.GizmoAdaptor; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; @@ -36,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; @@ -338,7 +338,7 @@ public void generateExceptionMapperProviders(BeanArchiveIndexBuildItem beanArchi // Look for all exception classes that are annotated with @ResponseStatus IndexView index = beanArchiveIndexBuildItem.getIndex(); - ClassOutput classOutput = new GizmoAdaptor(generatedExceptionMappers, false); + ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedExceptionMappers, false); generateMappersForResponseStatusOnException(providersProducer, index, classOutput, typesUtil); generateMappersForExceptionHandlerInControllerAdvice(providersProducer, reflectiveClassProducer, index, classOutput, typesUtil); diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java index f3fa56e132e71..f8aaa76927eeb 100644 --- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java +++ b/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 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)); diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java index da8826b1c2894..be4f0059373a8 100644 --- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java +++ b/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 serviceStart, List codecs, RecorderContext recorderContext) { Map 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);