Merge remote-tracking branch 'origin/master'

Author: patrickfav

src/main/java/at/favre/lib/bytes/Bytes.java

@@ -1324,7 +1324,7 @@ public int unsignedByteAt(int index) {
      */
     public char charAt(int index) {
         Util.checkIndexBounds(length(), index, 2, "char");
-        return ((ByteBuffer) ByteBuffer.wrap(internalArray()).order(byteOrder).position(index)).getChar();
+        return ((ByteBuffer) internalBuffer().position(index)).getChar();
     }
 
     /**
@@ -1337,7 +1337,7 @@ public char charAt(int index) {
      */
     public short shortAt(int index) {
         Util.checkIndexBounds(length(), index, 2, "short");
-        return ((ByteBuffer) ByteBuffer.wrap(internalArray()).order(byteOrder).position(index)).getShort();
+        return ((ByteBuffer) internalBuffer().position(index)).getShort();
     }
 
     /**
@@ -1350,7 +1350,7 @@ public short shortAt(int index) {
      */
     public int intAt(int index) {
         Util.checkIndexBounds(length(), index, 4, "int");
-        return ((ByteBuffer) ByteBuffer.wrap(internalArray()).order(byteOrder).position(index)).getInt();
+        return ((ByteBuffer) internalBuffer().position(index)).getInt();
     }
 
     /**
@@ -1363,7 +1363,7 @@ public int intAt(int index) {
      */
     public long longAt(int index) {
         Util.checkIndexBounds(length(), index, 8, "long");
-        return ((ByteBuffer) ByteBuffer.wrap(internalArray()).order(byteOrder).position(index)).getLong();
+        return ((ByteBuffer) internalBuffer().position(index)).getLong();
     }
 
     /**
@@ -1939,7 +1939,7 @@ public char[] toCharArray() {
      * @return char array
      */
     public char[] toCharArray(Charset charset) {
-        return Util.byteToCharArray(internalArray(), charset);
+        return Util.byteToCharArray(internalArray(), charset, byteOrder);
     }
 
     /**
@@ -2021,7 +2021,7 @@ public boolean equals(Byte[] anotherArray) {
      * @return true if both array have same length and every byte element is the same
      */
     public boolean equals(ByteBuffer buffer) {
-        return buffer != null && byteOrder == buffer.order() && ByteBuffer.wrap(internalArray()).order(byteOrder).equals(buffer);
+        return buffer != null && byteOrder == buffer.order() && internalBuffer().equals(buffer);
     }
 
     /**

src/main/java/at/favre/lib/bytes/Util.java

@@ -436,16 +436,17 @@ static byte[] charToByteArray(char[] charArray, Charset charset, int offset, int
     /**
      * Convert given byte array in given encoding to char array
      *
-     * @param bytes   as data source
-     * @param charset of the byte array
+     * @param bytes     as data source
+     * @param charset   of the byte array
+     * @param byteOrder the order of the bytes array
      * @return char array
      */
-    static char[] byteToCharArray(byte[] bytes, Charset charset) {
+    static char[] byteToCharArray(byte[] bytes, Charset charset, ByteOrder byteOrder) {
         Objects.requireNonNull(bytes, "bytes must not be null");
         Objects.requireNonNull(charset, "charset must not be null");
 
         try {
-            CharBuffer charBuffer = charset.newDecoder().decode(ByteBuffer.wrap(bytes));
+            CharBuffer charBuffer = charset.newDecoder().decode(ByteBuffer.wrap(bytes).order(byteOrder));
             if (charBuffer.capacity() != charBuffer.limit()) {
                 char[] compacted = new char[charBuffer.remaining()];
                 charBuffer.get(compacted);

src/test/java/at/favre/lib/bytes/BytesMiscTest.java

@@ -62,6 +62,7 @@ public void testHashcode() {
         assertNotEquals(0, Bytes.wrap(example2_bytes_seven).hashCode());
     }
 
+    @SuppressWarnings("SimplifiableJUnitAssertion")
     @Test
     public void testEquals() {
         assertTrue(Bytes.wrap(new byte[0]).equals(Bytes.wrap(new byte[0])));
@@ -150,6 +151,7 @@ public void testIsEmpty() {
         assertFalse(Bytes.from(example_bytes_seven).isEmpty());
     }
 
+    @SuppressWarnings("SimplifiableJUnitAssertion")
     @Test
     public void containsTest() {
         assertEquals(false, Bytes.allocate(0).contains((byte) 0xFD));
@@ -372,6 +374,15 @@ public void intAt() {
         }
     }
 
+    @Test
+    public void intAtLittleEndian() {
+        assertEquals(16777216, Bytes.wrap(new byte[]{0, 0, 0, 1}, ByteOrder.LITTLE_ENDIAN).intAt(0));
+        assertEquals(1, Bytes.wrap(new byte[]{0, 0, 0, 1}, ByteOrder.BIG_ENDIAN).intAt(0));
+        assertEquals(134217728, Bytes.wrap(new byte[]{0, 0, 0, 0b00001000}, ByteOrder.LITTLE_ENDIAN).intAt(0));
+        assertEquals(524288, Bytes.wrap(new byte[]{0, 0, 0b00001000, 0}, ByteOrder.LITTLE_ENDIAN).intAt(0));
+        assertEquals(8388608, Bytes.wrap(new byte[]{0, 0, (byte) 0b10000000, 0}, ByteOrder.LITTLE_ENDIAN).intAt(0));
+    }
+
     @Test
     public void longAt() {
         assertEquals(0, Bytes.allocate(8).longAt(0));
@@ -395,6 +406,16 @@ public void longAt() {
         }
     }
 
+    @Test
+    public void longAtLittleEndian() {
+        assertEquals(72057594037927936L, Bytes.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0, 1}, ByteOrder.LITTLE_ENDIAN).longAt(0));
+        assertEquals(1, Bytes.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0, 1}, ByteOrder.BIG_ENDIAN).longAt(0));
+        assertEquals(576460752303423488L, Bytes.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0, 0b00001000}, ByteOrder.LITTLE_ENDIAN).longAt(0));
+        assertEquals(2251799813685248L, Bytes.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0b00001000, 0}, ByteOrder.LITTLE_ENDIAN).longAt(0));
+        assertEquals(36028797018963968L, Bytes.wrap(new byte[]{0, 0, 0, 0, 0, 0, (byte) 0b10000000, 0}, ByteOrder.LITTLE_ENDIAN).longAt(0));
+        assertEquals(549755813888L, Bytes.wrap(new byte[]{0, 0, 0, 0, (byte) 0b10000000, 0, 0, 0}, ByteOrder.LITTLE_ENDIAN).longAt(0));
+    }
+
     @Test
     public void primitiveAtLittleEndian() {
         assertEquals(576460752303423488L, Bytes.wrap(new byte[]{0, 0, 0, 0, 0, 0, 0, 0b00001000}).byteOrder(ByteOrder.LITTLE_ENDIAN).longAt(0)); //2^59