You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2024/12/08 22:47:52 UTC
(maven-scm-publish-plugin) 01/01: Prefer try with resources
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch io
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit a9294117da462ade90a95a7dea2bcdeef9014114
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Dec 8 17:47:43 2024 -0500
Prefer try with resources
---
.../scmpublish/ScmPublishPublishScmMojo.java | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
index ed16881..0cb5afe 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
@@ -36,7 +36,6 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.NameFileFilter;
import org.apache.commons.io.filefilter.NotFileFilter;
import org.apache.maven.plugin.MojoExecutionException;
@@ -195,12 +194,10 @@ public class ScmPublishPublishScmMojo extends AbstractScmPublishMojo {
* @throws IOException
*/
private void copyAndNormalizeNewlines(File srcFile, File destFile) throws IOException {
- BufferedReader in = null;
- PrintWriter out = null;
- try {
- in = new BufferedReader(new InputStreamReader(Files.newInputStream(srcFile.toPath()), siteOutputEncoding));
- out = new PrintWriter(new OutputStreamWriter(Files.newOutputStream(destFile.toPath()), siteOutputEncoding));
-
+ try (BufferedReader in = new BufferedReader(
+ new InputStreamReader(Files.newInputStream(srcFile.toPath()), siteOutputEncoding));
+ PrintWriter out = new PrintWriter(
+ new OutputStreamWriter(Files.newOutputStream(destFile.toPath()), siteOutputEncoding))) {
for (String line = in.readLine(); line != null; line = in.readLine()) {
if (in.ready()) {
out.println(line);
@@ -208,14 +205,6 @@ public class ScmPublishPublishScmMojo extends AbstractScmPublishMojo {
out.print(line);
}
}
-
- out.close();
- out = null;
- in.close();
- in = null;
- } finally {
- IOUtils.closeQuietly(out);
- IOUtils.closeQuietly(in);
}
}
@@ -263,7 +252,7 @@ public class ScmPublishPublishScmMojo extends AbstractScmPublishMojo {
updateDirectory,
content,
(project == null) ? null : project.getModel().getModules());
- String displaySize = org.apache.commons.io.FileUtils.byteCountToDisplaySize(size);
+ String displaySize = FileUtils.byteCountToDisplaySize(size);
logInfo(
"Content consists of " + MessageUtils.buffer().strong("%d directories and %d files = %s"),
directories,