root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Revert "Polish"

Browse Source 
This reverts commit 6a65ca13ea since
FileCopyUtils will close the reader/writer.
3.1.x
Phillip Webb 1 year ago
parent 848a61a3a8
commit 2fdc29b885
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File

9
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java
Unescape Escape View File

@ -83,14 +83,9 @@ public abstract class AbstractDockerComposeIntegrationTests {
private File transformedComposeFile(File composeFile, DockerImageName imageName) { private File transformedComposeFile(File composeFile, DockerImageName imageName) {
File tempComposeFile = Path.of(tempDir.toString(), composeFile.getName()).toFile(); File tempComposeFile = Path.of(tempDir.toString(), composeFile.getName()).toFile();
try { try {
String composeFileContent; String composeFileContent = FileCopyUtils.copyToString(new FileReader(composeFile));
try (FileReader reader = new FileReader(composeFile)) {
composeFileContent = FileCopyUtils.copyToString(reader);
}
composeFileContent = composeFileContent.replace("{imageName}", imageName.asCanonicalNameString()); composeFileContent = composeFileContent.replace("{imageName}", imageName.asCanonicalNameString());
try (FileWriter writer = new FileWriter(tempComposeFile)) { FileCopyUtils.copy(composeFileContent, new FileWriter(tempComposeFile));
FileCopyUtils.copy(composeFileContent, writer);
}
} }
catch (IOException ex) { catch (IOException ex) {
fail("Error transforming Docker compose file '" + composeFile + "' to '" + tempComposeFile + "': " fail("Error transforming Docker compose file '" + composeFile + "' to '" + tempComposeFile + "': "

Write Preview
Loading…
Cancel
Save