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

8332071: Convert package.html files in java.management.rmi to package-info.java #19263

Closed
wants to merge 6 commits into from

Conversation

nizarbenalla
Copy link
Contributor

@nizarbenalla nizarbenalla commented May 16, 2024

Please review this change. I converted the package.html file to package-info.java, because javac cannot recognize package.html.
I already brought this up in the mailing list.
The conversion was done in-place, only renaming it in git.

I also added a couple of @since tags, with only 2 changes I don't want to split these two fixes into separate PRs.
CREDENTIALS_FILTER_PATTERN and SERIAL_FILTER_PATTERN were first added in https://bugs.openjdk.org/browse/JDK-8187556


Progress

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

Issues

  • JDK-8332071: Convert package.html files in java.management.rmi to package-info.java (Sub-task - P4)
  • JDK-8332376: Add @<!---->since tags to java.management.rmi (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19263

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2024

👋 Welcome back nizarbenalla! 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 May 16, 2024

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

8332071: Convert package.html files in `java.management.rmi` to package-info.java
8332376: Add `@since` tags to `java.management.rmi`

Reviewed-by: kevinw, rriggs

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

  • 9ca90cc: 8332610: Remove unused nWakeups in ObjectMonitor
  • 92d3350: 8331920: ubsan: g1CardSetContainers.inline.hpp:266:5: runtime error: index 2 out of bounds for type 'G1CardSetHowl::ContainerPtr [2]' reported
  • 4f1a10f: 8332360: JVM hangs at exit when running on a uniprocessor
  • c3bc23f: 8326306: RISC-V: Re-structure MASM calls and jumps
  • 8a9d77d: 8320622: [TEST] Improve coverage of compiler/loopopts/superword/TestMulAddS2I.java on different platforms
  • 3d511ff: 8329748: Change default value of AssertWXAtThreadSync to true
  • 67f03f2: 8332533: RISC-V: Enable vector variable shift instructions for machines with RVV
  • 5f804b2: 8329825: Clarify the value type for java.net.SocketOptions.SO_LINGER
  • 52eda79: 8332538: Switch off JIT memory limit check for TestAlignVectorFuzzer.java
  • d999b81: 8331572: Allow using OopMapCache outside of STW GC phases
  • ... and 98 more: https://git.openjdk.org/jdk/compare/32c7681cf310c87669c502c4a8b62a7fecc93360...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.

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 (@kevinjwalls, @RogerRiggs) 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
Copy link

openjdk bot commented May 16, 2024

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

  • jmx
  • serviceability

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 serviceability serviceability-dev@openjdk.org jmx jmx-dev@openjdk.org labels May 16, 2024
@nizarbenalla
Copy link
Contributor Author

/issue add JDK-8332286

@openjdk
Copy link

openjdk bot commented May 16, 2024

@nizarbenalla
Adding additional issue to issue list: 8332286: Fix the @SInCE tags in java source code documentation.

@nizarbenalla nizarbenalla changed the title 8332071: Convert package.html files in java.management.rmi to package-info.java 8332071: Convert package.html files in java.management.rmi to package-info.java May 16, 2024
- Add `@since` tags to RMIConnectorServer
@nizarbenalla
Copy link
Contributor Author

sorry about the force push, had to.

@nizarbenalla
Copy link
Contributor Author

/issue add JDK-8332376

@nizarbenalla
Copy link
Contributor Author

/issue remove JDK-8332286

@openjdk
Copy link

openjdk bot commented May 19, 2024

@nizarbenalla
Adding additional issue to issue list: 8332376: Add @SInCEtags tojava.management.rmi``.

@openjdk
Copy link

openjdk bot commented May 19, 2024

@nizarbenalla
Removing additional issue from issue list: 8332286.

@nizarbenalla
Copy link
Contributor Author

/label remove jmx

@openjdk openjdk bot removed the jmx jmx-dev@openjdk.org label May 19, 2024
@openjdk
Copy link

openjdk bot commented May 19, 2024

@nizarbenalla
The jmx label was successfully removed.

@nizarbenalla nizarbenalla marked this pull request as ready for review May 19, 2024 15:57
@openjdk openjdk bot added the rfr Pull request is ready for review label May 19, 2024
@mlbridge
Copy link

mlbridge bot commented May 19, 2024

Webrevs

* questions.
*/

/**
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume you'll need to prepend each line with * too, which has the side effect of making it appear that every line is changed but I think we just need to get over that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doing that makes git think it's a new file, rather than a rename.
I was doing this in a26ee08 and removed it

Copy link
Member

@dfuch dfuch May 20, 2024

Choose a reason for hiding this comment

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

LGTM - there are further potential improvements that could be made in this file - like replacing <code></code> with {@code } and <pre></pre> with {@snippet } but I guess that can wait until someone has the inclination and bandwidth to do it...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed, found how to "lazily" append to the lines I want so adding the " *" wasn't an issue

Copy link
Contributor

@kevinjwalls kevinjwalls 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 - with the asterisk * prefix question from the other comment.
I looked to check and yes the since 10 is correct.

@kevinjwalls
Copy link
Contributor

/reviewers 2

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 20, 2024
@openjdk
Copy link

openjdk bot commented May 20, 2024

@kevinjwalls
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label May 20, 2024
@openjdk openjdk bot removed the rfr Pull request is ready for review label May 20, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label May 20, 2024
*
* @since 1.5
*
**/
Copy link
Contributor

Choose a reason for hiding this comment

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

Extra * */ is sufficient.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 393bf3a, thanks.

Comment on lines +119 to +121
*
* @since 10
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

Please fix the indentation of the "*" for the this comment on CREDENTIALS_FILTER_PATTERN so it looks consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed to be consistent, but the rest of the comment is still indented wrong.

/**
* Name of the attribute that specifies ...
* ....

Copy link
Contributor

Choose a reason for hiding this comment

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

(I would have gone the other way and corrected the preceding indentation to the standard).

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 22, 2024
@nizarbenalla
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 22, 2024
@openjdk
Copy link

openjdk bot commented May 22, 2024

@nizarbenalla
Your change (at version 82536dd) is now ready to be sponsored by a Committer.

@kevinjwalls
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented May 22, 2024

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

  • afed7d0: 8329538: Accelerate P256 on x86_64 using Montgomery intrinsic
  • 9ca90cc: 8332610: Remove unused nWakeups in ObjectMonitor
  • 92d3350: 8331920: ubsan: g1CardSetContainers.inline.hpp:266:5: runtime error: index 2 out of bounds for type 'G1CardSetHowl::ContainerPtr [2]' reported
  • 4f1a10f: 8332360: JVM hangs at exit when running on a uniprocessor
  • c3bc23f: 8326306: RISC-V: Re-structure MASM calls and jumps
  • 8a9d77d: 8320622: [TEST] Improve coverage of compiler/loopopts/superword/TestMulAddS2I.java on different platforms
  • 3d511ff: 8329748: Change default value of AssertWXAtThreadSync to true
  • 67f03f2: 8332533: RISC-V: Enable vector variable shift instructions for machines with RVV
  • 5f804b2: 8329825: Clarify the value type for java.net.SocketOptions.SO_LINGER
  • 52eda79: 8332538: Switch off JIT memory limit check for TestAlignVectorFuzzer.java
  • ... and 99 more: https://git.openjdk.org/jdk/compare/32c7681cf310c87669c502c4a8b62a7fecc93360...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 22, 2024

@kevinjwalls @nizarbenalla Pushed as commit a0c5714.

💡 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
integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
5 participants