Uncomment and fix JAX-RS default method tests #2930
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
trask
commented
May 9, 2021
| @@ -36,8 +35,7 @@ | |||
|
|
|||
| public static ElementMatcher.Junction<TypeDescription> safeHasSuperType( | |||
| ElementMatcher<TypeDescription> matcher) { | |||
| return not(isInterface()) | |||
| .and(new SafeHasSuperTypeMatcher(new SafeErasureMatcher<>(matcher), false)); | |||
| return new SafeHasSuperTypeMatcher(new SafeErasureMatcher<>(matcher), false); | |||
There was a problem hiding this comment.
Without this change, interface default methods are not instrumented. I looked through the callers and changed some of them to extendsClass(), and the remaining seem more correct taking interface default methods in to account.
| @@ -25,8 +25,7 @@ | |||
|
|
|||
| public static ElementMatcher.Junction<TypeDescription> implementsInterface( | |||
| ElementMatcher<TypeDescription> matcher) { | |||
| return not(isInterface()) | |||
| .and(new SafeHasSuperTypeMatcher(new SafeErasureMatcher<>(matcher), true)); | |||
| return new SafeHasSuperTypeMatcher(new SafeErasureMatcher<>(matcher), true); | |||
There was a problem hiding this comment.
this change was not needed for JAX-RS default methods, but I looked through callers and not sure why we wouldn't also want to instrument interface default methods, so removed not(isInterface()) here too
trask
requested review from
anuraaga,
iNikem,
jkwatson,
laurit,
mateuszrzeszutek,
pavolloffay and
tylerbenson
as code owners
iNikem
approved these changes
May 9, 2021
mateuszrzeszutek
approved these changes
May 11, 2021
laurit
approved these changes
May 11, 2021
|
@trask please rebase |
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.
No description provided.