Issue #10356 Update Weld integration #10359
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gregw
reviewed
Aug 25, 2023
jetty-ee10/jetty-ee10-cdi/src/main/java/org/eclipse/jetty/ee10/cdi/CdiSpiDecorator.java
Show resolved
Hide resolved
| _createCreationalContext = beanManagerClass.getMethod("createCreationalContext", contextualClass); | ||
| _inject = injectionTargetClass.getMethod("inject", Object.class, creationalContextClass); | ||
| _dispose = injectionTargetClass.getMethod("dispose", Object.class); | ||
| _release = creationalContextClass.getMethod("release", null); | ||
| } | ||
| catch (Exception e) | ||
| { |
There was a problem hiding this comment.
I wonder if we should catch Throwable here an then if debug is on, dump the classloader and if any of the classes can be loaded and if so from where.
| Class<?> creationalContextClass = classLoader.loadClass("jakarta.enterprise.context.spi.CreationalContext"); | ||
| Class<?> contextualClass = classLoader.loadClass("jakarta.enterprise.context.spi.Contextual"); | ||
|
|
||
| MethodHandles.Lookup lookup = MethodHandles.lookup(); | ||
| _current = lookup.findStatic(cdiClass, "current", MethodType.methodType(cdiClass)); | ||
| _getBeanManager = lookup.findVirtual(cdiClass, "getBeanManager", MethodType.methodType(beanManagerClass)); | ||
| _createAnnotatedType = lookup.findVirtual(beanManagerClass, "createAnnotatedType", MethodType.methodType(annotatedTypeClass, Class.class)); | ||
| _createInjectionTarget = lookup.findVirtual(beanManagerClass, "createInjectionTarget", MethodType.methodType(injectionTargetClass, annotatedTypeClass)); | ||
| _getInjectionTargetFactory = lookup.findVirtual(beanManagerClass, "getInjectionTargetFactory", MethodType.methodType(injectionTargetFactoryClass, annotatedTypeClass)); |
There was a problem hiding this comment.
Interesting that method handles still work for ee9. I guess we don't have CDI API on the classpath? But I thought EE9 was using the same transaction API jars as it was already in jakarta namespace?
There was a problem hiding this comment.
No, they do not, I just haven't fixed them yet!
There was a problem hiding this comment.
EE9 is now fixed.
Signed-off-by: Olivier Lamy <[email protected]>
Signed-off-by: Olivier Lamy <[email protected]>
gregw
approved these changes
Aug 28, 2023
| return new String[]{"jakarta.enterprise.", "jakarta.decorator."}; | ||
| return new String[0]; | ||
| } | ||
| } |
| * </dl> | ||
| * | ||
| * @see AnnotationConfiguration.ServletContainerInitializerOrdering | ||
| */ | ||
| public class CdiServletContainerInitializer implements ServletContainerInitializer | ||
| { | ||
| public static final String CDI_INTEGRATION_ATTRIBUTE = "org.eclipse.jetty.ee10.cdi"; | ||
| public static final String CDI_INTEGRATION_ATTRIBUTE = "org.eclipse.jetty.cdi"; |
There was a problem hiding this comment.
Maybe a comment on why this is not scoped to ee10 in the name
olamy
reviewed
Aug 28, 2023
| @@ -1,4 +1,4 @@ | |||
| # Jetty Logging using jetty-slf4j-impl | |||
| org.eclipse.jetty.LEVEL=INFO | |||
| org.eclipse.jetty.ee10.annotations.LEVEL=DEBUG | |||
There was a problem hiding this comment.
nit: maybe change back to INFO before merging to avoid too much noise per default?
lorban
pushed a commit
that referenced
this pull request
Aug 30, 2023
* Issue #10356 Update Weld integration Signed-off-by: Olivier Lamy <[email protected]> Co-authored-by: Olivier Lamy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #10356
Make jetty-12 work with CDI 4/Weld 5.1.1