Use Path instead of File

Author: kitskub

…va/com/flowpowered/commons/FileUtil.java …va/com/flowpowered/commons/PathUtil.javasrc/main/java/com/flowpowered/commons/FileUtil.java renamed to src/main/java/com/flowpowered/commons/PathUtil.java src/main/java/com/flowpowered/commons/FileUtil.java renamed to src/main/java/com/flowpowered/commons/PathUtil.java

@@ -25,48 +25,34 @@
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.channels.FileChannel;
-import java.util.ArrayList;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 
-public class FileUtil {
+public class PathUtil {
     private static final HashMap<String, String> fileNameCache = new HashMap<>();
 
     /**
-     * Computes a long CRC of a File
+     * Computes a long CRC of a Path
      *
      * @param file the file to process
-     * @param a buffer for temporary data
+     * @param buffer a buffer for temporary data
      * @return the CRC or 0 on failure
      */
-    public static long getCRC(File file, byte[] buffer) {
-
-        FileInputStream in = null;
-
-        try {
-            in = new FileInputStream(file);
+    public static long getCRC(Path file, byte[] buffer) {
+        try (InputStream in = Files.newInputStream(file)) {
             return getCRC(in, buffer);
         } catch (FileNotFoundException e) {
             return 0;
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                }
-            }
+        } catch (IOException ex) {
+            return 0;
         }
     }
 
@@ -150,147 +136,48 @@ public static String getFileName(String url) {
     }
 
     /**
-     * Writes a Collection of Strings to a File, overwriting any previous file contents.
+     * Writes a Collection of Strings to a Path, overwriting any previous file contents.
      *
-     * Each String is converted into a line in the File.
+     * Each String is converted into a line in the Path.
      *
      * @param strings the Collection of Strings
-     * @param file the file to write
+     * @param path the file to write
      * @return true on success
      */
-    public static boolean stringToFile(Collection<String> strings, File file) {
-        BufferedWriter bw;
-
-        try {
-            bw = new BufferedWriter(new FileWriter(file));
-        } catch (FileNotFoundException fnfe) {
-            return false;
-        } catch (IOException ioe) {
-            return false;
-        }
+    public static boolean stringToFile(Collection<String> strings, Path path) {
 
-        try {
+        try (BufferedWriter bw = Files.newBufferedWriter(path)) {
             for (String line : strings) {
                 bw.write(line);
                 bw.newLine();
             }
             return true;
         } catch (IOException ioe) {
             return false;
-        } finally {
-            try {
-                bw.close();
-            } catch (IOException ioe2) {
-            }
         }
     }
 
     /**
-     * Reads a File and places the contents into a collection of Strings.
+     * Reads a Path and places the contents into a collection of Strings.
      *
-     * Each line in the File is converted into a String.
+     * Each line in the Path is converted into a String.
      *
      * Iterators on the List will iterate through the Strings in the order the lines appear in the file
      *
      * @param the file to read
      * @return the Collection of Strings or null on failure
      */
-    public static Collection<String> fileToString(File file) {
-
-        BufferedReader br;
-
-        try {
-            br = new BufferedReader(new FileReader(file));
-        } catch (FileNotFoundException fnfe) {
-            return null;
-        }
-
+    public static Collection<String> fileToString(Path path) {
         String line;
 
-        try {
+        try (BufferedReader br = Files.newBufferedReader(path)) {
             Collection<String> strings = new LinkedList<>();
             while ((line = br.readLine()) != null) {
                 strings.add(line);
             }
             return strings;
         } catch (IOException | NumberFormatException ioe) {
             return null;
-        } finally {
-            try {
-                br.close();
-            } catch (IOException ioe) {
-            }
         }
     }
-
-    private static final Collection<String> emptyCollection = new ArrayList<>();
-
-    /**
-     * Creates a blank file
-     *
-     * @param the file to create
-     * @return true on success
-     */
-    public static boolean createFile(File file) {
-        if (file == null) {
-            return false;
-        }
-        File dir = file.getParentFile();
-        if (dir != null) {
-            if (!dir.exists()) {
-                if (!dir.mkdirs()) {
-                    return false;
-                }
-            } else {
-                if (!dir.isDirectory()) {
-                    return false;
-                }
-            }
-        }
-        return FileUtil.stringToFile(emptyCollection, file);
-    }
-
-    /**
-     * Copies one file to another location
-     *
-     * @param inFile the source filename
-     * @param outFile the target filename
-     * @return true on success
-     */
-    @SuppressWarnings ("resource")
-    public static boolean copy(File inFile, File outFile) {
-        if (!inFile.exists()) {
-            return false;
-        }
-
-        FileChannel in = null;
-        FileChannel out = null;
-
-        try {
-            in = new FileInputStream(inFile).getChannel();
-            out = new FileOutputStream(outFile).getChannel();
-
-            long pos = 0;
-            long size = in.size();
-
-            while (pos < size) {
-                pos += in.transferTo(pos, 10 * 1024 * 1024, out);
-            }
-        } catch (IOException ioe) {
-            return false;
-        } finally {
-            try {
-                if (in != null) {
-                    in.close();
-                }
-                if (out != null) {
-                    out.close();
-                }
-            } catch (IOException ioe) {
-                return false;
-            }
-        }
-
-        return true;
-    }
 }

src/main/java/com/flowpowered/commons/StringUtil.java

@@ -23,7 +23,6 @@
  */
 package com.flowpowered.commons;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -101,26 +100,6 @@ public static <T extends Named> Collection<T> matchName(Collection<T> values, St
         return result;
     }
 
-    /**
-     * Matches a file name using a name
-     *
-     * @param values to look into
-     * @param name to match against
-     * @return a collection of values that matched
-     */
-    public static Collection<File> matchFile(Collection<File> values, String name) {
-        List<File> result = new ArrayList<>();
-        for (File value : values) {
-            if (value == null) {
-                continue;
-            }
-            if (startsWithIgnoreCase(value.getName(), name)) {
-                result.add(value);
-            }
-        }
-        return result;
-    }
-
     /**
      * Gets the named object with the shortest name from the values specified
      *

src/main/java/com/flowpowered/commons/store/BinaryFileStore.java

@@ -28,35 +28,34 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
 /**
  * This implements a SimpleStore that is stored in memory. The save and load methods can be used to write the map to a binary file.
  */
 public class BinaryFileStore extends MemoryStore<Integer> {
-    private File file;
+    private Path path;
     private boolean dirty = true;
 
-    public BinaryFileStore(File file) {
+    public BinaryFileStore(Path path) {
         super();
-        this.file = file;
+        this.path = path;
     }
 
     public BinaryFileStore() {
         this(null);
     }
 
-    public synchronized void setFile(File file) {
-        this.file = file;
+    public synchronized void setPath(Path path) {
+        this.path = path;
     }
 
-    public synchronized File getFile() {
-        return file;
+    public synchronized Path getPath() {
+        return path;
     }
 
     @Override
@@ -74,7 +73,7 @@ public synchronized boolean save() {
         boolean saved = true;
         DataOutputStream out = null;
         try {
-            out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
+            out = new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(path)));
             Iterator<Entry<String, Integer>> itr = super.getEntrySet().iterator();
 
             while (itr.hasNext()) {
@@ -106,7 +105,7 @@ public synchronized boolean load() {
         boolean loaded = true;
         DataInputStream in = null;
         try {
-            in = new DataInputStream(new BufferedInputStream(new FileInputStream(file)));
+            in = new DataInputStream(new BufferedInputStream(Files.newInputStream(path)));
 
             boolean eof = false;
             while (!eof) {

src/main/java/com/flowpowered/commons/store/FlatFileStore.java

@@ -23,29 +23,34 @@
  */
 package com.flowpowered.commons.store;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import com.flowpowered.commons.FileUtil;
+import com.flowpowered.commons.PathUtil;
 
 /**
  * This implements a SimpleStore that is stored in memory. The save and load methods can be used to write the map to a File.
  */
 public class FlatFileStore<T> extends MemoryStore<T> {
-    private final File file;
+    private final Path path;
     private boolean dirty = false;
     private final Class<?> clazz; // preserve class, so parser knows what to do
 
-    public FlatFileStore(File file, Class<?> clazz) {
+    public FlatFileStore(Path path, Class<?> clazz) {
         super();
         this.clazz = clazz;
-        this.file = file;
-        if (file != null) {
-            if (!file.exists()) {
-                if (!FileUtil.createFile(file)) {
+        this.path = path;
+        if (path != null) {
+            if (!Files.exists(path)) {
+                try {
+                    Files.createFile(path);
+                } catch (IOException ex) {
+                    ex.printStackTrace();
                 }
             }
         }
@@ -64,7 +69,7 @@ public synchronized boolean save() {
         }
 
         Collection<String> strings = getStrings();
-        boolean saved = FileUtil.stringToFile(strings, file);
+        boolean saved = PathUtil.stringToFile(strings, path);
         if (saved) {
             dirty = false;
         }
@@ -74,7 +79,7 @@ public synchronized boolean save() {
 
     @Override
     public synchronized boolean load() {
-        Collection<String> strings = FileUtil.fileToString(file);
+        Collection<String> strings = PathUtil.fileToString(path);
         if (strings == null) {
             return false;
         }