diff --git a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java
index f8fb6d5b765684..b97b508b5ada1b 100644
--- a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java
+++ b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java
@@ -75,11 +75,11 @@ public void setBeanContainer(BeanContainer container) {
*/
public static void handle(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {
if (streamHandlerClass != null) {
- RequestStreamHandler handler = beanContainer.beanInstance(streamHandlerClass);
+ RequestStreamHandler handler = beanContainer.resolveBean(streamHandlerClass);
handler.handleRequest(inputStream, outputStream, context);
} else {
Object request = objectReader.readValue(inputStream);
- RequestHandler handler = beanContainer.beanInstance(handlerClass);
+ RequestHandler handler = beanContainer.resolveBean(handlerClass);
Object response = handler.handleRequest(request, context);
objectWriter.writeValue(outputStream, response);
}
@@ -163,7 +163,7 @@ public void startPollLoop(ShutdownContext context, LaunchMode launchMode) {
@Override
protected Object processRequest(Object input, AmazonLambdaContext context) throws Exception {
- RequestHandler handler = beanContainer.beanInstance(handlerClass);
+ RequestHandler handler = beanContainer.resolveBean(handlerClass);
return handler.handleRequest(input, context);
}
@@ -185,7 +185,7 @@ protected boolean isStream() {
@Override
protected void processRequest(InputStream input, OutputStream output, AmazonLambdaContext context)
throws Exception {
- RequestStreamHandler handler = beanContainer.beanInstance(streamHandlerClass);
+ RequestStreamHandler handler = beanContainer.resolveBean(streamHandlerClass);
handler.handleRequest(input, output, context);
}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java
index 7594bb3bb9c47c..f84a14bd6abcef 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java
@@ -2,6 +2,8 @@
import java.lang.annotation.Annotation;
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
import io.quarkus.arc.ManagedContext;
/**
@@ -10,35 +12,41 @@
public interface BeanContainer {
/**
- * Returns a bean instance for given bean type and qualifiers.
- *
- * This method follows standard CDI rules meaning that if there are two or more eligible beans, an ambiguous
- * dependency exception is thrown.
- * Note that the method is allowed to return {@code null} if there is no matching bean which allows
- * for fallback implementations.
+ * A convenience method returning an instance of {@link ArcContainer} which is an entry point to the CDI container.
*
- * @param type
- * @param qualifiers
- * @return a bean instance or {@code null} if no matching bean is found
+ * @return instance of {@link ArcContainer}
*/
- default T beanInstance(Class type, Annotation... qualifiers) {
- return beanInstanceFactory(type, qualifiers).create().get();
+ default ArcContainer container() {
+ return Arc.container();
}
/**
- * This method is deprecated and will be removed in future versions.
- * Use {@link #beanInstance(Class, Annotation...)} instead.
- *
- * As opposed to {@link #beanInstance(Class, Annotation...)}, this method does NOT follow CDI
- * resolution rules and in case of ambiguous resolution performs a choice based on the class type parameter.
+ * Attempts to resolve a bean instance for given bean type and qualifiers.
+ *
+ * Note that the method deliberately returns {@code null} if there is no matching bean found allowing caller to
+ * detect such case and implement arbitrary fallback logic.
+ *
+ * Ambiguities are resolved as per CDI specification, possibly leading to an exception if there are multiple
+ * matching beans.
*
- * @param type
- * @param qualifiers
+ * @param beanType type of the bean
+ * @param beanQualifiers bean qualifiers
* @return a bean instance or {@code null} if no matching bean is found
*/
- @Deprecated
- default T instance(Class type, Annotation... qualifiers) {
- return instanceFactory(type, qualifiers).create().get();
+ T tryResolveBean(Class beanType, Annotation... beanQualifiers);
+
+ /**
+ * Resolves a bean instance for given bean type and qualifiers.
+ *
+ * Performs standard CDI resolution meaning it either returns a bean instance or throws a corresponding exception
+ * if the dependency is either unsatisfied or ambiguous.
+ *
+ * @param beanType type of the bean
+ * @param beanQualifiers bean qualifiers
+ * @return a bean instance; never {@code null}
+ */
+ default T resolveBean(Class beanType, Annotation... beanQualifiers) {
+ return container().select(beanType, beanQualifiers).get();
}
/**
@@ -55,20 +63,6 @@ default T instance(Class type, Annotation... qualifiers) {
*/
Factory beanInstanceFactory(Class type, Annotation... qualifiers);
- /**
- * This method is deprecated and will be removed in future versions.
- * Use {@link #beanInstanceFactory(Class, Annotation...)} instead.
- *
- * As opposed to {@link #beanInstanceFactory(Class, Annotation...)}, this method does NOT follow CDI
- * resolution rules and in case of ambiguous resolution performs a choice based on the class type parameter.
- *
- * @param type
- * @param qualifiers
- * @return a bean instance factory, never {@code null}
- */
- @Deprecated
- Factory instanceFactory(Class type, Annotation... qualifiers);
-
/**
*
* ManagedContext requestContext = beanContainer.requestContext();
@@ -89,6 +83,58 @@ default T instance(Class type, Annotation... qualifiers) {
*/
ManagedContext requestContext();
+ /**
+ * This method is deprecated and will be removed in future versions.
+ * Use {@link #tryResolveBean(Class, Annotation...)} instead.
+ *
+ * Returns a bean instance for given bean type and qualifiers.
+ *
+ * This method follows standard CDI rules meaning that if there are two or more eligible beans, an ambiguous
+ * dependency exception is thrown.
+ * Note that the method is allowed to return {@code null} if there is no matching bean which allows
+ * for fallback implementations.
+ *
+ * @param type
+ * @param qualifiers
+ * @return a bean instance or {@code null} if no matching bean is found
+ */
+ @Deprecated(forRemoval = true)
+ default T beanInstance(Class type, Annotation... qualifiers) {
+ return beanInstanceFactory(type, qualifiers).create().get();
+ }
+
+ /**
+ * This method is deprecated and will be removed in future versions.
+ * Use {@link #tryResolveBean(Class, Annotation...)} instead.
+ *
+ * Use {@link #beanInstance(Class, Annotation...)} instead.
+ *
+ * As opposed to {@link #beanInstance(Class, Annotation...)}, this method does NOT follow CDI
+ * resolution rules and in case of ambiguous resolution performs a choice based on the class type parameter.
+ *
+ * @param type
+ * @param qualifiers
+ * @return a bean instance or {@code null} if no matching bean is found
+ */
+ @Deprecated(forRemoval = true)
+ default T instance(Class type, Annotation... qualifiers) {
+ return instanceFactory(type, qualifiers).create().get();
+ }
+
+ /**
+ * This method is deprecated and will be removed in future versions.
+ * Use {@link #beanInstanceFactory(Class, Annotation...)} instead.
+ *
+ * As opposed to {@link #beanInstanceFactory(Class, Annotation...)}, this method does NOT follow CDI
+ * resolution rules and in case of ambiguous resolution performs a choice based on the class type parameter.
+ *
+ * @param type
+ * @param qualifiers
+ * @return a bean instance factory, never {@code null}
+ */
+ @Deprecated(forRemoval = true)
+ Factory instanceFactory(Class type, Annotation... qualifiers);
+
interface Factory {
Factory