ArC fixes for spec compatibility, round 7 #32885
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
This comment has been minimized.
This comment has been minimized.
mkouba
reviewed
Apr 26, 2023
independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
Outdated
Show resolved
Hide resolved
manovotn
approved these changes
Apr 26, 2023
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
mkouba
reviewed
Apr 27, 2023
independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
Show resolved
Hide resolved
mkouba
reviewed
Apr 27, 2023
independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
Show resolved
Hide resolved
Some of these tests were fixed in CDI TCK 4.0.8, some were fixed by the bean discovery in strict mode improvements, some were fixed by the improvements to interceptors.
Interceptor bindings have to be merged correctly. That is, a class-level binding of some type is ignored if a method-level binding of the same type is also present. This used to be the case for `@AroundInvoke` interceptors, but not for `@AroundConstruct` interceptors. This commit fixes that.
…ereotypes Previously, the class-level interceptor bindings search only looked at stereotypes when searching for interceptor bindings of business method interceptors (`@AroundInvoke`). With this commit, the class-level interceptor binding search works identically for business method interceptors and lifecycle callbacks (`@AroundConstruct`, `@PostConstruct`, `@PreDestroy`).
… look for inherited bindings
…terceptors Previously, `@PostConstruct`/`@PreDestroy` methods declared on the target class were not invoked from within the `@PostConstruct`/`@PreDestroy` methods declared on an interceptor class. Instead, they were invoked _after_ the interceptor chain finished, effectively creating two chains of lifecycle callback interceptors. This didn't allow an "outer" lifecycle callback method, when declared on an interceptor class, to catch and handle an exception thrown by an "inner" lifecycle callback method, when declared on the target class. This commit fixes the implementation of `@PostConstruct`/`@PreDestroy` interceptors by reifying the "inner" chain of lifecycle callback methods, declared on the target class, into a `Runnable` and passing that to the "outer" chain of lifecycle callback methods, declared on the interceptor class, to be invoked at the very end of the chain. This effectively merges the two chains into one, as prescribed by the specification. Note that the "inner" chain is reified into a `Runnable` only when an "outer" chain actually exists. It often doesn't, in which case, allocating a `Runnable` only to call it is a waste of resources.
`@AroundConstruct` interceptors may modify the constructor arguments using `InvocationContext.setParameters()`. ArC used to ignore this modification and call the bean constructor using the original arguments, obtained before calling the interceptors. This commit fixes that and uses the arguments array from `InvocationContext` to call the bean constructor. To do that, the forwarding function passed along the interceptor chain is no longer a `Supplier<Object>` (which used to call the bean constructor with original arguments), but a `Function<Object[], Object>` (which is passed the arguments stored in the `InvocationContext` and uses them to call the bean constructor).
…truct interceptors ArC used to always wrap exceptions thrown by `@AroundConstruct` and `@PostConstruct` interceptors into `RuntimeException`, even if these exceptions were themselves `RuntimeException`s. This commit fixes that and only wraps checked exceptions.
… client proxy ArC callers of `Bean.destroy()` never pass in a client proxy, but there may be direct callers too, even though this API is low-level. This commit unwraps the client proxy if it was passed to `destroy()` before proceeding, which avoids a `ClassCastException` in case the bean has a `@PreDestroy` interceptor (and hence the contextual instance is a generated subclass).
mkouba
approved these changes
Apr 27, 2023
mkouba
added
the
triage/waiting-for-ci
|
✔️ The latest workflow run for the pull request has completed successfully. It should be safe to merge provided you have a look at the other checks in the summary. |
quarkus-bot
bot
removed
the
triage/waiting-for-ci
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.
Related to #28558
@AroundConstructinterceptor bindings@Repeatableinterceptor bindings for member values conflicts@Repeatablebindings to have different member values, as repeatability is their entire point@PostConstruct/@PreDestroyinterceptors@AroundConstructinterceptors@AroundConstructand@PostConstructinterceptorsBean.destroy()in case a user directly passes in a client proxy