Merge pull request quarkusio#20722 from stuartwdouglas/artemis-record…

…er-injection Change Artemis to use recorder injection
aloubyansky · Oct 13, 2021 · ff609cf · ff609cf
2 parents e3be925 + 4e55617
commit ff609cf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/...ore/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java b/...ore/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java
@@ -19,7 +19,6 @@
 
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.artemis.core.runtime.ArtemisCoreRecorder;
-import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -104,15 +103,15 @@ void load(BuildProducer<FeatureBuildItem> feature, Optional<ArtemisJmsBuildItem>
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    ArtemisCoreConfiguredBuildItem configure(ArtemisCoreRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
+    ArtemisCoreConfiguredBuildItem configure(ArtemisCoreRecorder recorder,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer, Optional<ArtemisJmsBuildItem> artemisJms) {
 
         if (artemisJms.isPresent()) {
             return null;
         }
 
         SyntheticBeanBuildItem serverLocator = SyntheticBeanBuildItem.configure(ServerLocator.class)
-                .supplier(recorder.getServerLocatorSupplier(runtimeConfig))
+                .supplier(recorder.getServerLocatorSupplier())
                 .scope(ApplicationScoped.class)
                 .defaultBean()
                 .unremovable()

diff --git a/...temis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreRecorder.java b/...temis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreRecorder.java
@@ -10,7 +10,13 @@
 @Recorder
 public class ArtemisCoreRecorder {
 
-    public Supplier<ServerLocator> getServerLocatorSupplier(ArtemisRuntimeConfig config) {
+    final ArtemisRuntimeConfig config;
+
+    public ArtemisCoreRecorder(ArtemisRuntimeConfig config) {
+        this.config = config;
+    }
+
+    public Supplier<ServerLocator> getServerLocatorSupplier() {
         return new Supplier<ServerLocator>() {
             @Override
             public ServerLocator get() {

diff --git a/...s-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java b/...s-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java
@@ -6,7 +6,6 @@
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.artemis.core.deployment.ArtemisBuildTimeConfig;
 import io.quarkus.artemis.core.deployment.ArtemisJmsBuildItem;
-import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
 import io.quarkus.artemis.jms.runtime.ArtemisJmsRecorder;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -34,11 +33,11 @@ HealthBuildItem health(ArtemisBuildTimeConfig buildConfig) {
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    ArtemisJmsConfiguredBuildItem configure(ArtemisJmsRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
+    ArtemisJmsConfiguredBuildItem configure(ArtemisJmsRecorder recorder,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer) {
 
         SyntheticBeanBuildItem connectionFactory = SyntheticBeanBuildItem.configure(ConnectionFactory.class)
-                .supplier(recorder.getConnectionFactorySupplier(runtimeConfig))
+                .supplier(recorder.getConnectionFactorySupplier())
                 .scope(ApplicationScoped.class)
                 .defaultBean()
                 .unremovable()

diff --git a/.../artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java b/.../artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java
@@ -12,7 +12,13 @@
 @Recorder
 public class ArtemisJmsRecorder {
 
-    public Supplier<ConnectionFactory> getConnectionFactorySupplier(ArtemisRuntimeConfig config) {
+    final ArtemisRuntimeConfig config;
+
+    public ArtemisJmsRecorder(ArtemisRuntimeConfig config) {
+        this.config = config;
+    }
+
+    public Supplier<ConnectionFactory> getConnectionFactorySupplier() {
         return new Supplier<ConnectionFactory>() {
             @Override
             public ConnectionFactory get() {