Fix positioning and order updates in ByteBufferInput and ByteBufferOutput

- ByteBufferInput
setBuffer did not take the byteOrder from ByteBuffer
setPosition did not set the position in ByteBuffer
skip did not skip bytes in ByteBuffer
setLimit did not set limit in ByteBuffer

- ByteBufferOutput
order did not set order in ByteBuffer
setPosition did not set position in ByteBuffer

Author: stau

src/com/esotericsoftware/kryo/io/ByteBufferInput.java

@@ -15,8 +15,8 @@
  * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
 package com.esotericsoftware.kryo.io;
 
 import com.esotericsoftware.kryo.KryoException;
@@ -109,6 +109,7 @@ public void setBuffer (ByteBuffer buffer) {
 		position = buffer.position();
 		limit = buffer.limit();
 		capacity = buffer.capacity();
+		byteOrder = buffer.order();
 		total = 0;
 		inputStream = null;
 	}
@@ -295,6 +296,22 @@ public int read (byte[] bytes, int offset, int count) throws KryoException {
 		return startingCount - count;
 	}
 
+	public void setPosition (int position) {
+		this.position = position;
+		this.niobuffer.position(position);
+	}
+
+	/** Sets the limit in the buffer. */
+	public void setLimit (int limit) {
+		this.limit = limit;
+		this.niobuffer.limit(limit);
+	}
+
+	public void skip(int count) throws KryoException {
+		super.skip(count);
+		niobuffer.position(this.position());
+	}
+
 	/** Discards the specified number of bytes. */
 	public long skip (long count) throws KryoException {
 		long remaining = count;
@@ -957,4 +974,4 @@ public boolean getVarIntsEnabled () {
 	public void setVarIntsEnabled (boolean varIntsEnabled) {
 		this.varIntsEnabled = varIntsEnabled;
 	}
-}
+}

src/com/esotericsoftware/kryo/io/ByteBufferOutput.java

@@ -15,8 +15,8 @@
  * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
 package com.esotericsoftware.kryo.io;
 
 import com.esotericsoftware.kryo.KryoException;
@@ -134,6 +134,7 @@ public ByteOrder order () {
 
 	public void order (ByteOrder byteOrder) {
 		this.byteOrder = byteOrder;
+		this.niobuffer.order(byteOrder);
 	}
 
 	public OutputStream getOutputStream () {
@@ -186,6 +187,7 @@ public byte[] toBytes () {
 	/** Sets the current position in the buffer. */
 	public void setPosition (int position) {
 		this.position = position;
+		this.niobuffer.position(position);
 	}
 
 	/** Sets the position and total to zero. */
@@ -937,4 +939,4 @@ public boolean getVarIntsEnabled () {
 	public void setVarIntsEnabled (boolean varIntsEnabled) {
 		this.varIntsEnabled = varIntsEnabled;
 	}
-}
+}

test/com/esotericsoftware/kryo/ByteBufferInputOutputTest.java

@@ -0,0 +1,79 @@
+package com.esotericsoftware.kryo;
+
+import com.esotericsoftware.kryo.io.ByteBufferInput;
+import com.esotericsoftware.kryo.io.ByteBufferOutput;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+public class ByteBufferInputOutputTest extends KryoTestCase {
+
+	public void testByteBufferInputPosition() {
+		ByteBuffer byteBuffer = ByteBuffer.allocateDirect(4096);
+		ByteBufferInput inputBuffer = new ByteBufferInput(byteBuffer);
+		assertEquals(0, inputBuffer.position());
+		assertEquals(0, inputBuffer.getByteBuffer().position());
+		inputBuffer.setPosition(5);
+		assertEquals(5, inputBuffer.position());
+		assertEquals(5, inputBuffer.getByteBuffer().position());
+	}
+
+	public void testByteBufferInputLimit() {
+		ByteBuffer byteBuffer = ByteBuffer.allocateDirect(4096);
+		ByteBufferInput inputBuffer = new ByteBufferInput(byteBuffer);
+		assertEquals(4096, inputBuffer.limit());
+		assertEquals(4096, inputBuffer.getByteBuffer().limit());
+		inputBuffer.setLimit(1000);
+		assertEquals(1000, inputBuffer.limit());
+		assertEquals(1000, inputBuffer.getByteBuffer().limit());
+	}
+
+	public void testByteBufferInputSetBufferEndianness() {
+		ByteBufferInput inputBuffer = new ByteBufferInput();
+		assertEquals(ByteOrder.BIG_ENDIAN, inputBuffer.order());
+
+		ByteBuffer byteBuffer = ByteBuffer.allocateDirect(4096);
+		assertEquals(ByteOrder.BIG_ENDIAN, byteBuffer.order());
+		byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+		assertEquals(ByteOrder.LITTLE_ENDIAN, byteBuffer.order());
+
+		inputBuffer.setBuffer(byteBuffer);
+		assertEquals(byteBuffer.order(), inputBuffer.order());
+	}
+
+	public void testByteBufferInputSkip() {
+		ByteBuffer buffer = ByteBuffer.allocateDirect(4096);
+		ByteBufferInput inputBuffer = new ByteBufferInput(buffer);
+		assertEquals(0, inputBuffer.getByteBuffer().position());
+		inputBuffer.skip(5);
+		assertEquals(5, inputBuffer.getByteBuffer().position());
+	}
+
+	public void testByteBufferOutputPosition() {
+		ByteBufferOutput outputBuffer = new ByteBufferOutput(4096);
+		assertEquals(0, outputBuffer.position());
+		assertEquals(0, outputBuffer.getByteBuffer().position());
+		outputBuffer.setPosition(5);
+		assertEquals(5, outputBuffer.position());
+		outputBuffer.writeInt(10);
+
+		ByteBuffer byteBuffer = outputBuffer.getByteBuffer().duplicate();
+		byteBuffer.flip();
+
+		ByteBufferInput inputBuffer = new ByteBufferInput(byteBuffer);
+		inputBuffer.skip(5);
+		assertEquals(5, byteBuffer.position());
+		assertEquals(10, inputBuffer.readInt());
+		assertEquals(9, byteBuffer.position());
+	}
+
+	public void testByteBufferOutputSetOrder() {
+		ByteBufferOutput outputBuffer = new ByteBufferOutput(4096);
+		assertEquals(ByteOrder.BIG_ENDIAN, outputBuffer.order());
+		assertEquals(ByteOrder.BIG_ENDIAN, outputBuffer.getByteBuffer().order());
+
+		outputBuffer.order(ByteOrder.LITTLE_ENDIAN);
+		assertEquals(ByteOrder.LITTLE_ENDIAN, outputBuffer.order());
+		assertEquals(ByteOrder.LITTLE_ENDIAN, outputBuffer.getByteBuffer().order());
+	}
+}