Skip to content

Conversation

@alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Apr 1, 2025

  • Move ConfigException, PackagerException, MsiVersion, and DottedVersion classes from "jdk.jpackage.internal" package to "jdk.jpackage.internal.model" package.
  • Remove public ctor from DottedVersion class. It can only be constructed with DottedVersion.lazy() and DottedVersion.greedy() functions.
  • Move PathGroup class from "jdk.jpackage.internal" package to "jdk.jpackage.internal.util" package.
  • Move internal "MacHelper.PListWrapper" class into "jdk.jpackage.internal.util.PListReader". Add unit tests.
  • Move internal "jdk.jpackage.internal.I18N.MultiResourceBundle" class into "jdk.jpackage.internal.util.MultiResourceBundle"
  • Remove dead code from "src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties"
  • Make PlatformVersionTest fail if reflection fails to locate expected version class.

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-8353679: Restructure classes in jdk.jpackage.internal package (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24358

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 1, 2025

👋 Welcome back asemenyuk! 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 Apr 1, 2025

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

8353679: Restructure classes in jdk.jpackage.internal package

Reviewed-by: almatvee

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:

  • 1c2a553: 8327858: Improve spliterator and forEach for single-element immutable collections
  • a449aee: 8350704: Create tests to ensure the failure behavior of core reflection APIs
  • 57df89c: 8353684: [BACKOUT] j.u.l.Handler classes create deadlock risk via synchronized publish() method
  • ebcb9a8: 8349206: j.u.l.Handler classes create deadlock risk via synchronized publish() method

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
Copy link

openjdk bot commented Apr 1, 2025

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Apr 1, 2025
@alexeysemenyukoracle alexeysemenyukoracle force-pushed the rearrange-classes branch 4 times, most recently from c50bdbb to 55f7cf1 Compare April 1, 2025 16:40
- move PathGroup to util.PathGroup;
- move ConfigException to model.ConfigException;
- move PackagerException to model.PackagerException;
- move MsiVersion to model.MsiVersion;
- move DottedVersion to model.DottedVersion.
@alexeysemenyukoracle alexeysemenyukoracle changed the title Rearrange classes 8353679: Restructure classes in jdk.jpackage.internal package Apr 3, 2025
@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as ready for review April 3, 2025 19:58
@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev PTAL

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 3, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 3, 2025

Webrevs

Copy link
Member

@sashamatveev sashamatveev 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 4, 2025
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 4, 2025

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

  • 1161b56: 8353053: (fs) Add support for UserDefinedFileAttributeView on AIX
  • a13e34d: 8353274: [PPC64] Bug related to -XX:+UseCompactObjectHeaders -XX:-UseSIGTRAP in JDK-8305895
  • 41d4a0d: 8352392: AIX: implement attach API v2 and streaming output
  • 1c2a553: 8327858: Improve spliterator and forEach for single-element immutable collections
  • a449aee: 8350704: Create tests to ensure the failure behavior of core reflection APIs
  • 57df89c: 8353684: [BACKOUT] j.u.l.Handler classes create deadlock risk via synchronized publish() method
  • ebcb9a8: 8349206: j.u.l.Handler classes create deadlock risk via synchronized publish() method

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 4, 2025

@alexeysemenyukoracle Pushed as commit 10d1fec.

💡 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 integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants