Skip to content

Commit 78802af

Browse files
author
Vincent Potucek
committed
Add Java8toJava11 #48692
Signed-off-by: Vincent Potucek <vpotucek@me.com> ``` Changes have been made to build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ClassPath.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ClassPathTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/CommandLineBuilderTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuildExtension.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/ResolvedDockerHost.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/SslContextFactory.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/TarGzipBuildpack.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/DirectoryBuildpack.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackReference.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/NamedPipeSocket.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/ResolvedDockerHostTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PemFileWriter.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/LocalHttpClientTransportTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/FilePermissionsTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildpackCoordinatesTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildpackReferenceTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/TestTarGzip.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/DirectoryBuildpackTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to cli/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to configuration-metadata/spring-boot-configuration-processor/build.gradle by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.javax.AddCommonAnnotationsDependencies org.openrewrite.java.dependencies.AddDependency: {groupId=jakarta.annotation, artifactId=jakarta.annotation-api, version=1.3.x, onlyIfUsing=javax.annotation..*, scope=provided, acceptTransitive=true} Changes have been made to core/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigTreeConfigDataResource.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to core/spring-boot/src/main/java/org/springframework/boot/system/ApplicationTemp.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to core/spring-boot/src/main/java/org/springframework/boot/SpringApplicationAotProcessor.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to core/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ValueObjectBinderTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to core/spring-boot-autoconfigure-processor/build.gradle by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.javax.AddCommonAnnotationsDependencies org.openrewrite.java.dependencies.AddDependency: {groupId=jakarta.annotation, artifactId=jakarta.annotation-api, version=1.3.x, onlyIfUsing=javax.annotation..*, scope=provided, acceptTransitive=true} Changes have been made to core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManagerTests.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to core/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestAotProcessor.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to loader/spring-boot-jarmode-tools/src/main/java/org/springframework/boot/jarmode/tools/Context.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to loader/spring-boot-loader/src/main/java/org/springframework/boot/loader/launch/JarFileArchive.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Changes have been made to smoke-test/spring-boot-smoke-test-webservices/build.gradle by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.javax.AddJaxwsDependencies org.openrewrite.java.migrate.javax.AddJaxwsRuntime org.openrewrite.java.migrate.javax.AddJaxwsRuntime$AddJaxwsRuntimeGradle Changes have been made to starter/spring-boot-starter-web-services/build.gradle by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.javax.AddJaxwsDependencies org.openrewrite.java.migrate.javax.AddJaxwsRuntime org.openrewrite.java.migrate.javax.AddJaxwsRuntime$AddJaxwsRuntimeGradle Changes have been made to starter/spring-boot-starter-webservices/build.gradle by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.javax.AddJaxwsDependencies org.openrewrite.java.migrate.javax.AddJaxwsRuntime org.openrewrite.java.migrate.javax.AddJaxwsRuntime$AddJaxwsRuntimeGradle Changes have been made to test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java by: org.openrewrite.java.migrate.Java8toJava11 org.openrewrite.java.migrate.nio.file.PathsGetToPathOf org.openrewrite.java.ChangeMethodTargetToStatic: {methodPattern=java.nio.file.Paths get(..), fullyQualifiedTargetTypeName=java.nio.file.Path} org.openrewrite.java.ChangeMethodName: {methodPattern=java.nio.file.Path get(..), newMethodName=of} Please review and commit the results. Estimate time saved: 3h 10m BUILD SUCCESSFUL in 8m 35s 842 actionable tasks: 3 executed, 5 from cache, 834 up-to-date ➜ spring-boot git:(fix-EqualityRulesRecipes-pr) ✗ ```
1 parent 5edd521 commit 78802af

File tree

43 files changed

+136
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+136
-90
lines changed

.github/actions/build/action.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,16 @@ runs:
6969
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
7070
COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
7171
run: ./gradlew build
72+
- name: Sanity Check
73+
id: sanity
74+
if: ${{ inputs.publish == 'false' }}
75+
shell: bash
76+
env:
77+
COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }}
78+
COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
79+
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
80+
COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
81+
run: ./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx12G
7282
- name: Publish
7383
id: publish
7484
if: ${{ inputs.publish == 'true' }}

.github/workflows/build-pull-request.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
- name: Build
1414
id: build
1515
uses: ./.github/actions/build
16+
- name: Sanity
17+
id: sanity
18+
uses: ./.github/actions/build
1619
- name: Print JVM Thread Dumps When Cancelled
1720
if: cancelled()
1821
uses: ./.github/actions/print-jvm-thread-dumps

