Arc - additional requested minor changes

quarkusio · Apr 11, 2023 · 259ef94 · 259ef94
1 parent ca945b1
commit 259ef94
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/...pendent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/...pendent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
@@ -1038,10 +1038,10 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
                     if (annotationStore.hasAnnotation(method, DotNames.OBSERVES)) {
                         syncObserverMethods.computeIfAbsent(method, ignored -> new HashSet<>())
                                 .add(beanClass);
+                        // add only concrete classes
                         if (!Modifier.isAbstract(beanClass.flags())) {
                             // do not register classes with observers and no bean def. annotation as beans in strict mode
                             if (!strictCompatibility) {
-                                // add only concrete classes
                                 beanClasses.add(beanClass);
                                 if (!hasBeanDefiningAnnotation) {
                                     LOGGER.debugf(
@@ -1053,10 +1053,10 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
                     } else if (annotationStore.hasAnnotation(method, DotNames.OBSERVES_ASYNC)) {
                         asyncObserverMethods.computeIfAbsent(method, ignored -> new HashSet<>())
                                 .add(beanClass);
+                        // add only concrete classes
                         if (!Modifier.isAbstract(beanClass.flags())) {
                             // do not register classes with observers and no bean def. annotation as beans in strict mode
                             if (!strictCompatibility) {
-                                // add only concrete classes
                                 beanClasses.add(beanClass);
                                 if (!hasBeanDefiningAnnotation) {
                                     LOGGER.debugf(
@@ -1080,12 +1080,19 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
                     if (annotationStore.hasAnnotation(field, DotNames.INJECT)) {
                         throw new DefinitionException("Injected field cannot be annotated with @Produces: " + field);
                     }
+                    // Do not register classes with producers and no bean def. annotation as beans in strict mode
                     // Producer fields are not inherited
-                    producerFields.add(field);
-                    if (!hasBeanDefiningAnnotation) {
-                        LOGGER.debugf("Producer field found but %s has no bean defining annotation - using @Dependent",
-                                beanClass);
-                        beanClasses.add(beanClass);
+                    if (strictCompatibility) {
+                        if (hasBeanDefiningAnnotation) {
+                            producerFields.add(field);
+                        }
+                    } else {
+                        producerFields.add(field);
+                        if (!hasBeanDefiningAnnotation) {
+                            LOGGER.debugf("Producer field found but %s has no bean defining annotation - using @Dependent",
+                                    beanClass);
+                            beanClasses.add(beanClass);
+                        }
                     }
                 } else {
                     // Verify that non-producer fields are not annotated with stereotypes

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java
@@ -19,7 +19,7 @@ public final class Arc {
      * @return {@link ArcContainer} instance with default configuration
      */
     public static ArcContainer initialize() {
-        return initialize(ArcInitConfig.INSTANCE);
+        return initialize(ArcInitConfig.DEFAULT);
     }
 
     /**

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java
@@ -10,7 +10,7 @@ public final class ArcInitConfig {
     /**
      * Basic instance without any configuration, all values are default
      */
-    public static final ArcInitConfig INSTANCE = builder().build();
+    public static final ArcInitConfig DEFAULT = builder().build();
 
     /**
      * Obtains a builder for {@link ArcInitConfig}

diff --git a/...s/arc/tcks/cdi-tck-porting-pkg/src/main/java/io/quarkus/arc/tck/porting/ContextsImpl.java b/...s/arc/tcks/cdi-tck-porting-pkg/src/main/java/io/quarkus/arc/tck/porting/ContextsImpl.java
@@ -1,8 +1,8 @@
 package io.quarkus.arc.tck.porting;
 
 import java.lang.annotation.Annotation;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.context.spi.Context;
@@ -17,8 +17,8 @@
 
 public class ContextsImpl implements Contexts<Context> {
 
-    // volatile is just a precaution in case some (future) TCK test attempts to use this in between multiple threads
-    private volatile Map<Context, InjectableContext.ContextState> contextStateMap = new HashMap();
+    // ConcurrentHashMap is just future-proofing, could be implemented with plain map too
+    private final Map<Context, InjectableContext.ContextState> contextStateMap = new ConcurrentHashMap<>();
 
     @Override
     public void setActive(Context context) {