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

8324053: Use the blessed modifier order for sealed in java.base #17468

Closed
wants to merge 1 commit into from

Conversation

pavelrappo
Copy link
Member

@pavelrappo pavelrappo commented Jan 17, 2024

Please review this trivial PR to reorder the sealed class or interface modifier. For context of this change see: #17242 (comment).


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-8324053: Use the blessed modifier order for sealed in java.base (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17468

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 17, 2024

👋 Welcome back prappo! 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 Jan 17, 2024
@openjdk
Copy link

openjdk bot commented Jan 17, 2024

@pavelrappo The following labels will be automatically applied to this pull request:

  • core-libs
  • i18n
  • net
  • nio

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

@openjdk openjdk bot added nio nio-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org i18n i18n-dev@openjdk.org labels Jan 17, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 17, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 17, 2024

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

8324053: Use the blessed modifier order for sealed in java.base

Reviewed-by: naoto, darcy, ihse, dfuchs

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

  • ff8cc26: 8323694: RISC-V: Unnecessary ResourceMark in NativeCall::set_destination_mt_safe
  • dadd9cd: 8316497: ColorConvertOp - typo for non-ICC conversions needs one-line fix

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.

➡️ 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 Jan 17, 2024
Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

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

Thanks! When this has been integrated, I can take a shot at the missorted defaults.

Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

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

LGTM

@pavelrappo
Copy link
Member Author

Thanks! When this has been integrated, I can take a shot at the missorted defaults.

Thanks, I could've done that myself, but decided not to. You see, default should ideally be a sole modifier on a method: all other modifiers of a default method should be deleted. I'm not sure that reaching such an ideal would be welcomed.

Whatever you decide to do, be prepared to work manually. bin/blessed-modifier-order.sh is simple and robust but not specific. You'll have to carefully sift through other missortings it finds.

@pavelrappo
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 18, 2024

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

  • 81df265: 8320458: Improve structural navigation in API documentation
  • a6c0b10: 8323684: TypeMirror.{getAnnotationsByType, getAnnotation} return uninformative results
  • 5c874c1: 8324161: validate-source fails after JDK-8275338
  • b6233c3: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
  • bfd2afe: 8275338: Add JFR events for notable serialization situations
  • 4c1a0fc: 8323995: Suppress notes generated on incremental microbenchmark builds
  • a2b117a: 8324132: G1: Remove unimplemented G1MonitoringSupport::recalculate_eden_size
  • 8e53459: 8323993: Serial: Refactor gc_prologue and gc_epilogue
  • aeb304b: 8324074: increase timeout for jvmci test TestResolvedJavaMethod.java
  • a22ae90: 8321938: java/foreign/critical/TestCriticalUpcall.java does not need a core file
  • ... and 6 more: https://git.openjdk.org/jdk/compare/de237fb058c74b87ea65a6020939264a5dfe3796...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 18, 2024

@pavelrappo Pushed as commit 9efdd24.

💡 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
core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated net net-dev@openjdk.org nio nio-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

5 participants