File / IO utility tweaks

Author: mikera

convex-core/src/main/java/convex/core/util/ConfigUtils.java

@@ -24,7 +24,7 @@ public static ACell readConfig(URI uri) throws IOException {
 
 
 	public static ACell readConfig(InputStream resource) throws IOException {
-		String config=FileUtils.loadFileAsString(resource);
+		String config=Utils.readString(resource);
 		ACell result=JSONUtils.parseJSON5(config);
 		return result;
 	}

convex-core/src/main/java/convex/core/util/FileUtils.java

@@ -3,11 +3,9 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import convex.core.data.ACell;
 import convex.core.data.Blob;
@@ -20,7 +18,7 @@
 public class FileUtils {
 
 	/**
-	 * Loads a file as a String. Handles `-` for STDIN
+	 * Loads a UTF-8 file as a String. Handles `-` for STDIN, and leading `~` for user home directory
 	 * @param fileName File to load
 	 * @return String contents of file
 	 * @throws IOException in case of IO failure
@@ -32,32 +30,15 @@ public static String loadFileAsString(String fileName) throws IOException {
 			byte[] bs = System.in.readAllBytes();
 			result = new String(bs);
 		} else {
-			Path path = Paths.get(fileName);
-			if (!path.toFile().exists()) {
+			Path path = getPath(fileName);
+			if (!Files.exists(path)) {
 				throw new FileNotFoundException("File does not exist: " + path);
 			}
 			result = Files.readString(path, StandardCharsets.UTF_8);
 		}
 		return result;
 	}
 
-	/**
-	 * Loads a String from an input stream assumed to be UTF-8
-	 * @param inputStream Stream to load
-	 * @return String contents of stream
-	 * @throws IOException in case of IO failure
-	 */
-	public static String loadFileAsString(InputStream inputStream) throws IOException  {
-		 int bufferSize = 1024;
-		 char[] buffer = new char[bufferSize];
-		 StringBuilder out = new StringBuilder();
-		 java.io.Reader rdr = new java.io.InputStreamReader(inputStream, StandardCharsets.UTF_8);
-		 for (int numRead; (numRead = rdr.read(buffer, 0, buffer.length)) > 0; ) {
-		     out.append(buffer, 0, numRead);
-		 }
-		 return out.toString();
-	}
-	
 	public static Blob loadFileAsBlob(Path file) throws IOException {
 		return Blob.wrap(Files.readAllBytes(file));
 	}
@@ -104,10 +85,10 @@ public static File ensureFilePath(File file) throws IOException {
 	}
 
 	/**
-	 * Create a path if necessary to a File object. Interprets leading "~" as user home directory.
+	 * Create a path of directories as necessary to hold a file object. Interprets leading "~" as user home directory.
 	 *
-	 * @param file File object to see if the path part of the filename exists, if not then create it.
-	 * @return target File, as an absolute path, with parent directories created recursively if needed
+	 * @param file File object to see if the directory of the filename exists, if not then create it.
+	 * @return An absolute Path to the file, with parent directories created recursively as needed
 	 * @throws IOException In case of IO Error
 	 */
 	public static Path ensureFilePath(Path file) throws IOException {
@@ -134,20 +115,19 @@ public static File getFile(String path) {
 
 	/**
 	 * Gets the absolute Pile for a given file name. Interprets leading "~" as user home directory.
-	 * @param path Path as a string
+	 * @param pathName Path as a string
 	 * @return Path instance representing the given absolute path
 	 */
-	public static Path getPath(String path) {
-		if (path.startsWith("~")) {
-			path=System.getProperty("user.home")+path.substring(1);
-			return Path.of(path);
+	public static Path getPath(String pathName) {
+		if (pathName.startsWith("~")) {
+			pathName=System.getProperty("user.home")+pathName.substring(1);
 		} else {
 			// ensure an absolute path
-			if (!path.startsWith("/")) {
-				path="/"+path;
+			if (!pathName.startsWith(File.separator)) {
+				pathName=File.separator+pathName;
 			}
-			return Path.of(path);
 		}
+		return new File(pathName).toPath();
 	}
 
 

convex-core/src/main/java/convex/core/util/Utils.java

@@ -741,19 +741,11 @@ public static InputStream getResourceAsStream(String path) throws IOException {
 	 *
 	 * @param inputStream Stream of data to read as UTF-8 string
 	 * @return String content of stream, or null on failure
+	 * @throws IOException 
 	 */
-	public static String readString(InputStream inputStream) {
-		try {
-			ByteArrayOutputStream result = new ByteArrayOutputStream();
-			byte[] buffer = new byte[1024];
-			for (int length; (length = inputStream.read(buffer)) != -1; ) {
-				result.write(buffer, 0, length);
-			}
-			// StandardCharsets.UTF_8.name() > JDK 7
-			return result.toString("UTF-8");
-		} catch (IOException t) {
-			return null;
-		}
+	public static String readString(InputStream inputStream) throws IOException {
+		byte[] bytes = inputStream.readAllBytes();
+	    return new String(bytes, StandardCharsets.UTF_8);
 	}
 
 	/**
@@ -850,10 +842,12 @@ public static void setBits(byte[] bs, int numBits, int shift, int bits) {
 	 * @return Blob containing bytes read from buffer
 	 */
 	public static AArrayBlob readBufferData(ByteBuffer bb) {
+		int savedPos=bb.position();
 		bb.position(0);
 		int len = bb.remaining();
 		byte[] bytes = new byte[len];
 		bb.get(bytes);
+		bb.position(savedPos);
 		return Blob.wrap(bytes);
 	}
 

convex-core/src/test/java/convex/core/util/FileUtilsTest.java

@@ -67,11 +67,8 @@ public void cleanup() throws IOException {
 			} finally {
 				Files.delete(TEXT);
 			}
-
-			
-			
 		} finally {
-			Files.delete(DIR);
+			Files.deleteIfExists(DIR);
 		}
 	}
 }