Use int for Java version

marcphilipp · marcphilipp · commit 3043c94c9e45 · 2025-04-14T08:19:12.000+02:00
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -69,7 +69,7 @@ public static List<String> loadModuleDirectoryNames() {
 		}
 	}
 
-	public static Optional<Path> getJavaHome(String version) {
+	public static Optional<Path> getJavaHome(int version) {
 		// First, try various system sources...
 		var sources = Stream.of( //
 			System.getProperty("java.home." + version), //
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/ProcessStarters.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/ProcessStarters.java
@@ -72,6 +72,10 @@ private static String windowsOrOtherExecutable(String cmdOrExe, String other) {
 	}
 
 	public static Optional<Path> getGradleJavaHome() {
-		return Helper.getJavaHome(System.getProperty("gradle.java.version"));
+		return Helper.getJavaHome(getGradleJavaVersion());
+	}
+
+	public static int getGradleJavaVersion() {
+		return Integer.parseInt(System.getProperty("gradle.java.version"));
 	}
 }
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -61,13 +61,13 @@ void version() {
 
 	@Test
 	void nonExistingJdkVersionYieldsAnEmptyOptional() {
-		assertEquals(Optional.empty(), Helper.getJavaHome("does not exist"));
+		assertEquals(Optional.empty(), Helper.getJavaHome(-1));
 	}
 
 	@ParameterizedTest
 	@ValueSource(ints = 8)
 	void checkJavaHome(int version) {
-		var home = Helper.getJavaHome(String.valueOf(version));
+		var home = Helper.getJavaHome(version);
 		assumeTrue(home.isPresent(), "No 'jdk' element found in Maven toolchain for: " + version);
 		assertTrue(Files.isDirectory(home.get()));
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -36,7 +36,7 @@ void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles o
 				.workingDir(copyToWorkspace(Projects.GRADLE_KOTLIN_EXTENSIONS, workspace)) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
-				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.putEnvironment("JDK8", Helper.getJavaHome(8).orElseThrow(TestAbortedException::new).toString()) //
 				.redirectOutput(outputFiles) //
 				.startAndWait();
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -37,7 +37,7 @@ void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles o
 				.workingDir(copyToWorkspace(Projects.GRADLE_MISSING_ENGINE, workspace)) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
-				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.putEnvironment("JDK8", Helper.getJavaHome(8).orElseThrow(TestAbortedException::new).toString()) //
 				.redirectOutput(outputFiles).startAndWait();
 
 		assertEquals(1, result.exitCode());
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -108,8 +108,8 @@ private ProcessResult runGradle(OutputFiles outputFiles, int javaVersion, String
 				.addArguments("-Djava.toolchain.version=" + javaVersion) //
 				.addArguments("--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.addArguments(extraArgs) //
-				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
-				.putEnvironment("JDK17", Helper.getJavaHome("17").orElseThrow(TestAbortedException::new).toString()) //
+				.putEnvironment("JDK8", Helper.getJavaHome(8).orElseThrow(TestAbortedException::new).toString()) //
+				.putEnvironment("JDK17", Helper.getJavaHome(17).orElseThrow(TestAbortedException::new).toString()) //
 				.redirectOutput(outputFiles) //
 				.startAndWait();
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -42,7 +42,7 @@ class JavaVersionsTests {
 
 	@Test
 	void java_8(@FilePrefix("maven") OutputFiles outputFiles) throws Exception {
-		var java8Home = Helper.getJavaHome("8");
+		var java8Home = Helper.getJavaHome(8);
 		assumeTrue(java8Home.isPresent(), "Java 8 installation directory not found!");
 		var actualLines = execute(java8Home.get(), outputFiles, Map.of());
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -81,7 +81,7 @@ void runOnlyOneMethodInClassTemplate(@FilePrefix("maven") OutputFiles outputFile
 	}
 
 	private ProcessResult runMaven(OutputFiles outputFiles, String... extraArgs) throws InterruptedException {
-		var result = ProcessStarters.maven(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+		var result = ProcessStarters.maven(Helper.getJavaHome(8).orElseThrow(TestAbortedException::new)) //
 				.workingDir(workspace) //
 				.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenSurefireCompatibilityTests.java
@@ -44,7 +44,7 @@ class MavenSurefireCompatibilityTests {
 	void testMavenSurefireCompatibilityProject(String surefireVersion, String extraArg, @TempDir Path workspace,
 			@FilePrefix("maven") OutputFiles outputFiles) throws Exception {
 		var extraArgs = extraArg == null ? new String[0] : new String[] { extraArg };
-		var result = ProcessStarters.maven(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+		var result = ProcessStarters.maven(Helper.getJavaHome(8).orElseThrow(TestAbortedException::new)) //
 				.workingDir(copyToWorkspace(Projects.MAVEN_SUREFIRE_COMPATIBILITY, workspace)) //
 				.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Dsurefire.version=" + surefireVersion) //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ReflectionCompatibilityTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ReflectionCompatibilityTests.java
@@ -37,7 +37,7 @@ void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles o
 				.workingDir(copyToWorkspace(Projects.REFLECTION_TESTS, workspace)) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
-				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.putEnvironment("JDK8", Helper.getJavaHome(8).orElseThrow(TestAbortedException::new).toString()) //
 				.redirectOutput(outputFiles) //
 				.startAndWait();
 
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java
@@ -454,7 +454,7 @@ void execute(@FilePrefix("console-launcher") OutputFiles outputFiles) throws Exc
 	@Order(4)
 	@Execution(SAME_THREAD)
 	void executeOnJava8(@FilePrefix("console-launcher") OutputFiles outputFiles) throws Exception {
-		var java8Home = Helper.getJavaHome("8").orElseThrow(TestAbortedException::new);
+		var java8Home = Helper.getJavaHome(8).orElseThrow(TestAbortedException::new);
 		var result = ProcessStarters.java(java8Home) //
 				.workingDir(workspace) //
 				.addArguments("-showversion") //
@@ -490,7 +490,7 @@ void executeOnJava8(@FilePrefix("console-launcher") OutputFiles outputFiles) thr
 	@Execution(SAME_THREAD)
 	// https://github.com/junit-team/junit5/issues/2600
 	void executeOnJava8SelectPackage(@FilePrefix("console-launcher") OutputFiles outputFiles) throws Exception {
-		var java8Home = Helper.getJavaHome("8").orElseThrow(TestAbortedException::new);
+		var java8Home = Helper.getJavaHome(8).orElseThrow(TestAbortedException::new);
 		var result = ProcessStarters.java(java8Home) //
 				.workingDir(workspace).addArguments("-showversion") //
 				.addArguments("-enableassertions") //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java
@@ -67,7 +67,7 @@ void verifyErrorMessageForUnalignedClasspath(JRE jre, Path javaHome, @TempDir Pa
 
 	static Stream<Arguments> javaVersions() {
 		return Stream.concat( //
-			Helper.getJavaHome("8").map(path -> Arguments.of(JRE.JAVA_8, path)).stream(), //
+			Helper.getJavaHome(8).map(path -> Arguments.of(JRE.JAVA_8, path)).stream(), //
 			Stream.of(Arguments.of(JRE.currentJre(), currentJdkHome())) //
 		);
 	}
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -59,7 +59,7 @@ void supportedVersions(String version, @FilePrefix("gradle") OutputFiles outputF
 	private ProcessResult run(OutputFiles outputFiles, String version) throws Exception {
 		return ProcessStarters.gradlew() //
 				.workingDir(copyToWorkspace(Projects.VINTAGE, workspace)) //
-				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.putEnvironment("JDK8", Helper.getJavaHome(8).orElseThrow(TestAbortedException::new).toString()) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -62,7 +62,7 @@ void supportedVersions(String version, @FilePrefix("maven") OutputFiles outputFi
 	}
 
 	private ProcessResult run(OutputFiles outputFiles, String version) throws Exception {
-		return ProcessStarters.maven(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+		return ProcessStarters.maven(Helper.getJavaHome(8).orElseThrow(TestAbortedException::new)) //
 				.workingDir(copyToWorkspace(Projects.VINTAGE, workspace)) //
 				.addArguments("clean", "test", "--update-snapshots", "--batch-mode") //
 				.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static List<String> loadModuleDirectoryNames() {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static Optional<Path> getJavaHome(String version) {`
	`72`	`+ public static Optional<Path> getJavaHome(int version) {`
`73`	`73`	`// First, try various system sources...`
`74`	`74`	`var sources = Stream.of( //`
`75`	`75`	`System.getProperty("java.home." + version), //`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ private static String windowsOrOtherExecutable(String cmdOrExe, String other) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public static Optional<Path> getGradleJavaHome() {`
`75`		`- return Helper.getJavaHome(System.getProperty("gradle.java.version"));`
	`75`	`+ return Helper.getJavaHome(getGradleJavaVersion());`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ public static int getGradleJavaVersion() {`
	`79`	`+ return Integer.parseInt(System.getProperty("gradle.java.version"));`
`76`	`80`	`}`
`77`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,13 +61,13 @@ void version() {`
`61`	`61`
`62`	`62`	`@Test`
`63`	`63`	`void nonExistingJdkVersionYieldsAnEmptyOptional() {`
`64`		`- assertEquals(Optional.empty(), Helper.getJavaHome("does not exist"));`
	`64`	`+ assertEquals(Optional.empty(), Helper.getJavaHome(-1));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@ParameterizedTest`
`68`	`68`	`@ValueSource(ints = 8)`
`69`	`69`	`void checkJavaHome(int version) {`
`70`		`- var home = Helper.getJavaHome(String.valueOf(version));`
	`70`	`+ var home = Helper.getJavaHome(version);`
`71`	`71`	`assumeTrue(home.isPresent(), "No 'jdk' element found in Maven toolchain for: " + version);`
`72`	`72`	`assertTrue(Files.isDirectory(home.get()));`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ void runOnlyOneMethodInClassTemplate(@FilePrefix("maven") OutputFiles outputFile`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`private ProcessResult runMaven(OutputFiles outputFiles, String... extraArgs) throws InterruptedException {`
`84`		`- var result = ProcessStarters.maven(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //`
	`84`	`+ var result = ProcessStarters.maven(Helper.getJavaHome(8).orElseThrow(TestAbortedException::new)) //`
`85`	`85`	`.workingDir(workspace) //`
`86`	`86`	`.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //`
`87`	`87`	`.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //`