Browse Source

Merge pull request #46259 from PiyalAhmed

* pr/46259:
  Remove unnecessary toString() call

Closes gh-46259
pull/46604/head
Stéphane Nicoll 7 months ago
parent
commit
67de3211e7
  1. 2
      buildSrc/src/main/java/org/springframework/boot/build/antora/GenerateAntoraPlaybook.java
  2. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseDockerComposeIntegrationTests.java

2
buildSrc/src/main/java/org/springframework/boot/build/antora/GenerateAntoraPlaybook.java

@ -111,7 +111,7 @@ public abstract class GenerateAntoraPlaybook extends DefaultTask { @@ -111,7 +111,7 @@ public abstract class GenerateAntoraPlaybook extends DefaultTask {
return project.provider(() -> {
Path playbookDir = toRealPath(getOutputFile().get().getAsFile().toPath()).getParent();
Path outputDir = toRealPath(siteDirectory);
return "." + File.separator + playbookDir.relativize(outputDir).toString();
return "." + File.separator + playbookDir.relativize(outputDir);
});
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseDockerComposeIntegrationTests.java

@ -83,7 +83,7 @@ class AutoConfigureTestDatabaseDockerComposeIntegrationTests { @@ -83,7 +83,7 @@ class AutoConfigureTestDatabaseDockerComposeIntegrationTests {
Files.writeString(composeFile, composeFileContent);
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(applicationContext,
"spring.docker.compose.skip.in-tests=false", "spring.docker.compose.stop.command=down",
"spring.docker.compose.file=" + composeFile.toAbsolutePath().toString());
"spring.docker.compose.file=" + composeFile.toAbsolutePath());
}
catch (IOException ex) {
throw new UncheckedIOException(ex);

Loading…
Cancel
Save