build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ void buildsImageWithBindCaches() throws IOException {
354354
assertThat(result.getOutput()).contains("---> Test Info buildpack done");
355355
removeImages(projectName);
356356
String tempDir = System.getProperty("java.io.tmpdir");
357-
Path buildCachePath = Paths.get(tempDir, "junit-image-cache-" + projectName + "-build");
358-
Path launchCachePath = Paths.get(tempDir, "junit-image-cache-" + projectName + "-launch");
357+
Path buildCachePath = Path.of(tempDir, "junit-image-cache-" + projectName + "-build");
358+
Path launchCachePath = Path.of(tempDir, "junit-image-cache-" + projectName + "-launch");
359359
assertThat(buildCachePath).exists().isDirectory();
360360
assertThat(launchCachePath).exists().isDirectory();
361361
cleanupCache(buildCachePath);
@@ -595,7 +595,7 @@ private void writeLongNameResource() throws IOException {
595595
new Random().ints('a', 'z' + 1).limit(128).forEach((i) -> name.append((char) i));
596596
Path path = this.gradleBuild.getProjectDir()
597597
.toPath()
598-
.resolve(Paths.get("src", "main", "resources", name.toString()));
598+
.resolve(Path.of("src", "main", "resources", name.toString()));
599599
Files.createDirectories(path.getParent());
600600
Files.createFile(path);
601601
}
@@ -620,13 +620,13 @@ private void writeBuildpackContent() throws IOException {
620620
writer.println("[[stacks]]\n");
621621
writer.println("id = \"*\"");
622622
}
623-
File detect = Files.createFile(Paths.get(binDir.getAbsolutePath(), "detect"), execFileAttribute).toFile();
623+
File detect = Files.createFile(Path.of(binDir.getAbsolutePath(), "detect"), execFileAttribute).toFile();
624624
try (PrintWriter writer = new PrintWriter(new FileWriter(detect))) {
625625
writer.println("#!/usr/bin/env bash");
626626
writer.println("set -eo pipefail");
627627
writer.println("exit 0");
628628
}
629-
File build = Files.createFile(Paths.get(binDir.getAbsolutePath(), "build"), execFileAttribute).toFile();
629+
File build = Files.createFile(Path.of(binDir.getAbsolutePath(), "build"), execFileAttribute).toFile();
630630
try (PrintWriter writer = new PrintWriter(new FileWriter(build))) {
631631
writer.println("#!/usr/bin/env bash");
632632
writer.println("set -eo pipefail");

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.io.StringReader;
2727
import java.nio.file.Files;
2828
import java.nio.file.Path;
29-
import java.nio.file.Paths;
3029
import java.util.ArrayList;
3130
import java.util.Arrays;
3231
import java.util.Enumeration;
@@ -725,7 +724,7 @@ private void writeResource() {
725724
try {
726725
Path path = this.gradleBuild.getProjectDir()
727726
.toPath()
728-
.resolve(Paths.get("src", "main", "resources", "static", "file.txt"));
727+
.resolve(Path.of("src", "main", "resources", "static", "file.txt"));
729728
Files.createDirectories(path.getParent());
730729
Files.createFile(path);
731730
}

build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.io.IOException;
2121
import java.nio.file.Files;
2222
import java.nio.file.Path;
23-
import java.nio.file.Paths;
2423
import java.time.OffsetDateTime;
2524
import java.util.Random;
2625
import java.util.stream.IntStream;
@@ -455,8 +454,8 @@ void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) {
455454
.contains("Successfully built image");
456455
removeImage("build-image-bind-caches", "0.0.1.BUILD-SNAPSHOT");
457456
String tempDir = System.getProperty("java.io.tmpdir");
458-
Path buildCachePath = Paths.get(tempDir, "junit-image-cache-" + testBuildId + "-build");
459-
Path launchCachePath = Paths.get(tempDir, "junit-image-cache-" + testBuildId + "-launch");
457+
Path buildCachePath = Path.of(tempDir, "junit-image-cache-" + testBuildId + "-build");
458+
Path launchCachePath = Path.of(tempDir, "junit-image-cache-" + testBuildId + "-launch");
460459
assertThat(buildCachePath).exists().isDirectory();
461460
assertThat(launchCachePath).exists().isDirectory();
462461
cleanupCache(buildCachePath);
@@ -627,7 +626,7 @@ private void writeLongNameResource(File project) {
627626
StringBuilder name = new StringBuilder();
628627
new Random().ints('a', 'z' + 1).limit(128).forEach((i) -> name.append((char) i));
629628
try {
630-
Path path = project.toPath().resolve(Paths.get("src", "main", "resources", name.toString()));
629+
Path path = project.toPath().resolve(Path.of("src", "main", "resources", name.toString()));
631630
Files.createDirectories(path.getParent());
632631
Files.createFile(path);
633632
}

build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuild.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.nio.file.FileVisitResult;
2424
import java.nio.file.Files;
2525
import java.nio.file.Path;
26-
import java.nio.file.Paths;
2726
import java.nio.file.SimpleFileVisitor;
2827
import java.nio.file.StandardCopyOption;
2928
import java.nio.file.StandardOpenOption;
@@ -163,7 +162,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
163162
}
164163

165164
});
166-
String settingsXml = Files.readString(Paths.get("build", "generated-resources", "settings", "settings.xml"))
165+
String settingsXml = Files.readString(Path.of("build", "generated-resources", "settings", "settings.xml"))
167166
.replace("@localCentralUrl@", new File("build/test-maven-repository").toURI().toURL().toString())
168167
.replace("@localRepositoryPath@", new File("build/local-maven-repository").getAbsolutePath());
169168
Files.writeString(destination.resolve("settings.xml"), settingsXml, StandardOpenOption.CREATE_NEW);

build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/MavenBuildExtension.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.io.IOException;
2020
import java.nio.file.Files;
2121
import java.nio.file.Path;
22-
import java.nio.file.Paths;
2322
import java.util.Arrays;
2423
import java.util.List;
2524
import java.util.stream.Stream;
@@ -49,7 +48,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
4948
try {
5049
// Returning a stream which must be closed here is fine, as JUnit will take
5150
// care of closing it
52-
return Files.list(Paths.get("build/maven-binaries")).map(MavenVersionTestTemplateInvocationContext::new);
51+
return Files.list(Path.of("build/maven-binaries")).map(MavenVersionTestTemplateInvocationContext::new);
5352
}
5453
catch (IOException ex) {
5554
throw new RuntimeException(ex);

build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ClassPath.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.nio.charset.UnsupportedCharsetException;
2525
import java.nio.file.Files;
2626
import java.nio.file.Path;
27-
import java.nio.file.Paths;
2827
import java.util.Arrays;
2928
import java.util.Collections;
3029
import java.util.List;
@@ -139,7 +138,7 @@ private static boolean isWindows(UnaryOperator<@Nullable String> getSystemProper
139138

140139
private static String toPathString(URL url) {
141140
try {
142-
return Paths.get(url.toURI()).toString();
141+
return Path.of(url.toURI()).toString();
143142
}
144143
catch (URISyntaxException ex) {
145144
throw new IllegalArgumentException(ex);

build-plugin/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ClassPathTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.io.File;
2020
import java.nio.file.Path;
21-
import java.nio.file.Paths;
2221
import java.util.Collections;
2322
import java.util.List;
2423
import java.util.Map;
@@ -66,7 +65,7 @@ void argsWhenMultipleUrlsOnWindowsAndAllowedUsesArgFile(@TempDir Path temp) thro
6665
List<String> args = classPath.args(true);
6766
assertThat(args.get(0)).isEqualTo("-cp");
6867
assertThat(args.get(1)).startsWith("@");
69-
assertThat(Paths.get(args.get(1).substring(1)))
68+
assertThat(Path.of(args.get(1).substring(1)))
7069
.hasContent("\"" + (path1 + File.pathSeparator + path2).replace("\\", "\\\\") + "\"");
7170
}
7271

build-plugin/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/CommandLineBuilderTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.net.MalformedURLException;
2424
import java.net.URL;
2525
import java.nio.file.Path;
26-
import java.nio.file.Paths;
2726
import java.util.Arrays;
2827
import java.util.List;
2928
import java.util.Map;
@@ -115,7 +114,7 @@ void buildWithClassPathOnWindows(@TempDir Path tempDir) throws Exception {
115114
assertThat(args.get(0)).isEqualTo("-cp");
116115
assertThat(args.get(1)).startsWith("@");
117116
assertThat(args.get(2)).isEqualTo(CLASS_NAME);
118-
assertThat(Paths.get(args.get(1).substring(1)))
117+
assertThat(Path.of(args.get(1).substring(1)))
119118
.hasContent("\"" + (file + File.pathSeparator + file1).replace("\\", "\\\\") + "\"");
120119
}
121120

@@ -140,7 +139,7 @@ void buildAndRunWithLongClassPath() throws IOException, InterruptedException {
140139

141140
private URL toURL(String path) {
142141
try {
143-
return Paths.get(path).toUri().toURL();
142+
return Path.of(path).toUri().toURL();
144143
}
145144
catch (MalformedURLException ex) {
146145
throw new RuntimeException(ex);

0 commit comments

Comments
 (0)