Add annotation element values to type attribution model #4746
+518
−103
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
timtebeek
reviewed
Dec 4, 2024
rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeMapping.java
Outdated
Show resolved
Hide resolved
rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeMapping.java
Outdated
Show resolved
Hide resolved
rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Tim te Beek <[email protected]>
There was a problem hiding this comment.
Looking very good already! I have quite a few use cases in mind for this, actually. I think we have some issues I can link to this PR (I will try to dig them out).
I added some review comments and also took the liberty to push a commit to the PR to store the "actual" annotation values, rather than a stringified representation of them, as I suspect that could make them a lot more useful. This work definitely isn't complete yet. Also, feel free to revert if you disagree.
rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
Outdated
Show resolved
Hide resolved
rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
Outdated
Show resolved
Hide resolved
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
rewrite-java-21/src/test/java/org/openrewrite/java/Java21ParserTest.java
Outdated
Show resolved
Hide resolved
rewrite-java-21/src/test/java/org/openrewrite/java/Java21ParserTest.java
Outdated
Show resolved
Hide resolved
timtebeek
reviewed
Dec 5, 2024
rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeMappingTest.java
Outdated
Show resolved
Hide resolved
zexblue01
commented
Dec 5, 2024
rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeMapping.java
Show resolved
Hide resolved
…eserve_annotation_values # Conflicts: # rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
knutwannheden
changed the title
knutwannheden
force-pushed
the
eason-preserve_annotation_values
branch
from
89436f3 to
865540c
Compare
rewrite-java-21/src/test/java/org/openrewrite/java/Java21ParserTest.java
Outdated
Show resolved
Hide resolved
rewrite-java-tck/src/main/java/org/openrewrite/java/tree/AnnotationTest.java
Outdated
Show resolved
Hide resolved
Laurens-W
reviewed
Dec 10, 2024
|
|
||
| @Override | ||
| public FullyQualified withFullyQualifiedName(String fullyQualifiedName) { | ||
| return this; |
There was a problem hiding this comment.
Should this not delegate to type?
Perhaps this should delegate to a this.withType and call type.withFullyQualifiedName?
Laurens-W
reviewed
Dec 10, 2024
Laurens-W
reviewed
Dec 10, 2024
rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
Outdated
Show resolved
Hide resolved
Laurens-W
reviewed
Dec 10, 2024
rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
Outdated
Show resolved
Hide resolved
knutwannheden
added a commit
to openrewrite/rewrite-csharp
that referenced
this pull request
Dec 13, 2024
timtebeek
referenced
this pull request
in langchain4j/langchain4j-openrewrite-recipes
Dec 13, 2024
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.
What's changed?
This PR adds ability to preserve annotation values parsed by JavaParsers (I updated all existing Java parser versions: 8, 11, 17, 21).
It adds a new subclass
AnnotationofFullyQualifiedinJavaType. It delegates most functionality to annotation'sJavaType.FullyQualifiedobject but stores list of value attribute pairs as part of the structure inElementValueobjects (with the two implementationsSingleElementValueandArrayElementValue).What's your motivation?
In the recipe I'm working on I need to be able to access annotation values on the method invoked in the source file (method could be defined in a dependency in the classpath instead of being as part of the source file input).
Anything in particular you'd like reviewers to focus on?
Not sure if it is there already a model somewhere else for annotation I could use instead of defining a new subclass of FullyQualified.
Also the interface didn't change after this change. It is still returning
FullyQualifiedobjects when accessing annotations. I'm concerned that changing this will complicate this change but let me know if you feel differently.Anyone you would like to review specifically?
@jkschneider
@timtebeek
Have you considered any alternatives or workarounds?
I don't think there is a workaround with OpenRewrite. I worked around in my solution by loading all classes and use reflection to inspect the actual annotation values, which is a bit cumbersome.
Checklist