Removed unused allocated bytes from encoded character arrays

- Added ByteBufferEncoder for converting ByteBuffer to byte array

Author: exceptionfactory

src/main/java/com/exceptionfactory/socketbroker/protocol/ByteBufferEncoder.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2021 Socket Broker Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.exceptionfactory.socketbroker.protocol;
+
+import java.nio.ByteBuffer;
+import java.util.Objects;
+
+/**
+ * ByteBuffer Encoder reads populated byte array contents of the provided buffer
+ */
+public class ByteBufferEncoder implements PacketEncoder<ByteBuffer> {
+    /**
+     * Get encoded buffer after rewinding and read byte array based on the buffer limit length
+     *
+     * @param buffer Byte Buffer to be read
+     * @return Bytes read
+     */
+    @Override
+    public byte[] getEncoded(final ByteBuffer buffer) {
+        Objects.requireNonNull(buffer, "Buffer required");
+        buffer.rewind();
+        final int length = buffer.limit();
+        final byte[] encoded = new byte[length];
+        buffer.get(encoded);
+        return encoded;
+    }
+}

src/main/java/com/exceptionfactory/socketbroker/protocol/UnicodeStandardCharacterArrayEncoder.java

@@ -24,6 +24,8 @@
  * Unicode Standard Character Array Encoder converts provided sources to byte arrays using UTF-8 encoding
  */
 public class UnicodeStandardCharacterArrayEncoder implements PacketEncoder<char[]> {
+    private static final PacketEncoder<ByteBuffer> BYTE_BUFFER_ENCODER = new ByteBufferEncoder();
+
     /**
      * Get bytes encoded using UTF-8
      *
@@ -34,6 +36,6 @@ public class UnicodeStandardCharacterArrayEncoder implements PacketEncoder<char[
     public byte[] getEncoded(final char[] characters) {
         final CharBuffer buffer = CharBuffer.wrap(Objects.requireNonNull(characters));
         final ByteBuffer byteBuffer = StandardCharsets.UTF_8.encode(buffer);
-        return byteBuffer.array();
+        return BYTE_BUFFER_ENCODER.getEncoded(byteBuffer);
     }
 }

src/main/java/com/exceptionfactory/socketbroker/protocol/http/authorization/BasicProxyAuthorizationProvider.java

@@ -17,6 +17,7 @@
 
 import com.exceptionfactory.socketbroker.configuration.AuthenticationCredentials;
 import com.exceptionfactory.socketbroker.configuration.UsernamePasswordAuthenticationCredentials;
+import com.exceptionfactory.socketbroker.protocol.ByteBufferEncoder;
 import com.exceptionfactory.socketbroker.protocol.PacketEncoder;
 import com.exceptionfactory.socketbroker.protocol.UnicodeStandardCharacterArrayEncoder;
 import com.exceptionfactory.socketbroker.protocol.UnicodeStandardStringEncoder;
@@ -36,6 +37,8 @@ public class BasicProxyAuthorizationProvider implements ProxyAuthorizationProvid
 
     private static final PacketEncoder<char[]> CHARACTER_ARRAY_ENCODER = new UnicodeStandardCharacterArrayEncoder();
 
+    private static final PacketEncoder<ByteBuffer> BYTE_BUFFER_ENCODER = new ByteBufferEncoder();
+
     private static final byte COLON_SEPARATOR = ':';
 
     private static final char SPACE_SEPARATOR = ' ';
@@ -77,6 +80,7 @@ private String getCredentialsEncoded(final UsernamePasswordAuthenticationCredent
         buffer.put(COLON_SEPARATOR);
         buffer.put(password);
 
-        return ENCODER.encodeToString(buffer.array());
+        final byte[] encodedBuffer = BYTE_BUFFER_ENCODER.getEncoded(buffer);
+        return ENCODER.encodeToString(encodedBuffer);
     }
 }

src/test/java/com/exceptionfactory/socketbroker/protocol/ByteBufferEncoderTest.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2021 Socket Broker Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.exceptionfactory.socketbroker.protocol;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.ByteBuffer;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+public class ByteBufferEncoderTest {
+    private static final byte[] BYTES = new byte[]{1, 2, 3, 4, 5};
+
+    private final ByteBufferEncoder encoder = new ByteBufferEncoder();
+
+    @Test
+    public void testGetEncoded() {
+        final ByteBuffer buffer = ByteBuffer.wrap(BYTES);
+        final byte[] encoded = encoder.getEncoded(buffer);
+        assertArrayEquals(BYTES, encoded);
+    }
+
+    @Test
+    public void testGetEncodedAllocatePutBytes() {
+        final ByteBuffer buffer = ByteBuffer.allocate(BYTES.length);
+        buffer.put(BYTES);
+        final byte[] encoded = encoder.getEncoded(buffer);
+        assertArrayEquals(BYTES, encoded);
+    }
+}

src/test/java/com/exceptionfactory/socketbroker/protocol/UnicodeStandardCharacterArrayEncoderTest.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2021 Socket Broker Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.exceptionfactory.socketbroker.protocol;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+public class UnicodeStandardCharacterArrayEncoderTest {
+    private static final char[] WORD = new char[]{87, 79, 82, 68};
+
+    private static final byte[] WORD_ENCODED = new byte[]{87, 79, 82, 68};
+
+    private static final char[] UNICODE_WORD = new char[]{913, 937};
+
+    private static final byte[] UNICODE_WORD_ENCODED = new byte[]{-50, -111, -50, -87};
+
+    private final UnicodeStandardCharacterArrayEncoder encoder = new UnicodeStandardCharacterArrayEncoder();
+
+    @Test
+    public void testGetEncodedWord() {
+        final byte[] encoded = encoder.getEncoded(WORD);
+        assertArrayEquals(WORD_ENCODED, encoded);
+    }
+
+    @Test
+    public void testGetEncodedUnicodeWord() {
+        final byte[] encoded = encoder.getEncoded(UNICODE_WORD);
+        assertArrayEquals(UNICODE_WORD_ENCODED, encoded);
+    }
+}

src/test/java/com/exceptionfactory/socketbroker/protocol/http/authorization/BasicProxyAuthorizationProviderTest.java

@@ -45,7 +45,7 @@ public class BasicProxyAuthorizationProviderTest {
 
     private static final char[] UNICODE_PASSWORD = Character.toChars(937);
 
-    private static final String UNICODE_CREDENTIALS = "Basic zpHOqTrOqQA=";
+    private static final String UNICODE_CREDENTIALS = "Basic zpHOqTrOqQ==";
 
     @Mock
     private AuthenticationCredentials authenticationCredentials;