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

JDK-8322218: Better escaping of single and double quotes in annotation toString() results #17664

Closed
wants to merge 1 commit into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Feb 1, 2024

A double quote character doesn't need to be escaped when it is a char literal and single quote character doesn't need to be escaped when it is in a string. This change updates the toString() output of annotations to account for the different escaping requirements of strings and characters.

Corresponding issue filed for javac's compile-time annotations: JDK-8325078.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8322218: Better escaping of single and double quotes in annotation toString() results (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17664

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17664.diff

Webrev

Link to Webrev Comment

@jddarcy jddarcy changed the title JDK-8322218: Better quoting of single and double quotes in annotation toString() results JDK-8322218: Better escaping of single and double quotes in annotation toString() results Feb 1, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 1, 2024

👋 Welcome back darcy! 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 openjdk bot added the rfr Pull request is ready for review label Feb 1, 2024
@openjdk
Copy link

openjdk bot commented Feb 1, 2024

@jddarcy The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Feb 1, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 1, 2024

Webrevs

Copy link
Member

@mlchung mlchung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me.

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

@jddarcy 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:

8322218: Better escaping of single and double quotes in annotation toString() results

Reviewed-by: mchung

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 91 new commits pushed to the master branch:

  • 0f5f3c9: 8325254: CKA_TOKEN private and secret keys are not necessarily sensitive
  • 4b1e367: 8325152: Clarify specification of java.io.RandomAccessFile.setLength
  • 96eb039: 8324665: Loose matching of space separators in the lenient date/time parsing mode
  • 2d252ee: 8325180: Rename jvmti_FollowRefObjects.h
  • b814c31: 8321703: jdeps generates illegal dot file containing nodesep=0,500000
  • 50b17d9: 8316704: Regex-free parsing of Formatter and FormatProcessor specifiers
  • 51d7169: 8320237: C2: late inlining of method handle invoke causes duplicate lines in PrintInlining output
  • fd89b33: 8316992: Potential null pointer from get_current_thread JVMCI helper function.
  • d1c8215: 8325194: GHA: Add macOS M1 testing
  • f356970: 8322535: Change default AArch64 SpinPause instruction
  • ... and 81 more: https://git.openjdk.org/jdk/compare/f0024f585dcc1d8afe5808bf626efd8f514da070...master

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 6, 2024
@jddarcy
Copy link
Member Author

jddarcy commented Feb 6, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

Going to push as commit 1797efd.
Since your change was applied there have been 91 commits pushed to the master branch:

  • 0f5f3c9: 8325254: CKA_TOKEN private and secret keys are not necessarily sensitive
  • 4b1e367: 8325152: Clarify specification of java.io.RandomAccessFile.setLength
  • 96eb039: 8324665: Loose matching of space separators in the lenient date/time parsing mode
  • 2d252ee: 8325180: Rename jvmti_FollowRefObjects.h
  • b814c31: 8321703: jdeps generates illegal dot file containing nodesep=0,500000
  • 50b17d9: 8316704: Regex-free parsing of Formatter and FormatProcessor specifiers
  • 51d7169: 8320237: C2: late inlining of method handle invoke causes duplicate lines in PrintInlining output
  • fd89b33: 8316992: Potential null pointer from get_current_thread JVMCI helper function.
  • d1c8215: 8325194: GHA: Add macOS M1 testing
  • f356970: 8322535: Change default AArch64 SpinPause instruction
  • ... and 81 more: https://git.openjdk.org/jdk/compare/f0024f585dcc1d8afe5808bf626efd8f514da070...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 6, 2024
@openjdk openjdk bot closed this Feb 6, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 6, 2024
@openjdk
Copy link

openjdk bot commented Feb 6, 2024

@jddarcy Pushed as commit 1797efd.

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

@jddarcy jddarcy deleted the JDK-8322218 branch October 17, 2024 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants