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-8275091 : /src/jdk.management.jfr/share/classes/module-info.java has non-canonical order #5738

Conversation

kabutz
Copy link
Contributor

@kabutz kabutz commented Sep 28, 2021

The canonical order of declarations inside the module-info.java file seems to follow the order:

`module some.module.name {
requires ...

requires transitive ...

exports ...

exports ... to ...

opens ... to ...

uses ...

provides ... with ...
}
`

The "requires" was changed to "requires transitive" as part of a larger change 8248564, but not reordered.

This is the only module-info.java file in the src/** directory that deviates from what appears to be the canonical order.


Progress

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

Issue

  • JDK-8275091: /src/jdk.management.jfr/share/classes/module-info.java has non-canonical order

Reviewers

Reviewing

Using git

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

Update a local copy of the PR:
$ git checkout pull/5738
$ git pull https://git.openjdk.java.net/jdk pull/5738/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5738

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5738.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 28, 2021

👋 Welcome back kabutz! 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 openjdk bot commented Sep 28, 2021

@kabutz 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 label Sep 28, 2021
@kabutz
Copy link
Contributor Author

@kabutz kabutz commented Oct 1, 2021

Submitted a bug report, internal ID 9071602

@kabutz kabutz changed the title Maintain the canonical order in module-info.java JDK-8275091 : /src/jdk.management.jfr/share/classes/module-info.java has non-canonical order Oct 12, 2021
@openjdk openjdk bot added the rfr label Oct 12, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 12, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

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

8275091: /src/jdk.management.jfr/share/classes/module-info.java has non-canonical order

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

  • d04d4ee: 8274894: Use Optional.empty() instead of ofNullable(null) in HttpResponse.BodySubscribers.discarding
  • 33050f8: 8274986: max code printed in hs-err logs should be configurable
  • 8de2636: 8274615: Support relaxed atomic add for linux-aarch64
  • 7d2633f: 8275002: Remove unused AbstractStringBuilder.MAX_ARRAY_SIZE

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. 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 the ready label Oct 12, 2021
@kabutz
Copy link
Contributor Author

@kabutz kabutz commented Oct 12, 2021

/integrate

@openjdk openjdk bot added the sponsor label Oct 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@kabutz
Your change (at version 320c433) is now ready to be sponsored by a Committer.

@mgronlun
Copy link

@mgronlun mgronlun commented Oct 12, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

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

  • d04d4ee: 8274894: Use Optional.empty() instead of ofNullable(null) in HttpResponse.BodySubscribers.discarding
  • 33050f8: 8274986: max code printed in hs-err logs should be configurable
  • 8de2636: 8274615: Support relaxed atomic add for linux-aarch64
  • 7d2633f: 8275002: Remove unused AbstractStringBuilder.MAX_ARRAY_SIZE

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Oct 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@mgronlun @kabutz Pushed as commit b460d6d.

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

@kabutz kabutz deleted the maintain_canonical_order_in_module-info.java branch Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-jfr integrated
2 participants