Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use try with close

Browse Source 
See gh-33987
This commit is contained in:
Krzysztof Krason
2023-01-26 18:29:35 -08:00
committed by Phillip Webb
parent 0e68cae57f
commit d3efd7e091
10 changed files with 33 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -128,12 +128,9 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter {
*/
@Override
public void writeEntry(String entryName, InputStream inputStream) throws IOException {
try {
try (inputStream) {
writeEntry(entryName, new InputStreamEntryWriter(inputStream));
}
finally {
inputStream.close();
}
}
/**

7
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -68,14 +68,11 @@ public class DefaultLaunchScript implements LaunchScript {
}
private String loadContent(InputStream inputStream) throws IOException {
try {
try (inputStream) {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
copy(inputStream, outputStream);
return outputStream.toString(StandardCharsets.UTF_8);
}
finally {
inputStream.close();
}
}
private void copy(InputStream inputStream, OutputStream outputStream) throws IOException {

12
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/SizeCalculatingEntryWriter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,12 +43,9 @@ final class SizeCalculatingEntryWriter implements EntryWriter {
private SizeCalculatingEntryWriter(EntryWriter entryWriter) throws IOException {
SizeCalculatingOutputStream outputStream = new SizeCalculatingOutputStream();
try {
try (outputStream) {
entryWriter.write(outputStream);
}
finally {
outputStream.close();
}
this.content = outputStream.getContent();
this.size = outputStream.getSize();
}
@@ -67,12 +64,9 @@ final class SizeCalculatingEntryWriter implements EntryWriter {
}
private void copy(InputStream inputStream, OutputStream outputStream) throws IOException {
try {
try (inputStream) {
StreamUtils.copy(inputStream, outputStream);
}
finally {
inputStream.close();
}
}
@Override