This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new b147bef70c Trivial refactor: construct `InputStream` and
`OutputStream` with `Files` methods
b147bef70c is described below
commit b147bef70c2cbd82e42b8fed7b511f1f48d13595
Author: Daniel Sun <[email protected]>
AuthorDate: Sun Jun 1 00:03:34 2025 +0900
Trivial refactor: construct `InputStream` and `OutputStream` with `Files`
methods
---
.../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java | 4 ++--
.../src/main/java/org/codehaus/groovy/ant/VerifyClass.java | 5 +++--
.../codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java | 5 +++--
.../src/main/java/groovy/servlet/TemplateServlet.java | 6 +++---
.../src/main/groovy/groovy/text/TemplateEngine.java | 4 ++--
subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java | 4 ++--
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git
a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index 2745eb968e..19850d0686 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -51,7 +51,6 @@ import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -62,6 +61,7 @@ import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
+import java.nio.file.Files;
import java.security.PrivilegedAction;
import java.util.List;
import java.util.Vector;
@@ -387,7 +387,7 @@ public class Groovy extends Java {
File file = ((FileResource) src).getFile();
createClasspath().add(new Path(getProject(),
file.getParentFile().getCanonicalPath()));
if (encoding != null && !encoding.isEmpty()) {
- reader = new LineNumberReader(new
InputStreamReader(new FileInputStream(file), encoding));
+ reader = new LineNumberReader(new
InputStreamReader(Files.newInputStream(file.toPath()), encoding));
} else {
reader = new CharsetToolkit(file).getReader();
}
diff --git
a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
index f0230bda6a..91a1ee3d02 100644
---
a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
+++
b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/VerifyClass.java
@@ -32,9 +32,10 @@ import org.objectweb.asm.util.TraceMethodVisitor;
import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.List;
/**
@@ -100,7 +101,7 @@ public class VerifyClass extends MatchingTask {
ClassNode ca;
try (InputStream inputStream =
new BufferedInputStream(
- new FileInputStream(clazz))) {
+ Files.newInputStream(Paths.get(clazz)))) {
ClassReader cr = new ClassReader(inputStream);
ca = new ClassNode() {
@Override
diff --git
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
index 052f29ca79..f763fdc728 100644
---
a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
+++
b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/GroovyDocTemplateEngine.java
@@ -27,11 +27,12 @@ import org.codehaus.groovy.groovydoc.GroovyRootDoc;
import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport;
import org.codehaus.groovy.runtime.IOGroovyMethods;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -153,7 +154,7 @@ public class GroovyDocTemplateEngine {
OutputStream outputStream = null;
try {
InputStream inputStream = ((ClasspathResourceManager)
resourceManager).getInputStream(template);
- outputStream = new FileOutputStream(destFileName);
+ outputStream = Files.newOutputStream(Paths.get(destFileName));
IOGroovyMethods.leftShift(outputStream, inputStream);
} catch (IOException e) {
System.err.println("Resource " + template + " skipped due to:
" + e.getMessage());
diff --git
a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
index 8549d81e13..c6258c6dab 100644
---
a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
+++
b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
@@ -21,13 +21,12 @@ package groovy.servlet;
import groovy.text.SimpleTemplateEngine;
import groovy.text.Template;
import groovy.text.TemplateEngine;
-
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -35,6 +34,7 @@ import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
+import java.nio.file.Files;
import java.util.Date;
import java.util.Map;
import java.util.WeakHashMap;
@@ -302,7 +302,7 @@ public class TemplateServlet extends AbstractHttpServlet {
//
if (template == null) {
try {
- template = createAndStoreTemplate(key, new
FileInputStream(file), file);
+ template = createAndStoreTemplate(key,
Files.newInputStream(file.toPath()), file);
} catch (Exception e) {
throw new ServletException("Creation of template failed: " +
e, e);
}
diff --git
a/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
index cd43526b21..4cf7b18346 100644
---
a/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
+++
b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
@@ -23,13 +23,13 @@ import groovy.util.CharsetToolkit;
import org.codehaus.groovy.control.CompilationFailedException;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.net.URL;
import java.nio.charset.Charset;
+import java.nio.file.Files;
/**
* A template engine is a factory for creating a Template instance for a given
text input.
@@ -63,7 +63,7 @@ public abstract class TemplateEngine {
* Creates a template from the File contents using the given charset
encoding.
*/
public Template createTemplate(File file, Charset cs) throws
CompilationFailedException, ClassNotFoundException, IOException {
- try (Reader reader = new InputStreamReader(new FileInputStream(file),
cs)) {
+ try (Reader reader = new
InputStreamReader(Files.newInputStream(file.toPath()), cs)) {
return createTemplate(reader);
}
}
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
index d275abdbc1..2f678c4c01 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
@@ -37,11 +37,11 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -179,7 +179,7 @@ public class XmlParser implements ContentHandler {
* supplied by the application.
*/
public Node parse(File file) throws IOException, SAXException {
- InputSource input = new InputSource(new FileInputStream(file));
+ InputSource input = new
InputSource(Files.newInputStream(file.toPath()));
input.setSystemId("file://" + file.getAbsolutePath());
getXMLReader().parse(input);
return parent;
