Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8345614: Improve AnnotationFormatError message for duplicate annotation interfaces #20

Closed

Conversation

liach
Copy link
Member

@liach liach commented Jan 16, 2025

Please review this backport, that updates the error message when two annotations in a location has the same annotation interface to include the class file name where this happens in addition to the name of the interface.

This is backported to 24.0.1 or later instead of 24 because this is not eligible for RDP 1 or 2.

This pull request contains a backport of commit 7aa0cbc9 from openjdk/jdk#22581.

The commit being backported was authored by Scott Marlow on 9 Dec 2024 and was reviewed by Chen Liang.

Thanks!


Progress

  • JDK-8345614 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8345614: Improve AnnotationFormatError message for duplicate annotation interfaces (Enhancement - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk24u.git pull/20/head:pull/20
$ git checkout pull/20

Update a local copy of the PR:
$ git checkout pull/20
$ git pull https://git.openjdk.org/jdk24u.git pull/20/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20

View PR using the GUI difftool:
$ git pr show -t 20

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk24u/pull/20.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 16, 2025

👋 Welcome back liach! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jan 16, 2025

@liach This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8345614: Improve AnnotationFormatError message for duplicate annotation interfaces

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • 934aacc: 8347256: Epsilon: Demote heap size and AlwaysPreTouch warnings to info level
  • 4211697: 8347424: Fix and rewrite sun/security/x509/DNSName/LeadingPeriod.java test
  • c2087ed: 8347124: Clean tests with --enable-linkable-runtime

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 7aa0cbc91d90493a3dae973cb8077cfa283c32b4 8345614: Improve AnnotationFormatError message for duplicate annotation interfaces Jan 16, 2025
@openjdk
Copy link

openjdk bot commented Jan 16, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jan 16, 2025

⚠️ @liach This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 16, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 16, 2025

Webrevs

@liach
Copy link
Member Author

liach commented Jan 16, 2025

/approval request Improve AnnotationFormatError message for duplicate annotation interfaces to include the broken class file name, not eligible for RDP

@openjdk
Copy link

openjdk bot commented Jan 16, 2025

@liach
8345614: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 16, 2025
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jan 22, 2025
@liach
Copy link
Member Author

liach commented Jan 22, 2025

Thanks for the approval Rob! Now we can backport this to 21.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 22, 2025
@openjdk
Copy link

openjdk bot commented Jan 22, 2025

@liach
Your change (at version ae91657) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 22, 2025

Going to push as commit 41ea8e0.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 934aacc: 8347256: Epsilon: Demote heap size and AlwaysPreTouch warnings to info level
  • 4211697: 8347424: Fix and rewrite sun/security/x509/DNSName/LeadingPeriod.java test
  • c2087ed: 8347124: Clean tests with --enable-linkable-runtime

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 22, 2025
@openjdk openjdk bot closed this Jan 22, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jan 22, 2025
@openjdk
Copy link

openjdk bot commented Jan 22, 2025

@phohensee @liach Pushed as commit 41ea8e0.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants