Polish "Allow additional JVM args when running tests via toolchain"

See gh-27089
spring-projects · Jul 13, 2021 · 705feee · 705feee
1 parent 01b0156
commit 705feee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.build.toolchain;
 
+import java.util.Collections;
+
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -69,10 +71,8 @@ private void disableToolchainTasks(Project project) {
 	}
 
 	private void configureTestToolchain(Project project, ToolchainExtension toolchain) {
-		if (!toolchain.getTestJvmArgs().isPresent()) {
-			return;
-		}
-		project.getTasks().withType(Test.class, (test) -> test.jvmArgs(toolchain.getTestJvmArgs().get()));
+		project.getTasks().withType(Test.class,
+				(test) -> test.jvmArgs(toolchain.getTestJvmArgs().getOrElse(Collections.emptyList())));
 	}
 
 }
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
@@ -9,10 +9,6 @@ plugins {
 
 description = "Spring Boot"
 
-toolchain {
-	testJvmArgs.add("--add-opens=java.base/java.net=ALL-UNNAMED")
-}
-
 def tomcatConfigProperties = "$buildDir/tomcat-config-properties"
 
 configurations {
@@ -154,3 +150,7 @@ compileTestKotlin {
 compileJava {
 	doLast new org.springframework.boot.build.log4j2.ReproducibleLog4j2PluginsDatAction()
 }
+
+toolchain {
+	testJvmArgs.add("--add-opens=java.base/java.net=ALL-UNNAMED")
+}