Merge pull request quarkusio#33750 from michalvavrik/feature/fix-infi…

…nispan-dev-mode-bean-jsonrpc Fix that InifispanJsonRPCService bean is only available in DEV mode when DEV profile is active
stuartwdouglas · Jun 1, 2023 · 8d4b3d1 · 8d4b3d1
2 parents ea88a3c + fa9f124
commit 8d4b3d1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/...ain/java/io/quarkus/infinispan/client/deployment/devconsole/InfinispanDevUiProcessor.java b/...ain/java/io/quarkus/infinispan/client/deployment/devconsole/InfinispanDevUiProcessor.java
@@ -2,6 +2,7 @@
 
 import org.infinispan.commons.util.Version;
 
+import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
@@ -42,6 +43,6 @@ public CardPageBuildItem infinispanServer() {
 
     @BuildStep(onlyIf = IsDevelopment.class)
     public JsonRPCProvidersBuildItem createJsonRPCService() {
-        return new JsonRPCProvidersBuildItem(InfinispanJsonRPCService.class);
+        return new JsonRPCProvidersBuildItem(InfinispanJsonRPCService.class, BuiltinScope.SINGLETON.getName());
     }
 }
diff --git a/...c/main/java/io/quarkus/infinispan/client/runtime/devconsole/InfinispanJsonRPCService.java b/...c/main/java/io/quarkus/infinispan/client/runtime/devconsole/InfinispanJsonRPCService.java
@@ -1,16 +1,9 @@
 package io.quarkus.infinispan.client.runtime.devconsole;
 
-import jakarta.inject.Singleton;
-
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.Unremovable;
-import io.quarkus.arc.profile.IfBuildProfile;
 import io.quarkus.logging.Log;
 import io.smallrye.common.annotation.NonBlocking;
 
-@IfBuildProfile("dev")
-@Unremovable
-@Singleton
 public class InfinispanJsonRPCService {
 
     @NonBlocking

diff --git a/...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java b/...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java
@@ -5,16 +5,13 @@
 import java.time.Duration;
 import java.util.Map;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import io.quarkus.arc.Arc;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
 import io.smallrye.common.annotation.NonBlocking;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Vertx;
 
-@ApplicationScoped
 public class OidcDevJsonRpcService {
 
     private final String authorizationUrl;

diff --git a/...sions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java b/...sions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java
@@ -241,10 +241,13 @@ void additionalBean(BuildProducer<AdditionalBeanBuildItem> additionalBeanProduce
 
             Class c = jsonRPCProvidersBuildItem.getJsonRPCMethodProviderClass();
             additionalIndexProducer.produce(new AdditionalIndexedClassesBuildItem(c.getName()));
+            DotName defaultBeanScope = jsonRPCProvidersBuildItem.getDefaultBeanScope() == null
+                    ? BuiltinScope.APPLICATION.getName()
+                    : jsonRPCProvidersBuildItem.getDefaultBeanScope();
 
             additionalBeanProducer.produce(AdditionalBeanBuildItem.builder()
                     .addBeanClass(c)
-                    .setDefaultScope(BuiltinScope.APPLICATION.getName())
+                    .setDefaultScope(defaultBeanScope)
                     .setUnremovable().build());
         }
 

diff --git a/...s/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/JsonRPCProvidersBuildItem.java b/...s/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/JsonRPCProvidersBuildItem.java
@@ -1,23 +1,38 @@
 package io.quarkus.devui.spi;
 
+import org.jboss.jandex.DotName;
+
 /**
  * This allows you to register a class that will provide data during runtime for JsonRPC Requests
  */
 public final class JsonRPCProvidersBuildItem extends AbstractDevUIBuildItem {
 
     private final Class jsonRPCMethodProviderClass;
+    private final DotName defaultBeanScope;
 
     public JsonRPCProvidersBuildItem(Class jsonRPCMethodProviderClass) {
         super();
         this.jsonRPCMethodProviderClass = jsonRPCMethodProviderClass;
+        this.defaultBeanScope = null;
+    }
+
+    public JsonRPCProvidersBuildItem(Class jsonRPCMethodProviderClass, DotName defaultBeanScope) {
+        super();
+        this.jsonRPCMethodProviderClass = jsonRPCMethodProviderClass;
+        this.defaultBeanScope = defaultBeanScope;
     }
 
     public JsonRPCProvidersBuildItem(String customIdentifier, Class jsonRPCMethodProviderClass) {
         super(customIdentifier);
         this.jsonRPCMethodProviderClass = jsonRPCMethodProviderClass;
+        this.defaultBeanScope = null;
     }
 
     public Class getJsonRPCMethodProviderClass() {
         return jsonRPCMethodProviderClass;
     }
+
+    public DotName getDefaultBeanScope() {
+        return defaultBeanScope;
+    }
 }