Merge pull request #8684 from stuartwdouglas/config-inject-infinispan

Change embedded Infinispan to use config injection
quarkusio · Apr 20, 2020 · c232cab · c232cab
2 parents e5fdb52 + ab140aa
commit c232cab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/.../src/main/java/io/quarkus/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java b/.../src/main/java/io/quarkus/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java
@@ -39,8 +39,6 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 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.ApplicationIndexBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -49,8 +47,6 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.infinispan.embedded.runtime.InfinispanEmbeddedProducer;
-import io.quarkus.infinispan.embedded.runtime.InfinispanEmbeddedRuntimeConfig;
-import io.quarkus.infinispan.embedded.runtime.InfinispanRecorder;
 
 class InfinispanEmbeddedProcessor {
     @BuildStep
@@ -203,10 +199,4 @@ private void addReflectionForName(String className, boolean isInterface, IndexVi
                     classInfos.stream().map(ClassInfo::toString).toArray(String[]::new)));
         }
     }
-
-    @Record(ExecutionTime.RUNTIME_INIT)
-    @BuildStep
-    void configureRuntimeProperties(InfinispanRecorder recorder, InfinispanEmbeddedRuntimeConfig runtimeConfig) {
-        recorder.configureRuntimeProperties(runtimeConfig);
-    }
 }
diff --git a/...time/src/main/java/io/quarkus/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java b/...time/src/main/java/io/quarkus/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java
@@ -6,6 +6,7 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.infinispan.commons.CacheConfigurationException;
@@ -25,11 +26,8 @@
 @ApplicationScoped
 public class InfinispanEmbeddedProducer {
 
-    private volatile InfinispanEmbeddedRuntimeConfig config;
-
-    public void setRuntimeConfig(InfinispanEmbeddedRuntimeConfig config) {
-        this.config = config;
-    }
+    @Inject
+    InfinispanEmbeddedRuntimeConfig config;
 
     @Singleton
     @Produces

diff --git a/...dded/runtime/src/main/java/io/quarkus/infinispan/embedded/runtime/InfinispanRecorder.java b/...dded/runtime/src/main/java/io/quarkus/infinispan/embedded/runtime/InfinispanRecorder.java