Merge pull request quarkusio#4827 from manovotn/arcApiSplit

Arc - split runtime classes/interfaces into API and internal impl pac…

extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigBeanCreator.java

@@ -12,7 +12,7 @@
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 
 import io.quarkus.arc.BeanCreator;
-import io.quarkus.arc.InjectionPointProvider;
+import io.quarkus.arc.impl.InjectionPointProvider;
 import io.smallrye.config.SmallRyeConfig;
 
 public class ConfigBeanCreator implements BeanCreator<Object> {

extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/RawOptionalClaimCreator.java

@@ -8,7 +8,7 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.BeanCreator;
-import io.quarkus.arc.InjectionPointProvider;
+import io.quarkus.arc.impl.InjectionPointProvider;
 import io.smallrye.jwt.auth.cdi.RawClaimTypeProducer;
 
 public class RawOptionalClaimCreator implements BeanCreator<Optional<?>> {

extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java

@@ -17,12 +17,12 @@
 import javax.servlet.http.HttpSessionListener;
 
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.ComputingCache;
 import io.quarkus.arc.ContextInstanceHandle;
-import io.quarkus.arc.ContextInstanceHandleImpl;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableContext;
 import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.impl.ComputingCache;
+import io.quarkus.arc.impl.ContextInstanceHandleImpl;
 import io.undertow.servlet.handlers.ServletRequestContext;
 
 @WebListener

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java

@@ -4,7 +4,7 @@
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 
-import io.quarkus.arc.ComputingCache;
+import io.quarkus.arc.impl.ComputingCache;
 import io.quarkus.arc.processor.AnnotationLiteralProcessor.Key;
 import io.quarkus.arc.processor.AnnotationLiteralProcessor.Literal;
 import io.quarkus.arc.processor.ResourceOutput.Resource;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java

@@ -1,6 +1,6 @@
 package io.quarkus.arc.processor;
 
-import io.quarkus.arc.ComputingCache;
+import io.quarkus.arc.impl.ComputingCache;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.gizmo.MethodDescriptor;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java

@@ -2,8 +2,8 @@
 
 import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByNameNoLogging;
 
-import io.quarkus.arc.ActivateRequestContextInterceptor;
-import io.quarkus.arc.InjectableRequestContextController;
+import io.quarkus.arc.impl.ActivateRequestContextInterceptor;
+import io.quarkus.arc.impl.InjectableRequestContextController;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Modifier;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java

@@ -6,12 +6,12 @@
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 
-import io.quarkus.arc.CreationalContextImpl;
-import io.quarkus.arc.CurrentInjectionPointProvider;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableInterceptor;
 import io.quarkus.arc.InjectableReferenceProvider;
-import io.quarkus.arc.interceptors.InitializedInterceptor;
+import io.quarkus.arc.impl.CreationalContextImpl;
+import io.quarkus.arc.impl.CurrentInjectionPointProvider;
+import io.quarkus.arc.impl.InitializedInterceptor;
 import io.quarkus.arc.processor.BeanInfo.InterceptionInfo;
 import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector;
 import io.quarkus.arc.processor.BuiltinBean.GeneratorContext;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java

@@ -2,14 +2,14 @@
 
 import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName;
 
-import io.quarkus.arc.BeanManagerProvider;
-import io.quarkus.arc.BeanMetadataProvider;
-import io.quarkus.arc.EventProvider;
 import io.quarkus.arc.InjectableBean;
-import io.quarkus.arc.InjectionPointProvider;
-import io.quarkus.arc.InstanceProvider;
-import io.quarkus.arc.InterceptedBeanMetadataProvider;
-import io.quarkus.arc.ResourceProvider;
+import io.quarkus.arc.impl.BeanManagerProvider;
+import io.quarkus.arc.impl.BeanMetadataProvider;
+import io.quarkus.arc.impl.EventProvider;
+import io.quarkus.arc.impl.InjectionPointProvider;
+import io.quarkus.arc.impl.InstanceProvider;
+import io.quarkus.arc.impl.InterceptedBeanMetadataProvider;
+import io.quarkus.arc.impl.ResourceProvider;
 import io.quarkus.arc.processor.InjectionPointInfo.InjectionPointKind;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java

@@ -5,8 +5,8 @@
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 
 import io.quarkus.arc.ClientProxy;
-import io.quarkus.arc.CreationalContextImpl;
 import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.impl.CreationalContextImpl;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BytecodeCreator;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java

@@ -6,7 +6,7 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.Components;
 import io.quarkus.arc.ComponentsProvider;
-import io.quarkus.arc.LazyValue;
+import io.quarkus.arc.impl.LazyValue;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.MethodCreator;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java

@@ -1,8 +1,8 @@
 package io.quarkus.arc.processor;
 
 import io.quarkus.arc.AlternativePriority;
-import io.quarkus.arc.ComputingCache;
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.arc.impl.ComputingCache;
 import java.util.Optional;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java

@@ -3,17 +3,17 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.ClientProxy;
-import io.quarkus.arc.CreationalContextImpl;
-import io.quarkus.arc.FixedValueSupplier;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableContext;
 import io.quarkus.arc.InjectableInterceptor;
 import io.quarkus.arc.InjectableReferenceProvider;
-import io.quarkus.arc.MapValueSupplier;
-import io.quarkus.arc.Reflections;
-import io.quarkus.arc.SubclassMethodMetadata;
-import io.quarkus.arc.interceptors.InterceptorInvocation;
-import io.quarkus.arc.interceptors.InvocationContexts;
+import io.quarkus.arc.impl.CreationalContextImpl;
+import io.quarkus.arc.impl.FixedValueSupplier;
+import io.quarkus.arc.impl.InterceptorInvocation;
+import io.quarkus.arc.impl.InvocationContexts;
+import io.quarkus.arc.impl.MapValueSupplier;
+import io.quarkus.arc.impl.Reflections;
+import io.quarkus.arc.impl.SubclassMethodMetadata;
 import io.quarkus.gizmo.MethodDescriptor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java

@@ -4,10 +4,10 @@
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 
-import io.quarkus.arc.CreationalContextImpl;
-import io.quarkus.arc.CurrentInjectionPointProvider;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableObserverMethod;
+import io.quarkus.arc.impl.CreationalContextImpl;
+import io.quarkus.arc.impl.CurrentInjectionPointProvider;
 import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector;
 import io.quarkus.arc.processor.BuiltinBean.GeneratorContext;
 import io.quarkus.arc.processor.ResourceOutput.Resource;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java

@@ -7,7 +7,7 @@
 import io.quarkus.arc.ArcUndeclaredThrowableException;
 import io.quarkus.arc.InjectableInterceptor;
 import io.quarkus.arc.Subclass;
-import io.quarkus.arc.SubclassMethodMetadata;
+import io.quarkus.arc.impl.SubclassMethodMetadata;
 import io.quarkus.arc.processor.BeanInfo.InterceptionInfo;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.gizmo.BytecodeCreator;

independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java

@@ -2,10 +2,10 @@
 
 import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName;
 
-import io.quarkus.arc.GenericArrayTypeImpl;
-import io.quarkus.arc.ParameterizedTypeImpl;
-import io.quarkus.arc.TypeVariableImpl;
-import io.quarkus.arc.WildcardTypeImpl;
+import io.quarkus.arc.impl.GenericArrayTypeImpl;
+import io.quarkus.arc.impl.ParameterizedTypeImpl;
+import io.quarkus.arc.impl.TypeVariableImpl;
+import io.quarkus.arc.impl.WildcardTypeImpl;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Arc.java

@@ -1,5 +1,6 @@
 package io.quarkus.arc;
 
+import io.quarkus.arc.impl.ArcContainerImpl;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java

@@ -1,5 +1,6 @@
 package io.quarkus.arc;
 
+import io.quarkus.arc.impl.Qualifiers;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;
@@ -10,7 +11,8 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 
 /**
- * Represents an injectable bean.
+ * Quarkus representation of an injectable bean.
+ * This interface extends the standard CDI {@link Bean} interface.
  *
  * @author Martin Kouba
  *

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java

@@ -4,6 +4,8 @@
 import javax.enterprise.context.spi.AlterableContext;
 
 /**
+ * A context implementing this interface allows to capture and view its state via {@link ContextState}.
+ * It also allows user to destroy all contextual instances within this context.
  *
  * @author Martin Kouba
  */

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInterceptor.java

@@ -4,7 +4,8 @@
 import javax.enterprise.inject.spi.Prioritized;
 
 /**
- * Represents an interceptor bean.
+ * Quarkus representation of an interceptor bean.
+ * This interface extends the standard CDI {@link Interceptor} interface.
  *
  * @author Martin Kouba
  *

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ManagedContext.java

@@ -1,6 +1,8 @@
 package io.quarkus.arc;
 
 /**
+ * A context implementing this interface can be manually managed.
+ * It can be activated with certain state hence allowing for context propagation and then deactivated on demand.
  *
  * @author Martin Kouba
  */

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Subclass.java

@@ -1,7 +1,7 @@
 package io.quarkus.arc;
 
 /**
- * Represents an intercepted subclass.
+ * A marker interface that represents an intercepted subclass.
  *
  * @author Martin Kouba
  */

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/interceptors/AbstractInvocationContext.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInvocationContext.java

@@ -1,7 +1,6 @@
-package io.quarkus.arc.interceptors;
+package io.quarkus.arc.impl;
 
 import io.quarkus.arc.ArcInvocationContext;
-import io.quarkus.arc.LazyValue;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AbstractSharedContext.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java

@@ -1,5 +1,8 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
+import io.quarkus.arc.ContextInstanceHandle;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InjectableContext;
 import java.util.Iterator;
 import java.util.Set;
 import javax.enterprise.context.spi.Contextual;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ActivateRequestContextInterceptor.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java

@@ -1,5 +1,7 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ManagedContext;
 import javax.annotation.Priority;
 import javax.enterprise.context.control.ActivateRequestContext;
 import javax.interceptor.AroundInvoke;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ApplicationContext.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java

@@ -1,4 +1,4 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
 import java.lang.annotation.Annotation;
 import javax.enterprise.context.ApplicationScoped;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcCDIProvider.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java

@@ -1,5 +1,6 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
+import io.quarkus.arc.Arc;
 import java.lang.annotation.Annotation;
 import java.util.Iterator;
 import javax.enterprise.inject.Instance;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainerImpl.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java

@@ -1,6 +1,17 @@
-package io.quarkus.arc;
-
-import io.quarkus.arc.ArcCDIProvider.ArcCDI;
+package io.quarkus.arc.impl;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.Components;
+import io.quarkus.arc.ComponentsProvider;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InjectableContext;
+import io.quarkus.arc.InjectableInterceptor;
+import io.quarkus.arc.InjectableObserverMethod;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.ManagedContext;
+import io.quarkus.arc.ResourceReferenceProvider;
+import io.quarkus.arc.impl.ArcCDIProvider.ArcCDI;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -45,7 +56,7 @@
  *
  * @author Martin Kouba
  */
-class ArcContainerImpl implements ArcContainer {
+public class ArcContainerImpl implements ArcContainer {
 
     private static final Logger LOGGER = Logger.getLogger(ArcContainerImpl.class.getPackage().getName());
     private static final AtomicInteger ID_GENERATOR = new AtomicInteger();
@@ -135,7 +146,7 @@ private void addBuiltInBeans() {
         beans.add(new InstanceBean());
     }
 
-    void init() {
+    public void init() {
         requireRunning();
         // Fire an event with qualifier @Initialized(ApplicationScoped.class)
         Set<Annotation> qualifiers = new HashSet<>(4);
@@ -261,7 +272,7 @@ public ExecutorService getExecutorService() {
         return executor != null ? executor : ForkJoinPool.commonPool();
     }
 
-    void setExecutor(ExecutorService executor) {
+    public void setExecutor(ExecutorService executor) {
         this.executorService = executor;
     }
 
@@ -272,7 +283,7 @@ public String toString() {
                 + getScopes() + "]";
     }
 
-    synchronized void shutdown() {
+    public synchronized void shutdown() {
         if (running.get()) {
             // Make sure all dependent bean instances obtained via CDI.current() are destroyed correctly
             CDI<?> cdi = CDI.current();

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/interceptors/AroundConstructInvocationContext.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundConstructInvocationContext.java

@@ -1,4 +1,4 @@
-package io.quarkus.arc.interceptors;
+package io.quarkus.arc.impl;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/interceptors/AroundInvokeInvocationContext.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java

@@ -1,6 +1,5 @@
-package io.quarkus.arc.interceptors;
+package io.quarkus.arc.impl;
 
-import io.quarkus.arc.LazyValue;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AsyncEventDeliveryStage.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AsyncEventDeliveryStage.java

@@ -1,4 +1,4 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerBean.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java

@@ -1,4 +1,4 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerImpl.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java

@@ -1,5 +1,7 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Collections;

independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanManagerProvider.java → independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java

@@ -1,5 +1,6 @@
-package io.quarkus.arc;
+package io.quarkus.arc.impl;
 
+import io.quarkus.arc.InjectableReferenceProvider;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.BeanManager;