DataHandle: remove built-in references to java.nio

The java.nio package is not available on all JVMs, so
its use must be optional on top of the base API layer.

Author: gab1one

src/main/java/org/scijava/io/handle/AbstractDataHandle.java

@@ -31,8 +31,6 @@
 
 package org.scijava.io.handle;
 
-import java.nio.ByteOrder;
-
 import org.scijava.io.location.Location;
 import org.scijava.plugin.AbstractWrapperPlugin;
 

src/main/java/org/scijava/io/handle/DataHandle.java

@@ -38,8 +38,6 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperPlugin;
@@ -56,6 +54,10 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	DataInput, DataOutput, Closeable
 {
 
+	public enum ByteOrder {
+		LITTLE_ENDIAN, BIG_ENDIAN
+	}
+
 	/** Default block size to use when searching through the stream. */
 	int DEFAULT_BLOCK_SIZE = 256 * 1024; // 256 KB
 
@@ -92,8 +94,6 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 * by this method:
 	 * </p>
 	 * <ul>
-	 * <li>{@link #read(ByteBuffer)}</li>
-	 * <li>{@link #read(ByteBuffer, int)}</li>
 	 * <li>{@link #read(byte[])}</li>
 	 * <li>{@link #read(byte[], int, int)}</li>
 	 * <li>{@link #skip(long)}</li>
@@ -191,62 +191,6 @@ default void setLittleEndian(final boolean little) {
 	/** Sets the native encoding of the stream. */
 	void setEncoding(String encoding);
 
-	/**
-	 * Reads up to {@code buf.remaining()} bytes of data from the stream into a
-	 * {@link ByteBuffer}.
-	 */
-	default int read(final ByteBuffer buf) throws IOException {
-		return read(buf, buf.remaining());
-	}
-
-	/**
-	 * Reads up to {@code len} bytes of data from the stream into a
-	 * {@link ByteBuffer}.
-	 * 
-	 * @return the total number of bytes read into the buffer.
-	 */
-	default int read(final ByteBuffer buf, final int len) throws IOException {
-		final int n;
-		if (buf.hasArray()) {
-			// read directly into the array
-			n = read(buf.array(), buf.arrayOffset(), len);
-		}
-		else {
-			// read into a temporary array, then copy
-			final byte[] b = new byte[len];
-			n = read(b);
-			buf.put(b, 0, n);
-		}
-		return n;
-	}
-
-	/**
-	 * Writes {@code buf.remaining()} bytes of data from the given
-	 * {@link ByteBuffer} to the stream.
-	 */
-	default void write(final ByteBuffer buf) throws IOException {
-		write(buf, buf.remaining());
-	}
-
-	/**
-	 * Writes {@code len} bytes of data from the given {@link ByteBuffer} to the
-	 * stream.
-	 */
-	default void write(final ByteBuffer buf, final int len)
-		throws IOException
-	{
-		if (buf.hasArray()) {
-			// write directly from the buffer's array
-			write(buf.array(), buf.arrayOffset(), len);
-		}
-		else {
-			// copy into a temporary array, then write
-			final byte[] b = new byte[len];
-			buf.get(b);
-			write(b);
-		}
-	}
-
 	/** Reads a string of arbitrary length, terminated by a null char. */
 	default String readCString() throws IOException {
 		final String line = findString("\0");

src/test/java/org/scijava/io/handle/DataHandleTest.java

@@ -35,13 +35,12 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.Arrays;
 
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandle.ByteOrder;
 import org.scijava.io.handle.DataHandleService;
 import org.scijava.io.location.Location;
 import org.scijava.util.Bytes;
@@ -113,12 +112,6 @@ protected <L extends Location> void checkReads(final DataHandle<L> handle)
 		handle.seek(1);
 		assertBytesMatch(1, handle.read(buf), buf);
 
-		// test read(ByteBuffer)
-		Arrays.fill(buf, (byte) 0);
-		final ByteBuffer byteBuffer = ByteBuffer.wrap(buf);
-		handle.seek(2);
-		assertBytesMatch(2, handle.read(byteBuffer), byteBuffer.array());
-
 		// test readByte()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length; i++) {