Update after feedback

Author: dizzzz

exist-ant/src/main/java/org/exist/ant/XMLDBExtractTask.java

@@ -36,6 +36,8 @@
 
 import java.io.*;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Properties;
 
 import javax.xml.transform.OutputKeys;
@@ -260,14 +262,14 @@ private void writeXMLResource(final XMLResource res, final File dest) throws IOE
         }
     }
 
-    private Writer getWriter(XMLResource res, File dest) throws XMLDBException, FileNotFoundException {
+    private Writer getWriter(XMLResource res, File dest) throws XMLDBException, IOException {
         final Writer writer;
         if (dest.isDirectory()) {
-            String fname = res.getId();
-            final File file = new File(dest, fname);
-            writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
+            final Path file = dest.toPath().resolve(res.getId());
+            writer = Files.newBufferedWriter(file, UTF_8);
+
         } else {
-            writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8);
+            writer = Files.newBufferedWriter(destFile.toPath(), UTF_8);
         }
         return writer;
     }

exist-ant/src/main/java/org/exist/ant/XMLDBXPathTask.java

@@ -38,6 +38,8 @@
 
 import java.io.*;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Properties;
 
 import javax.xml.transform.OutputKeys;
@@ -193,22 +195,24 @@ private void writeResource(final XMLResource resource, final File dest) throws I
         }
     }
 
-    private Writer getWriter(XMLResource resource, File dest) throws XMLDBException, FileNotFoundException {
+    private Writer getWriter(XMLResource resource, File dest) throws XMLDBException, IOException {
         final Writer writer;
         if (dest.isDirectory()) {
 
             if (!dest.exists()) {
                 dest.mkdirs();
             }
-            String fname = resource.getId();
 
+            String fname = resource.getId();
             if (!fname.endsWith(".xml")) {
                 fname += ".xml";
             }
-            final File file = new File(dest, fname);
-            writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
+
+            final Path file = dest.toPath().resolve(fname);
+            writer = Files.newBufferedWriter(file, UTF_8);
+
         } else {
-            writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8 );
+            writer = Files.newBufferedWriter(dest.toPath(), UTF_8);
         }
         return writer;
     }

exist-ant/src/main/java/org/exist/ant/XMLDBXQueryTask.java

@@ -47,6 +47,8 @@
 
 import java.net.URL;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -205,7 +207,7 @@ private void writeResource(final XMLResource resource, final File dest) throws I
         }
     }
 
-    private Writer getWriter(XMLResource resource, File dest) throws XMLDBException, FileNotFoundException {
+    private Writer getWriter(XMLResource resource, File dest) throws XMLDBException, IOException {
         final Writer writer;
         if (dest.isDirectory()) {
 
@@ -214,16 +216,15 @@ private Writer getWriter(XMLResource resource, File dest) throws XMLDBException,
             }
 
             String fname = resource.getId();
-
             if (!fname.endsWith(".xml")) {
                 fname += ".xml";
             }
 
-            final File file = new File(dest, fname);
-            writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
+            final Path file = dest.toPath().resolve(fname);
+            writer = Files.newBufferedWriter(file, UTF_8);
 
         } else {
-            writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8);
+            writer = Files.newBufferedWriter(dest.toPath(), UTF_8);
         }
         return writer;
     }