Author: fanningpj
Date: Fri Oct 20 15:54:04 2023
New Revision: 1913145
URL: http://svn.apache.org/viewvc?rev=1913145&view=rev
Log:
[XMLBEANS-642] use java.nio.file.Files APIs
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
xmlbeans/trunk/src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java
Fri Oct 20 15:54:04 2023
@@ -18,6 +18,7 @@ package org.apache.xmlbeans.impl.common;
import java.io.*;
import java.net.URI;
import java.nio.channels.FileChannel;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -28,58 +29,62 @@ public class IOUtil {
public static void copyCompletely(InputStream input, OutputStream output)
throws IOException {
- //if both are file streams, use channel IO
- if ((output instanceof FileOutputStream) && (input instanceof
FileInputStream)) {
- try {
- FileChannel target = ((FileOutputStream) output).getChannel();
- FileChannel source = ((FileInputStream) input).getChannel();
-
- source.transferTo(0, Integer.MAX_VALUE, target);
+ try {
+ //if both are file streams, use channel IO
+ if ((output instanceof FileOutputStream) && (input instanceof
FileInputStream)) {
+ try {
+ FileChannel target = ((FileOutputStream)
output).getChannel();
+ FileChannel source = ((FileInputStream)
input).getChannel();
- source.close();
- target.close();
+ source.transferTo(0, Integer.MAX_VALUE, target);
- return;
- } catch (Exception e) { /* failover to byte stream version */ }
- }
+ source.close();
+ target.close();
- byte[] buf = new byte[8192];
- while (true) {
- int length = input.read(buf);
- if (length < 0) {
- break;
+ return;
+ } catch (Exception e) { /* failover to byte stream version */ }
}
- output.write(buf, 0, length);
- }
- try {
- input.close();
- } catch (IOException ignore) {
- }
- try {
- output.close();
- } catch (IOException ignore) {
+ byte[] buf = new byte[8192];
+ while (true) {
+ int length = input.read(buf);
+ if (length < 0) {
+ break;
+ }
+ output.write(buf, 0, length);
+ }
+ } finally {
+ try {
+ input.close();
+ } catch (IOException ignore) {
+ }
+ try {
+ output.close();
+ } catch (IOException ignore) {
+ }
}
}
public static void copyCompletely(Reader input, Writer output)
throws IOException {
- char[] buf = new char[8192];
- while (true) {
- int length = input.read(buf);
- if (length < 0) {
- break;
- }
- output.write(buf, 0, length);
- }
-
- try {
- input.close();
- } catch (IOException ignore) {
- }
try {
- output.close();
- } catch (IOException ignore) {
+ char[] buf = new char[8192];
+ while (true) {
+ int length = input.read(buf);
+ if (length < 0) {
+ break;
+ }
+ output.write(buf, 0, length);
+ }
+ } finally {
+ try {
+ input.close();
+ } catch (IOException ignore) {
+ }
+ try {
+ output.close();
+ } catch (IOException ignore) {
+ }
}
}
@@ -89,7 +94,7 @@ public class IOUtil {
dir.mkdirs();
try (InputStream in = urlToStream(input);
- OutputStream os = new FileOutputStream(out)) {
+ OutputStream os = Files.newOutputStream(out.toPath())) {
IOUtil.copyCompletely(in, os);
} catch (IllegalArgumentException e) {
throw new IOException("Cannot copy to " + output);
@@ -100,7 +105,7 @@ public class IOUtil {
try {
File f = new File(input);
if (f.exists()) {
- return new FileInputStream(f);
+ return Files.newInputStream(f.toPath());
}
} catch (Exception ignored) {
// notAFile
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
Fri Oct 20 15:54:04 2023
@@ -16,9 +16,10 @@
package org.apache.xmlbeans.impl.common;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
@@ -63,7 +64,7 @@ public class JarHelper {
}
mDestJarName = destJar.getCanonicalPath();
- try (FileOutputStream fout = new FileOutputStream(destJar);
+ try (OutputStream fout = Files.newOutputStream(destJar.toPath());
JarOutputStream jout = new JarOutputStream(fout)) {
//jout.setLevel(0);
jarDir(dirOrFile2Jar, jout, null);
@@ -114,7 +115,7 @@ public class JarHelper {
if (mVerbose) {
System.out.println("adding " + dirOrFile2jar.getPath());
}
- try (FileInputStream fis = new FileInputStream(dirOrFile2jar)) {
+ try (InputStream fis =
Files.newInputStream(dirOrFile2jar.toPath())) {
JarEntry entry = new JarEntry(path + dirOrFile2jar.getName());
entry.setTime(dirOrFile2jar.lastModified());
jos.putNextEntry(entry);
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java
Fri Oct 20 15:54:04 2023
@@ -344,8 +344,8 @@ public class Repackage {
public static void copyFile(File from, File to) throws IOException {
to.getParentFile().mkdirs();
- try (FileInputStream in = new FileInputStream(from);
- FileOutputStream out = new FileOutputStream(to)) {
+ try (InputStream in = Files.newInputStream(from.toPath());
+ OutputStream out = Files.newOutputStream(to.toPath())) {
copy(in, out);
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
Fri Oct 20 15:54:04 2023
@@ -18,9 +18,9 @@ package org.apache.xmlbeans.impl.schema;
import org.apache.xmlbeans.ResourceLoader;
import java.io.InputStream;
-import java.io.FileInputStream;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.zip.ZipFile;
import java.util.zip.ZipEntry;
@@ -52,7 +52,7 @@ public class FileResourceLoader implemen
}
else
{
- return new FileInputStream(new File(_directory, resourceName));
+ return Files.newInputStream(new File(_directory,
resourceName).toPath());
}
}
catch (IOException e)
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
Fri Oct 20 15:54:04 2023
@@ -28,6 +28,7 @@ import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.file.Files;
import java.security.DigestInputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -159,7 +160,7 @@ public abstract class SchemaTypeLoaderBa
options.setDocumentSourceName(fileName);
}
- try (InputStream fis = new FileInputStream(file)) {
+ try (InputStream fis = Files.newInputStream(file.toPath())) {
return parse(fis, type, options);
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java
Fri Oct 20 15:54:04 2023
@@ -32,6 +32,7 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.file.Files;
import java.util.*;
public class StscImporter {
@@ -790,7 +791,8 @@ public class StscImporter {
CharArrayReader car = copy(reader);
XmlEncodingSniffer xes = new XmlEncodingSniffer(car, null);
- try (Writer out = new OutputStreamWriter(new
FileOutputStream(targetFile), xes.getXmlEncoding())) {
+ try (Writer out = new OutputStreamWriter(
+ Files.newOutputStream(targetFile.toPath()),
xes.getXmlEncoding())) {
IOUtil.copyCompletely(car, out);
}
@@ -820,7 +822,7 @@ public class StscImporter {
ByteArrayInputStream bais = copy(bytes);
- try (FileOutputStream out = new FileOutputStream(targetFile)) {
+ try (OutputStream out =
Files.newOutputStream(targetFile.toPath())) {
IOUtil.copyCompletely(bais, out);
}
@@ -856,7 +858,7 @@ public class StscImporter {
}
}
if (in != null) {
- FileOutputStream out = new
FileOutputStream(targetFile);
+ OutputStream out =
Files.newOutputStream(targetFile.toPath());
IOUtil.copyCompletely(in, out);
}
} catch (IOException e) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
Fri Oct 20 15:54:04 2023
@@ -19,6 +19,7 @@ import org.apache.xmlbeans.SystemPropert
import java.io.*;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Properties;
/**
@@ -89,7 +90,7 @@ class FactoryFinder {
File file = new File(propertiesFileName);
if (file.exists()) {
Properties properties = new Properties();
- try (FileInputStream fileInput = new FileInputStream(file)) {
+ try (InputStream fileInput =
Files.newInputStream(file.toPath())) {
properties.load(fileInput);
}
String factoryClassName =
properties.getProperty(factoryPropertyName);
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java Fri
Oct 20 15:54:04 2023
@@ -33,6 +33,7 @@ import org.xml.sax.ext.LexicalHandler;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import java.io.*;
+import java.nio.file.Files;
import java.util.Collection;
import java.util.Map;
import java.util.function.Supplier;
@@ -553,7 +554,7 @@ public final class Cursor implements Xml
throw new IllegalArgumentException("Null file specified");
}
- try (OutputStream os = new FileOutputStream(file)) {
+ try (OutputStream os = Files.newOutputStream(file.toPath())) {
_save(os, options);
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java
Fri Oct 20 15:54:04 2023
@@ -21,10 +21,10 @@ import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.impl.util.ExceptionUtil;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -118,24 +118,21 @@ public class RunXQuery {
try {
if (queryfile != null) {
File queryFile = new File(queryfile);
- FileInputStream is = new FileInputStream(queryFile);
- InputStreamReader r = new InputStreamReader(is,
StandardCharsets.ISO_8859_1);
-
+ InputStream is = Files.newInputStream(queryFile.toPath());
StringBuilder sb = new StringBuilder();
+ try (InputStreamReader r = new InputStreamReader(is,
StandardCharsets.ISO_8859_1)) {
- for (; ; ) {
- int ch = r.read();
+ for (; ; ) {
+ int ch = r.read();
- if (ch < 0) {
- break;
- }
+ if (ch < 0) {
+ break;
+ }
- sb.append((char) ch);
+ sb.append((char) ch);
+ }
}
-
- r.close();
is.close();
-
query = sb.toString();
}
} catch (Throwable e) {
@@ -172,20 +169,17 @@ public class RunXQuery {
try {
if (verbose) {
- InputStream is = new FileInputStream(file);
-
- for (; ; ) {
- int ch = is.read();
+ try(InputStream is = Files.newInputStream(file.toPath())) {
+ for (; ; ) {
+ int ch = is.read();
+
+ if (ch < 0) {
+ break;
+ }
- if (ch < 0) {
- break;
+ System.out.write(ch);
}
-
- System.out.write(ch);
}
-
- is.close();
-
System.out.println();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
Fri Oct 20 15:54:04 2023
@@ -18,12 +18,11 @@ package org.apache.xmlbeans.impl.tool;
import org.apache.xmlbeans.impl.common.IOUtil;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.FileFilter;
import java.io.OutputStream;
+import java.nio.file.Files;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
@@ -238,7 +237,7 @@ public class SchemaResourceManager exten
*/
protected InputStream inputStreamForFile(String filename) throws
IOException
{
- return new FileInputStream(new File(_directory, filename));
+ return Files.newInputStream(new File(_directory, filename).toPath());
}
/**
@@ -252,7 +251,7 @@ public class SchemaResourceManager exten
File parent = targetFile.getParentFile();
if (!parent.exists())
parent.mkdirs();
- OutputStream output = new FileOutputStream(targetFile);
+ OutputStream output = Files.newOutputStream(targetFile.toPath());
IOUtil.copyCompletely(input, output);
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
Fri Oct 20 15:54:04 2023
@@ -24,7 +24,8 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.File;
-import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
import java.util.*;
public class StreamInstanceValidator
@@ -163,25 +164,25 @@ public class StreamInstanceValidator
try {
final XMLInputFactory xmlInputFactory =
StaxHelper.newXMLInputFactory(new XmlOptions(options));
- final FileInputStream fis = new FileInputStream(file);
- final XMLStreamReader rdr =
- xmlInputFactory.createXMLStreamReader(path, fis);
-
- //advance to first start element.
- while(!rdr.isStartElement()) {
- rdr.next();
- }
-
- time = System.currentTimeMillis();
- vsr.init(rdr, true, null, sLoader, options, errors);
+ try(InputStream fis = Files.newInputStream(file.toPath())) {
+ final XMLStreamReader rdr =
+ xmlInputFactory.createXMLStreamReader(path, fis);
+
+ //advance to first start element.
+ while(!rdr.isStartElement()) {
+ rdr.next();
+ }
+
+ time = System.currentTimeMillis();
+ vsr.init(rdr, true, null, sLoader, options, errors);
+
+ while (vsr.hasNext()) {
+ vsr.next();
+ }
- while (vsr.hasNext()) {
- vsr.next();
+ time = (System.currentTimeMillis() - time);
+ vsr.close();
}
-
- time = (System.currentTimeMillis() - time);
- vsr.close();
- fis.close();
}
catch (XMLStreamException xse) {
final Location loc = xse.getLocation();
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java
Fri Oct 20 15:54:04 2023
@@ -25,6 +25,7 @@ import javax.xml.namespace.QName;
import java.io.*;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -66,9 +67,9 @@ public class XsbDumper {
} else if (force || file.getName().endsWith(".xsb")) {
try {
System.out.println(file.toString());
- dump(new FileInputStream(file), " ");
+ dump(Files.newInputStream(file.toPath()), " ");
System.out.println();
- } catch (FileNotFoundException e) {
+ } catch (IOException e) {
System.out.println(e.toString());
}
}
@@ -503,7 +504,7 @@ public class XsbDumper {
}
void readFrom(LongUTFDataInputStream input) {
- if (intsToStrings.size() != 1 || stringsToInts.size() != 0) {
+ if (intsToStrings.size() != 1 || !stringsToInts.isEmpty()) {
throw new IllegalStateException();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java
Fri Oct 20 15:54:04 2023
@@ -78,7 +78,7 @@ public class FilerImpl implements Filer
File source = new File(classdir, typename);
source.getParentFile().mkdirs();
- return new FileOutputStream(source);
+ return Files.newOutputStream(source.toPath());
}
/**
@@ -132,7 +132,7 @@ public class FilerImpl implements Filer
return Files.newBufferedWriter(f.toPath(),
StandardCharsets.ISO_8859_1);
}
- FileOutputStream fileStream = new FileOutputStream(f);
+ OutputStream fileStream = Files.newOutputStream(f.toPath());
CharsetEncoder ce = CHARSET.newEncoder();
ce.onUnmappableCharacter(CodingErrorAction.REPORT);
return new OutputStreamWriter(fileStream, ce);
Modified:
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
(original)
+++
xmlbeans/trunk/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
Fri Oct 20 15:54:04 2023
@@ -25,8 +25,10 @@ import javax.xml.namespace.QName;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
@@ -68,7 +70,7 @@ public class ModelGroupTests {
}
private XmlObject[] getSchema(File objFile, String schemaString) throws
IOException, XmlException {
- FileOutputStream fos = new FileOutputStream(objFile);
+ OutputStream fos = Files.newOutputStream(objFile.toPath());
OutputStreamWriter osw = new OutputStreamWriter(fos,
StandardCharsets.UTF_8);
if (!schemaString.startsWith("<?xml")) {
osw.write(getSchemaTop("baz"));
Modified: xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java
(original)
+++ xmlbeans/trunk/src/test/java/org/apache/xmlbeans/impl/tool/Diff.java Fri
Oct 20 15:54:04 2023
@@ -21,6 +21,7 @@ import org.apache.xmlbeans.impl.schema.S
import java.io.*;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -251,8 +252,8 @@ public class Diff {
public static void filesAsXsb(File file1, File file2, List<XmlError>
diffs) {
assert file1.exists() : "File \"" + file1.getAbsolutePath() + "\" does
not exist.";
assert file2.exists() : "File \"" + file2.getAbsolutePath() + "\" does
not exist.";
- try (FileInputStream stream1 = new FileInputStream(file1);
- FileInputStream stream2 = new FileInputStream(file2)) {
+ try (InputStream stream1 = Files.newInputStream(file1.toPath());
+ InputStream stream2 = Files.newInputStream(file2.toPath())) {
streamsAsXsb(stream1, file1.getName(), stream2, file2.getName(),
diffs);
} catch (IOException ignored) {
}
Modified:
xmlbeans/trunk/src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java?rev=1913145&r1=1913144&r2=1913145&view=diff
==============================================================================
---
xmlbeans/trunk/src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java
(original)
+++
xmlbeans/trunk/src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java
Fri Oct 20 15:54:04 2023
@@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test;
import tools.util.JarUtil;
import java.io.*;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
@@ -71,7 +72,7 @@ public class XmlObjectAbstractClassTest
to.delete();
to.createNewFile();
// outputstream to write out the java file
- FileOutputStream fos = new FileOutputStream(to);
+ OutputStream fos = Files.newOutputStream(to.toPath());
int b;
while ((b = in.read()) != -1) {
@@ -93,7 +94,7 @@ public class XmlObjectAbstractClassTest
to.delete();
to.createNewFile();
// outputstream to write out the java file
- FileOutputStream fos = new FileOutputStream(to);
+ OutputStream fos = Files.newOutputStream(to.toPath());
int b;
while ((b = fis.read()) != -1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
