Fix after review

Author: Zhen

driver/src/main/java/org/neo4j/driver/internal/net/SocketClient.java

@@ -143,7 +143,7 @@ public void updateProtocol( String serverVersion )
     {
         if( version( serverVersion ).lessThan( v3_2_0 ) )
         {
-            setProtocol( SocketProtocolV1.create( channel, false ) );
+            setProtocol( SocketProtocolV1.createWithoutByteArraySupport( channel ) );
         }
     }
 

driver/src/main/java/org/neo4j/driver/internal/net/SocketProtocolV1.java

@@ -34,15 +34,15 @@ public class SocketProtocolV1 implements SocketProtocol
     public static SocketProtocol create( ByteChannel channel )
     {
         /*by default the byte array support is enabled*/
-        return create( channel, true );
+        return new SocketProtocolV1( channel, true );
     }
 
-    public static SocketProtocol create( ByteChannel channel, boolean byteArraySupportEnabled )
+    public static SocketProtocol createWithoutByteArraySupport( ByteChannel channel )
     {
-        return new SocketProtocolV1( channel, byteArraySupportEnabled );
+        return new SocketProtocolV1( channel, false );
     }
 
-    public SocketProtocolV1( ByteChannel channel, boolean byteArraySupportEnabled )
+    private SocketProtocolV1( ByteChannel channel, boolean byteArraySupportEnabled )
     {
         messageFormat = new PackStreamMessageFormatV1();
         this.writer = messageFormat.newWriter( channel, byteArraySupportEnabled );

driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java

@@ -535,30 +535,6 @@ public String unpackString() throws IOException
             return new String(unpackUtf8(markerByte), UTF_8);
         }
 
-        public byte[] unpackRawBytes() throws IOException
-        {
-            final byte markerByte = in.readByte();
-
-            switch(markerByte)
-            {
-                case BYTES_8: return unpackRawBytes( unpackUINT8() );
-                case BYTES_16: return unpackRawBytes( unpackUINT16() );
-                case BYTES_32:
-                {
-                    long size = unpackUINT32();
-                    if ( size <= Integer.MAX_VALUE )
-                    {
-                        return unpackRawBytes( (int) size );
-                    }
-                    else
-                    {
-                        throw new Overflow( "BYTES_32 too long for Java" );
-                    }
-                }
-                default: throw new Unexpected( "Expected binary data, but got: 0x" + toHexString( markerByte & 0xFF ));
-            }
-        }
-
         /**
          * This may seem confusing. This method exists to move forward the internal pointer when encountering
          * a null value. The idiomatic usage would be someone using {@link #peekNextType()} to detect a null type,

driver/src/main/java/org/neo4j/driver/internal/util/ServerVersion.java

@@ -54,12 +54,6 @@ public static ServerVersion version( Driver driver )
         }
     }
 
-    public static ServerVersion version( Session session )
-    {
-            String versionString = session.run( "RETURN 1" ).consume().server().version();
-            return version( versionString );
-    }
-
     public static ServerVersion version( String server )
     {
         if ( server == null )

driver/src/main/java/org/neo4j/driver/v1/Values.java

@@ -85,7 +85,7 @@ public static Value value( Object value )
         if ( value instanceof Iterable<?> ) { return value( (Iterable<Object>) value ); }
         if ( value instanceof Iterator<?> ) { return value( (Iterator<Object>) value ); }
 
-        if ( value instanceof byte[] ) { return new BytesValue( (byte[]) value ); }
+        if ( value instanceof byte[] ) { return value( (byte[]) value ); }
         if ( value instanceof boolean[] ) { return value( (boolean[]) value ); }
         if ( value instanceof String[] ) { return value( (String[]) value ); }
         if ( value instanceof long[] ) { return value( (long[]) value ); }
@@ -98,6 +98,7 @@ public static Value value( Object value )
         throw new ClientException( "Unable to convert " + value.getClass().getName() + " to Neo4j Value." );
     }
 
+
     public static Value[] values( final Object... input )
     {
         Value[] values = new Value[input.length];
@@ -116,7 +117,7 @@ public static Value value( Value... input )
         return new ListValue( values );
     }
 
-    private static Value bytesValue( byte[] input )
+    public static BytesValue value( byte... input )
     {
         return new BytesValue( input );
     }

driver/src/test/java/org/neo4j/driver/internal/packstream/BufferedChannelOutput.java

@@ -107,7 +107,7 @@ public PackOutput writeDouble( double value ) throws IOException
         return this;
     }
 
-    private void ensure(int size ) throws IOException
+    private void ensure( int size ) throws IOException
     {
         if ( buffer.remaining() < size )
         {

driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java

@@ -344,7 +344,7 @@ public void testCanPackAndUnpackByteArrays() throws Throwable
 
             // Then
             assertThat( packType, equalTo( PackType.BYTES ) );
-            assertArrayEquals( array, unpacker.unpackRawBytes() );
+            assertArrayEquals( array, unpacker.unpackBytes() );
         }
     }
 
@@ -391,7 +391,7 @@ public void testCanPackAndUnpackBytes() throws Throwable
 
         // Then
         assertThat( packType, equalTo( PackType.BYTES ) );
-        assertArrayEquals( "ABCDEFGHIJ".getBytes(), unpacker.unpackRawBytes() );
+        assertArrayEquals( "ABCDEFGHIJ".getBytes(), unpacker.unpackBytes() );
 
     }
 

driver/src/test/java/org/neo4j/driver/v1/integration/ParametersIT.java

@@ -40,6 +40,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
+import static org.neo4j.driver.internal.util.ServerVersion.version;
 import static org.neo4j.driver.v1.Values.ofValue;
 import static org.neo4j.driver.v1.Values.parameters;
 
@@ -151,7 +152,8 @@ public void shouldBeAbleToSetAndReturnDoubleProperty()
 
     private boolean supportsBytes()
     {
-        return ServerVersion.version( session ).greaterThanOrEqual( ServerVersion.v3_2_0 );
+        String versionString = session.run( "RETURN 1" ).consume().server().version();
+        return version( versionString ).greaterThanOrEqual( ServerVersion.v3_2_0 );
     }
 
     @Test