Extracted interface for Neo4jPack

To make it easier to plug different version that, for example, supports new types, like point, geometry or date.
neo4j · Jan 9, 2018 · 8f9e85d · 8f9e85d
1 parent 5b87ea0
commit 8f9e85d
Show file tree

Hide file tree

Showing 14 changed files with 775 additions and 715 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/DefaultBoltProtocolHandlerFactory.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/DefaultBoltProtocolHandlerFactory.java
@@ -20,6 +20,7 @@
 package org.neo4j.bolt.transport;
 
 import org.neo4j.bolt.BoltChannel;
+import org.neo4j.bolt.v1.messaging.Neo4jPackV1;
 import org.neo4j.bolt.v1.runtime.BoltWorker;
 import org.neo4j.bolt.v1.runtime.WorkerFactory;
 import org.neo4j.bolt.v1.transport.BoltMessagingProtocolV1Handler;
@@ -45,7 +46,7 @@ public BoltMessagingProtocolHandler create( long protocolVersion, BoltChannel ch
         if ( protocolVersion == BoltMessagingProtocolV1Handler.VERSION )
         {
             BoltWorker worker = workerFactory.newWorker( channel );
-            return new BoltMessagingProtocolV1Handler( channel, worker, throttleGroup, logService );
+            return new BoltMessagingProtocolV1Handler( channel, new Neo4jPackV1(), worker, throttleGroup, logService );
         }
         else
         {

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java
@@ -20,18 +20,11 @@
 package org.neo4j.bolt.v1.messaging;
 
 import java.io.IOException;
-import java.util.function.Supplier;
 
 import org.neo4j.bolt.logging.BoltMessageLogger;
 import org.neo4j.cypher.result.QueryResult;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.spatial.Point;
-import org.neo4j.kernel.impl.util.BaseToObjectValueWriter;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.utils.PrettyPrinter;
-import org.neo4j.values.storable.CoordinateReferenceSystem;
 import org.neo4j.values.virtual.MapValue;
 
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.FAILURE;
@@ -92,16 +85,6 @@ public void onSuccess( MapValue metadata ) throws IOException
         onMessageComplete.onMessageComplete();
     }
 
-    private Supplier<String> metadataSupplier( MapValue metadata )
-    {
-        return () ->
-        {
-            PrettyPrinter printer = new PrettyPrinter();
-            metadata.writeTo( printer );
-            return printer.value();
-        };
-    }
-
     @Override
     public void onIgnored() throws IOException
     {
@@ -138,30 +121,4 @@ public void flush() throws IOException
     {
         packer.flush();
     }
-
-    private class MapToObjectWriter extends BaseToObjectValueWriter<RuntimeException>
-    {
-
-        private UnsupportedOperationException exception =
-                new UnsupportedOperationException( "Functionality not implemented." );
-
-        @Override
-        protected Node newNodeProxyById( long id )
-        {
-            throw exception;
-        }
-
-        @Override
-        protected Relationship newRelationshipProxyById( long id )
-        {
-            throw exception;
-        }
-
-        @Override
-        protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
-        {
-            throw exception;
-        }
-    }
-
 }