spring-di: support scopes on bean methods #2778 #2862
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
- Fix NPE when org.springframework.context.annotation.Scope is used on a bean method - Change default bean implicit scope from dependent to singleton - Do not process non-spring annotations (i.e. an explicit singleton) in spring-di, to avoid adding duplicate scopes with Arc processor
rquinio
commented
Jun 17, 2019
| * @return A CDI built in (or session) scope that mostly matches | ||
| * the spring one. Websocket scope is currently mapped to @Dependant | ||
| * and spring custom scopes are not currently handled. | ||
| */ | ||
| private DotName getScope(final ClassInfo clazz) { | ||
| if (!clazz.annotations().containsKey(SPRING_SCOPE_ANNOTATION)) { |
There was a problem hiding this comment.
Note: I've changed ClassInfo#annotations() (all levels annotations in the class) to ClassInfo#classAnnotation() (only class-level annotations of the class). The former was causing NPE when trying to access a method-level annotation value via clazz.classAnnotation().value()
geoand
reviewed
Jun 18, 2019
...ns/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java
Show resolved
Hide resolved
geoand
reviewed
Jun 18, 2019
...ns/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java
Show resolved
Hide resolved
geoand
reviewed
Jun 18, 2019
|
Great stuff, thanks @rquinio! |
geoand
approved these changes
Jun 18, 2019
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.
Fixes #2778