rmannibucau commented on a change in pull request #28:
URL: https://github.com/apache/openwebbeans/pull/28#discussion_r439844267
##########
File path:
webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
##########
@@ -172,4 +182,76 @@ private void doClose(final SeContainer container)
}
});
}
+
+ private Cdi getCdiConfig(ExtensionContext extensionContext)
+ {
+ return AnnotationUtils.findAnnotation(extensionContext.getElement(),
Cdi.class).orElse(null);
+ }
+
+ private SeContainer getContainer()
+ {
+ if (testInstanceContainer != null)
+ {
+ return testInstanceContainer;
+ }
+ else
+ {
+ return reusableContainer;
+ }
+ }
+
+ @Override
+ public boolean supportsParameter(ParameterContext parameterContext,
ExtensionContext extensionContext)
+ throws ParameterResolutionException
+ {
+ final Cdi config =
extensionContext.getParent().map(this::getCdiConfig).orElse(null);
+ if (config == null || !config.injectParameters())
+ {
+ return false;
+ }
+
+ final SeContainer container = getContainer();
+ if (container == null)
+ {
+ return false;
+ }
+
+ Bean<?> bean = resolveParameterBean(container, parameterContext,
extensionContext);
+ return bean != null;
+ }
+
+ @Override
+ public Object resolveParameter(ParameterContext parameterContext,
ExtensionContext extensionContext)
+ throws ParameterResolutionException
+ {
+ final SeContainer container = getContainer();
+ if (container == null)
+ {
+ return false;
+ }
+
+ Bean<?> bean = resolveParameterBean(container, parameterContext,
extensionContext);
+ BeanManager beanManager = container.getBeanManager();
+ CreationalContext<?> creationalContext =
beanManager.createCreationalContext(bean);
+ creationalContexts.add(creationalContext);
+ return beanManager.getReference(bean,
parameterContext.getParameter().getType(), creationalContext);
+ }
+
+ private Bean<?> resolveParameterBean(SeContainer container,
ParameterContext parameterContext, ExtensionContext extensionContext)
+ {
+ BeanManager beanManager = container.getBeanManager();
+ Set<Bean<?>> beans = beanManager.getBeans(
+ parameterContext.getParameter().getType(),
+ getQualifiers(parameterContext.getParameter()));
+ return beanManager.resolve(beans);
Review comment:
Ok, what I meant is that we already have @Cdi usages with several other
jupiter extensions. This feature must not make working tests no more working,
it would be a regression I don't see how to justify.
Currently the only way to handle it is @DontInject (which is ok).
This PR does not affect field injection but fully deactivating this new
feature and using field injection as of today is a solution to this ambiguity
issue.
Now, no issue to merge like that, we can rework it after.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
