Added pack stream V2 with float pair and triple

Made 2D and 3D points use these new types. Refactored `PackStream`
into a separate packer and unpacker. They are now top-level classes and
exist for V1 and V2 pack stream versions. Later adds FLOAT_PAIR and
FLOAT_TRIPLE types. Turned pack stream exceptions into top-level
classes and moved them to a dedicated package.

Author: lutovich

driver/src/main/java/org/neo4j/driver/internal/async/inbound/ByteBufInput.java

@@ -70,10 +70,9 @@ public double readDouble()
     }
 
     @Override
-    public PackInput readBytes( byte[] into, int offset, int toRead )
+    public void readBytes( byte[] into, int offset, int toRead )
     {
         buf.readBytes( into, offset, toRead );
-        return this;
     }
 
     @Override

driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java

@@ -28,11 +28,11 @@
 import org.neo4j.driver.internal.InternalNode;
 import org.neo4j.driver.internal.InternalPath;
 import org.neo4j.driver.internal.InternalRelationship;
-import org.neo4j.driver.internal.packstream.ByteArrayIncompatiblePacker;
 import org.neo4j.driver.internal.packstream.PackInput;
 import org.neo4j.driver.internal.packstream.PackOutput;
-import org.neo4j.driver.internal.packstream.PackStream;
 import org.neo4j.driver.internal.packstream.PackType;
+import org.neo4j.driver.internal.packstream.PackerV1;
+import org.neo4j.driver.internal.packstream.UnpackerV1;
 import org.neo4j.driver.internal.util.Iterables;
 import org.neo4j.driver.internal.value.InternalValue;
 import org.neo4j.driver.internal.value.ListValue;
@@ -73,33 +73,22 @@ public class PackStreamMessageFormatV1 implements MessageFormat
     @Override
     public MessageFormat.Writer newWriter( PackOutput output, boolean byteArraySupportEnabled )
     {
-        return new WriterV1( output, byteArraySupportEnabled );
+        return new WriterV1( new PackerV1( output, byteArraySupportEnabled ) );
     }
 
     @Override
     public MessageFormat.Reader newReader( PackInput input )
     {
-        return new ReaderV1( input );
+        return new ReaderV1( new UnpackerV1( input ) );
     }
 
     static class WriterV1 implements MessageFormat.Writer, MessageHandler
     {
-        final PackStream.Packer packer;
+        private final PackerV1 packer;
 
-        /**
-         * @param output interface to write messages to
-         * @param byteArraySupportEnabled specify if support to pack/write byte array to server
-         */
-        WriterV1( PackOutput output, boolean byteArraySupportEnabled )
+        WriterV1( PackerV1 packer )
         {
-            if( byteArraySupportEnabled )
-            {
-                packer = new PackStream.Packer( output );
-            }
-            else
-            {
-                packer = new ByteArrayIncompatiblePacker( output );
-            }
+            this.packer = packer;
         }
 
         @Override
@@ -362,11 +351,11 @@ private void packProperties( Entity entity ) throws IOException
 
     static class ReaderV1 implements MessageFormat.Reader
     {
-        final PackStream.Unpacker unpacker;
+        private final UnpackerV1 unpacker;
 
-        ReaderV1( PackInput input )
+        ReaderV1( UnpackerV1 unpacker )
         {
-            unpacker = new PackStream.Unpacker( input );
+            this.unpacker = unpacker;
         }
 
         /**

driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV2.java

@@ -24,6 +24,8 @@
 import org.neo4j.driver.internal.InternalPoint3D;
 import org.neo4j.driver.internal.packstream.PackInput;
 import org.neo4j.driver.internal.packstream.PackOutput;
+import org.neo4j.driver.internal.packstream.PackerV2;
+import org.neo4j.driver.internal.packstream.UnpackerV2;
 import org.neo4j.driver.internal.value.InternalValue;
 import org.neo4j.driver.internal.value.Point2DValue;
 import org.neo4j.driver.internal.value.Point3DValue;
@@ -47,20 +49,23 @@ public MessageFormat.Writer newWriter( PackOutput output, boolean byteArraySuppo
         {
             throw new IllegalArgumentException( "Bolt V2 should support byte arrays" );
         }
-        return new WriterV2( output );
+        return new WriterV2( new PackerV2( output ) );
     }
 
     @Override
     public MessageFormat.Reader newReader( PackInput input )
     {
-        return new ReaderV2( input );
+        return new ReaderV2( new UnpackerV2( input ) );
     }
 
     private static class WriterV2 extends WriterV1
     {
-        WriterV2( PackOutput output )
+        private final PackerV2 packer;
+
+        WriterV2( PackerV2 packer )
         {
-            super( output, true );
+            super( packer );
+            this.packer = packer;
         }
 
         @Override
@@ -84,22 +89,25 @@ private void packPoint2D( Point2D point ) throws IOException
         {
             packer.packStructHeader( POINT_STRUCT_SIZE, POINT_2D_STRUCT_TYPE );
             packer.pack( point.srid() );
-//            packer.pack( point.x(), point.y() );
+            packer.pack( point.x(), point.y() );
         }
 
         private void packPoint3D( Point3D point ) throws IOException
         {
             packer.packStructHeader( POINT_STRUCT_SIZE, POINT_3D_STRUCT_TYPE );
             packer.pack( point.srid() );
-//            packer.pack( point.x(), point.y(), point.z() );
+            packer.pack( point.x(), point.y(), point.z() );
         }
     }
 
     private static class ReaderV2 extends ReaderV1
     {
-        ReaderV2( PackInput input )
+        private final UnpackerV2 unpacker;
+
+        ReaderV2( UnpackerV2 unpacker )
         {
-            super( input );
+            super( unpacker );
+            this.unpacker = unpacker;
         }
 
         @Override
@@ -124,13 +132,15 @@ else if ( type == POINT_3D_STRUCT_TYPE )
         private Value unpackPoint2D() throws IOException
         {
             long srid = unpacker.unpackLong();
-            return new Point2DValue( new InternalPoint2D( srid, 0.0, 0.0 ) );
+            double[] coordinate = unpacker.unpackDoublePair();
+            return new Point2DValue( new InternalPoint2D( srid, coordinate[0], coordinate[1] ) );
         }
 
         private Value unpackPoint3D() throws IOException
         {
             long srid = unpacker.unpackLong();
-            return new Point3DValue( new InternalPoint3D( srid, 0.0, 0.0, 0.0 ) );
+            double[] coordinate = unpacker.unpackDoubleTriple();
+            return new Point3DValue( new InternalPoint3D( srid, coordinate[0], coordinate[1], coordinate[2] ) );
         }
     }
 }

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

@@ -21,8 +21,8 @@
 import java.io.IOException;
 
 /**
- * This is what {@link PackStream} uses to ingest data, implement this on top of any data source of your choice to
- * deserialize the stream with {@link PackStream}.
+ * This is what pack stream unpackers use to ingest data, implement this on top of
+ * any data source of your choice to deserialize the stream.
  */
 public interface PackInput
 {
@@ -42,7 +42,7 @@ public interface PackInput
     double readDouble() throws IOException;
 
     /** Consume a specified number of bytes */
-    PackInput readBytes( byte[] into, int offset, int toRead ) throws IOException;
+    void readBytes( byte[] into, int offset, int toRead ) throws IOException;
 
     /** Get the next byte without forwarding the internal pointer */
     byte peekByte() throws IOException;

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

@@ -21,7 +21,7 @@
 import java.io.IOException;
 
 /**
- * This is where {@link PackStream} writes its output to.
+ * This is where pack stream packers writes output to.
  */
 public interface PackOutput
 {