Skip to content

8264062: Use the blessed modifier order in jdk.jfr #3161

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

Closed
wants to merge 2 commits into from

Conversation

alblue
Copy link
Contributor

@alblue alblue commented Mar 23, 2021

This replaces patterns such as "final public" with "public final" to bring the modifiers in the standard order for the jdk.jfr module.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264062: Use the blessed modifier order in jdk.jfr

Reviewers

Download

To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3161/head:pull/3161
$ git checkout pull/3161

To update a local copy of the PR:
$ git checkout pull/3161
$ git pull https://git.openjdk.java.net/jdk pull/3161/head

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 23, 2021

👋 Welcome back alblue! 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 Mar 23, 2021

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

  • hotspot-jfr

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 hotspot-jfr hotspot-jfr-dev@openjdk.org label Mar 23, 2021
@alblue alblue changed the title Used blessed modifier order for jdk.jfr 8263854: Used blessed modifier order for jdk.jfr Mar 23, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 23, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 23, 2021

Webrevs

  • 02: Full (175d790)
  • 01: Full (ec31fbd390671c8903b8dd502895634a26f95614)
  • 00: Full (4812e09dbb610601763a9bad6b5d93a56e4546ab)

@alblue alblue changed the title 8263854: Used blessed modifier order for jdk.jfr 8264062: Used blessed modifier order for jdk.jfr Mar 23, 2021
@alblue alblue changed the title 8264062: Used blessed modifier order for jdk.jfr 8264062: Use the blessed modifier order in jdk.jfr Mar 23, 2021
@alblue alblue force-pushed the Sonar-JFRModifiers branch from 4812e09 to ec31fbd Compare March 24, 2021 13:17
@alblue
Copy link
Contributor Author

alblue commented Mar 25, 2021

Would someone mind reviewing this? @mgronlun perhaps?

Copy link

@mgronlun mgronlun left a comment

Choose a reason for hiding this comment

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

Hi Alex, looks good. Thank you.

@openjdk
Copy link

openjdk bot commented Mar 25, 2021

@alblue this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout Sonar-JFRModifiers
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 25, 2021
@alblue alblue force-pushed the Sonar-JFRModifiers branch from ec31fbd to 175d790 Compare March 25, 2021 22:04
@openjdk
Copy link

openjdk bot commented Mar 25, 2021

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

8264062: Use the blessed modifier order in jdk.jfr

Reviewed-by: mgronlun

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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. Possible candidates are the reviewers of this PR (@mgronlun) but any other Committer may sponsor as well.

➡️ 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 added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Mar 25, 2021
@alblue
Copy link
Contributor Author

alblue commented Mar 25, 2021

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 25, 2021
@openjdk
Copy link

openjdk bot commented Mar 25, 2021

@alblue
Your change (at version 175d790) is now ready to be sponsored by a Committer.

@mgronlun
Copy link

/sponsor

@openjdk openjdk bot closed this Mar 26, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored labels Mar 26, 2021
@openjdk
Copy link

openjdk bot commented Mar 26, 2021

Pushed as commit e47dfb8.

@alblue alblue deleted the Sonar-JFRModifiers branch March 26, 2021 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-jfr hotspot-jfr-dev@openjdk.org integrated Pull request has been integrated ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

2 participants