Standardising to fileWriteInputStream (it was confused with outputStream)

Author: PicoCreator

src/main/java/picoded/dstack/FileWorkspace.java

@@ -12,6 +12,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * Represent a file storage backend for a workspace
  * 
@@ -141,15 +143,15 @@ default void writeString(final String filepath, String content, String encoding)
 	 * You are expected to close, the stream on your own, to avoid memory leaks
 	 * 
 	 * @param filePath in the workspace to extract
-	 * @return the file contents, null if file does not exists
+	 * @return the file contents as an input stream, null if file does not exists
 	 */
 	default InputStream readInputStream(final String filePath) {
 		byte[] byteArr = readByteArray(filePath);
 		return new ByteArrayInputStream(byteArr);
 	}
 
 	/**
-	 * Writes an output stream to a file creating the file if it does not exist.
+	 * Reads an input stream, and writes it to a fil, creating the file if it does not exist.
 	 * the parent directories of the file will be created if they do not exist.
 	 *
 	 * Note that depending on the implementaiton, this may not be optimized,
@@ -158,22 +160,14 @@ default InputStream readInputStream(final String filePath) {
 	 * @param filepath in the workspace to extract
 	 * @param data the content to write to the file
 	 **/
-	default void writeOutputStream(final String filepath, final OutputStream data) {
-		
+	default void writeInputStream(final String filepath, final InputStream data) {
 		// Converts it to bytearray respectively
 		byte[] rawBytes = null;
 		try {
-			if (data instanceof ByteArrayOutputStream) {
-				rawBytes = ((ByteArrayOutputStream) data).toByteArray();
-			} else {
-				ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-				buffer.writeTo(data);
-				rawBytes = buffer.toByteArray();
-			}
+			rawBytes = IOUtils.toByteArray(data);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
-		
 		// Does the bytearray writes
 		writeByteArray(filepath, rawBytes);
 	}

src/main/java/picoded/dstack/core/Core_FileWorkspace.java

@@ -184,8 +184,8 @@ public InputStream readInputStream(final String filepath) {
 	 * @param filepath in the workspace to extract
 	 * @param data the content to write to the file
 	 **/
-	public void writeOutputStream(final String filepath, final OutputStream data) {
-		main.backend_fileWriteOutputStream(_oid, normalizeFilePathString(filepath), data);
+	public void writeInputStream(final String filepath, final InputStream data) {
+		main.backend_fileWriteInputStream(_oid, normalizeFilePathString(filepath), data);
 	}
 
 	// Read / write byteArray information

src/main/java/picoded/dstack/core/Core_FileWorkspaceMap.java

@@ -7,6 +7,9 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
+import org.apache.commons.io.IOUtils;
+
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.ByteArrayInputStream;
@@ -201,8 +204,8 @@ public InputStream backend_fileReadInputStream(final String oid, final String fi
 	 * @param   filepath to use for the workspace
 	 * @param   data to write the file with
 	 **/
-	public void backend_fileWriteOutputStream(final String oid, final String filepath,
-		final OutputStream data) {
+	public void backend_fileWriteInputStream(final String oid, final String filepath,
+		final InputStream data) {
 
 		// forward the null, and let the error handling below settle it
 		if (data == null) {
@@ -212,13 +215,7 @@ public void backend_fileWriteOutputStream(final String oid, final String filepat
 		// Converts it to bytearray respectively
 		byte[] rawBytes = null;
 		try {
-			if (data instanceof ByteArrayOutputStream) {
-				rawBytes = ((ByteArrayOutputStream) data).toByteArray();
-			} else {
-				ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-				buffer.writeTo(data);
-				rawBytes = buffer.toByteArray();
-			}
+			rawBytes = IOUtils.toByteArray(data);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}

src/main/java/picoded/dstack/stack/Stack_FileWorkspaceMap.java

@@ -11,6 +11,8 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * Stacked implementation of KeyValueMap data structure.
  *
@@ -218,13 +220,13 @@ public InputStream backend_fileReadInputStream(final String oid, final String fi
 	 * @param   data to write the file with
 	 **/
 	@Override
-	public void backend_fileWriteOutputStream(final String oid, final String filepath,
-		final OutputStream data) {
+	public void backend_fileWriteInputStream(final String oid, final String filepath,
+		final InputStream data) {
 
 		// Due to the behaviour of how the file data needs to be handled across multiple layers
 		// we only use an optimized "readStream" call if the filesystem is a single stack layer
 		if (dataLayers.length == 1) {
-			dataLayers[0].backend_fileWriteOutputStream(oid, filepath, data);
+			dataLayers[0].backend_fileWriteInputStream(oid, filepath, data);
 			return;
 		}
 
@@ -239,13 +241,7 @@ public void backend_fileWriteOutputStream(final String oid, final String filepat
 		// Converts it to bytearray respectively
 		byte[] rawBytes = null;
 		try {
-			if (data instanceof ByteArrayOutputStream) {
-				rawBytes = ((ByteArrayOutputStream) data).toByteArray();
-			} else {
-				ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-				buffer.writeTo(data);
-				rawBytes = buffer.toByteArray();
-			}
+			rawBytes = IOUtils.toByteArray(data);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}

src/test/java/picoded/dstack/struct/simple/StructSimple_FileWorkspaceMap_test.java

@@ -7,6 +7,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.Arrays;
@@ -335,11 +336,10 @@ public void readNonExistenceFile() {
 	@Test
 	public void writeAndReadToFile_stream() throws Exception {
 		// Output stream to use for content
-		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-		buffer.write("data to write".getBytes());
+		ByteArrayInputStream buffer = new ByteArrayInputStream("data to write".getBytes());
 
 		FileWorkspace fileWorkspace = testObj.newEntry();
-		fileWorkspace.writeOutputStream("testPath", buffer);
+		fileWorkspace.writeInputStream("testPath", buffer);
 		assertNotNull(testObj.get(fileWorkspace._oid()).readByteArray("testPath"));
 
 		InputStream readData = testObj.get(fileWorkspace._oid()).readInputStream("testPath");