SmallRye CP - make ManagedExecutor bean application scoped

- resolves quarkusio#11136
mkouba · Aug 4, 2020 · 9544a36 · 9544a36
1 parent 7259ad3
commit 9544a36
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/...main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java b/...main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Singleton;
 
 import org.eclipse.microprofile.context.ManagedExecutor;
@@ -76,7 +77,10 @@ void build(SmallRyeContextPropagationRecorder recorder,
 
         // Synthetic bean for ManagedExecutor
         syntheticBeans.produce(
-                SyntheticBeanBuildItem.configure(ManagedExecutor.class).scope(Singleton.class).defaultBean().unremovable()
+                SyntheticBeanBuildItem.configure(ManagedExecutor.class)
+                        .scope(ApplicationScoped.class)
+                        .defaultBean()
+                        .unremovable()
                         .supplier(recorder.initializeManagedExecutor(executorBuildItem.getExecutorProxy()))
                         .setRuntimeInit().done());
 

diff --git a/...t-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java b/...t-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java
@@ -12,7 +12,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import javax.enterprise.context.NormalScope;
@@ -135,8 +134,13 @@ public B scope(ScopeInfo scope) {
 
     public B scope(Class<? extends Annotation> scope) {
         DotName scopeName = DotName.createSimple(scope.getName());
-        this.scope = Optional.ofNullable(BuiltinScope.from(scopeName)).map(BuiltinScope::getInfo).orElse(new ScopeInfo(
-                scopeName, scope.isAnnotationPresent(NormalScope.class), scope.isAnnotationPresent(Inherited.class)));
+        BuiltinScope builtinScope = BuiltinScope.from(scopeName);
+        if (builtinScope != null) {
+            this.scope = builtinScope.getInfo();
+        } else {
+            this.scope = new ScopeInfo(scopeName, scope.isAnnotationPresent(NormalScope.class),
+                    scope.isAnnotationPresent(Inherited.class));
+        }
         return self();
     }
 

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java
@@ -30,9 +30,9 @@ public DotName getName() {
         return info.getDotName();
     }
 
-    public static BuiltinScope from(DotName name) {
+    public static BuiltinScope from(DotName scopeAnnotationName) {
         for (BuiltinScope scope : BuiltinScope.values()) {
-            if (scope.getInfo().getDotName().equals(name)) {
+            if (scope.getInfo().getDotName().equals(scopeAnnotationName)) {
                 return scope;
             }
         }