This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git
commit 08979553f2e20385a8d623249b542105a7fdb814 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 3 10:25:37 2023 +0200 Prefer Files.newInputStream --- .../src/main/java/org/apache/maven/building/FileSource.java | 4 ++-- .../org/apache/maven/plugin/internal/DefaultMavenPluginManager.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java index 37020a825..b3d04057e 100644 --- a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java +++ b/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java @@ -19,9 +19,9 @@ package org.apache.maven.building; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.Objects; /** @@ -46,7 +46,7 @@ public class FileSource implements Source { @Override public InputStream getInputStream() throws IOException { - return new FileInputStream(file); + return Files.newInputStream(file.toPath()); } @Override diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 1845e3980..6f9a63fa0 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -22,13 +22,12 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -229,7 +228,7 @@ public class DefaultMavenPluginManager implements MavenPluginManager { File pluginXml = new File(pluginFile, getPluginDescriptorLocation()); if (pluginXml.isFile()) { - try (InputStream is = new BufferedInputStream(new FileInputStream(pluginXml))) { + try (InputStream is = Files.newInputStream(pluginXml.toPath())) { pluginDescriptor = parsePluginDescriptor(is, plugin, pluginXml.getAbsolutePath()); } }
