Skip to content

Conversation

@lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Oct 30, 2024

This is a partial implementation of JEP 495 - adjustments of the JEP metadata in PreviewFeature. There are no language changes associated with this JEP. Changes to the java.io.IO class are covered by #21693.


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
  • Change requires a JEP request to be targeted
  • Change requires CSR request JDK-8341725 to be approved

Issues

  • JDK-8335991: Implement Simple Source Files and Instance Main Methods (Fourth Preview) (Sub-task - P4)
  • JDK-8335984: JEP 495: Simple Source Files and Instance Main Methods (Fourth Preview) (JEP)
  • JDK-8341725: Implement Simple Source Files and Instance Main Methods (Fourth Preview) (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21787

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 2024

👋 Welcome back jlahoda! 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 Oct 30, 2024

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

8335991: Implement Simple Source Files and Instance Main Methods (Fourth Preview)

Reviewed-by: asotona, jpai

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

  • 168b18e: 8343958: Remove security manager impl in java.lang.Process and java.lang.Runtime.exec
  • 5ac330b: 8344039: Remove security manager dependency in java.time
  • 1eb38c8: 8343219: Manual clientlibs test failures after SM removal
  • dde6230: 8343416: CDS dump fails when unregistered class can also be loaded from system modules
  • ffea980: 8344023: Unnecessary Hashtable usage in LdapClient.defaultBinaryAttrs
  • 5e01c40: 8343981: Remove usage of security manager from Thread and related classes
  • dbf2346: 8341260: Add Float16 to jdk.incubator.vector
  • a5f11b5: 8343483: Remove unnecessary @SuppressWarnings annotations (serviceability)
  • 7be7772: 8344112: Remove code to support security manager execution mode from DatagramChannel implementation
  • bd3fec3: 8344086: Remove security manager dependency in FFM
  • ... and 289 more: https://git.openjdk.org/jdk/compare/f0b130e54f33d3190640ce33c991e35f27e9f812...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 csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels Oct 30, 2024
@openjdk
Copy link

openjdk bot commented Oct 30, 2024

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

  • compiler
  • core-libs

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 core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Oct 30, 2024
@lahodaj
Copy link
Contributor Author

lahodaj commented Oct 30, 2024

/jep 495

@openjdk
Copy link

openjdk bot commented Oct 30, 2024

@lahodaj
This pull request will not be integrated until the JEP-495 has been targeted.

@openjdk openjdk bot added the jep label Oct 30, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 30, 2024

Webrevs

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Oct 30, 2024
Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

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

Looks good to me.

//---
@JEP(number=477, title="Implicitly Declared Classes and Instance Main Methods", status="Third Preview")
@JEP(number=495, title="Simple Source Files and Instance Main Methods", status="Fourth Preview")
IMPLICIT_CLASSES,
Copy link
Member

Choose a reason for hiding this comment

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

Hello Jan, although it's just an internal enum name, do you think we should rename it to be closer to the JEP's title or is it not worth it?

Copy link
Contributor

Choose a reason for hiding this comment

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

The title also shows up in list of preview APIs in the javadoc so changing seems correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please note the title is adjusted to match the current name of the JEP. So the built javadoc should not be an issue. What Jaikiran is speaking about is the enum constant name, which hopefully(!) does not have a meaning outside of the JDK.

We could change the constant to SIMPLE_SOURCE_FILES_AND_INSTANCE_MAIN_METHODS (to precisely reflect the JEP's name), but it seems like an unnecessary git churn to me. We might also need to keep the existing constant due to bootstrap issues, then remove it when JDK 25 is switched to bootstrap on JDK 24.

I can do that, if really needed, though.

Copy link
Member

@jaikiran jaikiran Nov 3, 2024

Choose a reason for hiding this comment

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

What Jaikiran is speaking about is the enum constant name, which hopefully(!) does not have a meaning outside of the JDK.

I had looked around the rendered javadoc and a few other places and I didn't notice the enum name showing up anywhere publicly. It merely appears to be an internal reference within the code.

Copy link
Member

@jaikiran jaikiran 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 OK to me and matches what is stated in the CSR.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed jep labels Nov 13, 2024
@lahodaj
Copy link
Contributor Author

lahodaj commented Nov 14, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Nov 14, 2024

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

  • 81342ac: 8343752: The javadoc should contain a note about usages of requires transitive java.base;
  • 8523880: 8342693: Use byte[] as parameter in a FDBigInteger constructor and as field
  • 2b57f40: 8343426: ConcurrentSkipListMap.spliterator() can no longer split the stream
  • a8152bd: 8343941: IGV: dump graph at different register allocation steps
  • bd6152f: 8343855: HTTP/2 ConnectionWindowUpdateSender may miss some unprocessed DataFrames from closed streams
  • c3776db: 8342936: Enhance java.io.IO with parameter-less println() and readln()
  • b54bd82: 8344025: Remove unused ISO2022.Encoder.maximumDesignatorLength
  • abacece: 8344011: Remove usage of security manager from Class and reflective APIs
  • c977ef7: 8342047: Create Template Assertion Predicates with Halt nodes only instead of uncommon traps
  • 23a8c71: 8341790: Fix ExceptionOccurred in java.desktop
  • ... and 305 more: https://git.openjdk.org/jdk/compare/f0b130e54f33d3190640ce33c991e35f27e9f812...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 14, 2024

@lahodaj Pushed as commit 5731ab7.

💡 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

compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants