8304911: Use OperatingSystem enum in some modules #13335

RogerRiggs · 2023-04-04T19:22:48Z

With the addition of jdk.internal.util.OperatingSystem references to the system property os.name can be replaced.
This PR exports jdk.internal.util to:

java.prefs,
java.security.jgss,
java.smartcardio,
jdk.charsets,
jdk.net,
jdk.zipfs

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-8304911: Use OperatingSystem enum in some modules

Reviewers

Naoto Sato (@naotoj - Reviewer) ⚠️ Review applies to 72cff1ed
Lance Andersen (@LanceAndersen - Reviewer) ⚠️ Review applies to 72cff1ed
Iris Clark (@irisclark - Reviewer) ⚠️ Review applies to 5546b824
Jaikiran Pai (@jaikiran - Reviewer) ⚠️ Review applies to 5546b824

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13335

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-04-04T19:24:31Z

👋 Welcome back rriggs! 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 · 2023-04-04T19:27:20Z

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

core-libs
i18n
net
nio
security

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.

mlbridge · 2023-04-04T19:31:02Z

Webrevs

naotoj

LGTM

openjdk · 2023-04-04T20:44:05Z

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

8304911: Use OperatingSystem enum in some modules

Reviewed-by: naoto, lancea, iris, 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 63 new commits pushed to the master branch:

a8871f5: 8305407: ExternalSpecsWriter should ignore white-space differences in spec titles
6b2a86a: 8300257: C2: vectorization fails on some simple Memory Segment loops
dc81603: 8305666: Add system property for fair AWT lock
c67bbce: 8305711: Arm: C2 always enters slowpath for monitorexit
ce6e746: 8305118: Add RISC-V related content to building.md
314e9b3: 8300829: Make CtwRunner available as an independent tool
0a34018: 8305680: Remove Permissions from jcmd help output
8db1dd0: 8305622: Remove Permission details from jcmd man page
1d517af: 8305209: JDWP exit error AGENT_ERROR_INVALID_THREAD(203): missing entry in running thread table
08fbb7b: 8272119: Typo in JDK documentation (a -> an)
... and 53 more: https://git.openjdk.org/jdk/compare/c6bd489cc8d30fb6eec865b3dab1cf861e25c8d7...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.

LanceAndersen

The changes look good

Please add a Noreg-XXX label to the bug

ExE-Boss · 2023-04-05T05:07:05Z

src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java

+                                        new String[]{StaticProperty.javaHome()
+                                                + "\\bin\\sspi_bridge.dll"};


Suggested change

new String[]{StaticProperty.javaHome()

+ "\\bin\\sspi_bridge.dll"};

new String[]{ StaticProperty.javaHome()

+ "\\bin\\sspi_bridge.dll" };

src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java

AlanBateman · 2023-04-05T08:39:35Z

src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java

+                case LINUX -> newInstance("jdk.net.LinuxSocketOptions");
+                case MACOS -> newInstance("jdk.net.MacOSXSocketOptions");
+                case WINDOWS -> newInstance("jdk.net.WindowsSocketOptions");
+                default -> new PlatformSocketOptions();


For another issue, but I assume this could be refactored to not need PlatformSocketOptions, in which case the mapping of OS name to implementation class would go away.

Created an issue to track the possible refactoring, will keep this change until then.
https://bugs.openjdk.org/browse/JDK-8305661

Reformatted expression to match switch expression formatting.

src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java

Fixup formatting.

jaikiran

Looks ok to me.

turbanoff · 2023-04-07T08:07:15Z

src/java.prefs/share/classes/java/util/prefs/Preferences.java

-        }
+        String platformFactory = switch (OperatingSystem.current()) {
+            case WINDOWS -> "java.util.prefs.WindowsPreferencesFactory";
+            case MACOS ->  "java.util.prefs.MacOSXPreferencesFactory";


Suggested change

case MACOS -> "java.util.prefs.MacOSXPreferencesFactory";

case MACOS -> "java.util.prefs.MacOSXPreferencesFactory";

RogerRiggs · 2023-04-10T15:49:54Z

/integrate

openjdk · 2023-04-10T15:51:10Z

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

76975da: 8305758: Update the JAR tool man page to indicate -i/--generate-file is deprecated
0d45a52: 8302819: Remove JAR Index
0243da2: 8305481: gtest is_first_C_frame failing on ARM
a8e3a2d: 8205129: Remove java.lang.Compiler
db174a1: 4825182: DefaultBoundedRangeModel.setMinimum() changes extent unnecessarily
969a6b9: 8304825: MacOS metal pipeline - window isn't painted if created during display sleep
9727685: 8305310: Calculate PublicKey from PrivateKey
50d7335: 8305696: (zipfs) Avoid redundant LinkedHashMap.containsKey call ZipFileSystem.makeParentDirs
ec9d816: 6441827: Documentation mentions nonexistent NullReferenceException
9e20382: 8305721: add make compile-commands artifacts to .gitignore
... and 64 more: https://git.openjdk.org/jdk/compare/c6bd489cc8d30fb6eec865b3dab1cf861e25c8d7...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-04-10T15:51:21Z

@RogerRiggs Pushed as commit ba90dc7.

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

Use OperatingSystem methods instead of system property os.name

bcde177

RogerRiggs marked this pull request as ready for review April 4, 2023 19:23

In jdk.prefs module, Replace os.name with OperatingSystem enum

72cff1e

openjdk bot changed the title ~~8304911~~ 8304911: Use OperatingSystem enum in some modules Apr 4, 2023

openjdk bot added the rfr Pull request is ready for review label Apr 4, 2023

openjdk bot added security security-dev@openjdk.org nio nio-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org i18n i18n-dev@openjdk.org labels Apr 4, 2023

naotoj approved these changes Apr 4, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 4, 2023

LanceAndersen approved these changes Apr 4, 2023

View reviewed changes

irisclark approved these changes Apr 4, 2023

View reviewed changes

RogerRiggs mentioned this pull request Apr 4, 2023

Use OperatingSystem.isXXX instead of os.name checks for modules outside of java.base #12961

Closed

3 tasks

ExE-Boss reviewed Apr 5, 2023

View reviewed changes

AlanBateman reviewed Apr 5, 2023

View reviewed changes

src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java Outdated Show resolved Hide resolved

AlanBateman reviewed Apr 5, 2023

View reviewed changes

Revert chanes to ZipFileSystem to defer refactoring.

aadf5bb

Reformatted expression to match switch expression formatting.

ExE-Boss reviewed Apr 5, 2023

View reviewed changes

src/java.security.jgss/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Outdated Show resolved Hide resolved

Backout unneeded changes to module-info and default.policy.

5546b82

Fixup formatting.

irisclark approved these changes Apr 5, 2023

View reviewed changes

jaikiran approved these changes Apr 7, 2023

View reviewed changes

turbanoff reviewed Apr 7, 2023

View reviewed changes

Remove errant space

b926794

openjdk bot added the integrated Pull request has been integrated label Apr 10, 2023

openjdk bot closed this Apr 10, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 10, 2023

RogerRiggs deleted the 8304911-use-os-enum branch December 11, 2023 17:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8304911: Use OperatingSystem enum in some modules #13335

8304911: Use OperatingSystem enum in some modules #13335

RogerRiggs commented Apr 4, 2023 •

edited by openjdk bot

bridgekeeper bot commented Apr 4, 2023

openjdk bot commented Apr 4, 2023

mlbridge bot commented Apr 4, 2023 •

edited

naotoj left a comment

openjdk bot commented Apr 4, 2023 •

edited

LanceAndersen left a comment

ExE-Boss Apr 5, 2023

AlanBateman Apr 5, 2023

RogerRiggs Apr 5, 2023 •

edited

jaikiran left a comment

turbanoff Apr 7, 2023

RogerRiggs commented Apr 10, 2023

openjdk bot commented Apr 10, 2023

openjdk bot commented Apr 10, 2023

		new String[]{StaticProperty.javaHome()
		+ "\\bin\\sspi_bridge.dll"};

	case MACOS -> "java.util.prefs.MacOSXPreferencesFactory";
	case MACOS -> "java.util.prefs.MacOSXPreferencesFactory";

8304911: Use OperatingSystem enum in some modules #13335

8304911: Use OperatingSystem enum in some modules #13335

Conversation

RogerRiggs commented Apr 4, 2023 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Apr 4, 2023

openjdk bot commented Apr 4, 2023

mlbridge bot commented Apr 4, 2023 • edited

Webrevs

naotoj left a comment

Choose a reason for hiding this comment

openjdk bot commented Apr 4, 2023 • edited

LanceAndersen left a comment

Choose a reason for hiding this comment

ExE-Boss Apr 5, 2023

Choose a reason for hiding this comment

AlanBateman Apr 5, 2023

Choose a reason for hiding this comment

RogerRiggs Apr 5, 2023 • edited

Choose a reason for hiding this comment

jaikiran left a comment

Choose a reason for hiding this comment

turbanoff Apr 7, 2023

Choose a reason for hiding this comment

RogerRiggs commented Apr 10, 2023

openjdk bot commented Apr 10, 2023

openjdk bot commented Apr 10, 2023

RogerRiggs commented Apr 4, 2023 •

edited by openjdk bot

mlbridge bot commented Apr 4, 2023 •

edited

openjdk bot commented Apr 4, 2023 •

edited

RogerRiggs Apr 5, 2023 •

edited