Add support for Bolt 5

Author: injectives

driver/clirr-ignored-differences.xml

@@ -86,4 +86,22 @@
         <to>org.neo4j.driver.Config$TrustStrategy trustCustomCertificateSignedBy(java.io.File[])</to>
     </difference>
 
+    <difference>
+        <className>org/neo4j/driver/types/Entity</className>
+        <differenceType>7012</differenceType>
+        <method>java.lang.String elementId()</method>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/types/Relationship</className>
+        <differenceType>7012</differenceType>
+        <method>java.lang.String endNodeElementId()</method>
+    </difference>
+
+    <difference>
+        <className>org/neo4j/driver/types/Relationship</className>
+        <differenceType>7012</differenceType>
+        <method>java.lang.String startNodeElementId()</method>
+    </difference>
+
 </differences>

driver/src/main/java/org/neo4j/driver/internal/InternalEntity.java

@@ -19,25 +19,27 @@
 package org.neo4j.driver.internal;
 
 import java.util.Map;
+import java.util.function.Function;
 
+import org.neo4j.driver.Value;
+import org.neo4j.driver.Values;
 import org.neo4j.driver.internal.util.Extract;
 import org.neo4j.driver.internal.util.Iterables;
 import org.neo4j.driver.internal.value.MapValue;
-import org.neo4j.driver.Value;
-import org.neo4j.driver.Values;
 import org.neo4j.driver.types.Entity;
-import java.util.function.Function;
 
 import static org.neo4j.driver.Values.ofObject;
 
 public abstract class InternalEntity implements Entity, AsValue
 {
     private final long id;
+    private final String elementId;
     private final Map<String,Value> properties;
 
-    public InternalEntity( long id, Map<String, Value> properties )
+    public InternalEntity( long id, String elementId, Map<String,Value> properties )
     {
         this.id = id;
+        this.elementId = elementId;
         this.properties = properties;
     }
 
@@ -47,6 +49,12 @@ public long id()
         return id;
     }
 
+    @Override
+    public String elementId()
+    {
+        return elementId;
+    }
+
     @Override
     public int size()
     {

driver/src/main/java/org/neo4j/driver/internal/InternalNode.java

@@ -22,9 +22,9 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.neo4j.driver.Value;
 import org.neo4j.driver.internal.value.NodeValue;
 import org.neo4j.driver.types.Node;
-import org.neo4j.driver.Value;
 
 /**
  * {@link Node} implementation that directly contains labels and properties.
@@ -35,12 +35,12 @@ public class InternalNode extends InternalEntity implements Node
 
     public InternalNode( long id )
     {
-        this( id, Collections.<String>emptyList(), Collections.<String,Value>emptyMap() );
+        this( id, String.valueOf( id ), Collections.emptyList(), Collections.emptyMap() );
     }
 
-    public InternalNode( long id, Collection<String> labels, Map<String, Value> properties )
+    public InternalNode( long id, String elementId, Collection<String> labels, Map<String,Value> properties )
     {
-        super( id, properties );
+        super( id, elementId, properties );
         this.labels = labels;
     }
 

driver/src/main/java/org/neo4j/driver/internal/InternalRelationship.java

@@ -21,30 +21,34 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.neo4j.driver.Value;
 import org.neo4j.driver.internal.value.RelationshipValue;
 import org.neo4j.driver.types.Relationship;
-import org.neo4j.driver.Value;
 
 /**
  * {@link Relationship} implementation that directly contains type and properties.
  */
 public class InternalRelationship extends InternalEntity implements Relationship
 {
     private long start;
+    private String startElementId;
     private long end;
+    private String endElementId;
     private final String type;
 
-    public InternalRelationship( long id, long start, long end, String type )
+    public InternalRelationship( long id, String elementId, long start, String startElementId, long end, String endElementId, String type )
     {
-        this( id, start, end, type, Collections.<String,Value>emptyMap() );
+        this( id, elementId, start, startElementId, end, endElementId, type, Collections.emptyMap() );
     }
 
-    public InternalRelationship( long id, long start, long end, String type,
-                                 Map<String, Value> properties )
+    public InternalRelationship( long id, String elementId, long start, String startElementId, long end, String endElementId, String type,
+                                 Map<String,Value> properties )
     {
-        super( id, properties );
+        super( id, elementId, properties );
         this.start = start;
+        this.startElementId = startElementId;
         this.end = end;
+        this.endElementId = endElementId;
         this.type = type;
     }
 
@@ -54,11 +58,15 @@ public boolean hasType( String relationshipType )
         return type().equals( relationshipType );
     }
 
-    /** Modify the start/end identities of this relationship */
-    public void setStartAndEnd( long start, long end )
+    /**
+     * Modify the start/end identities of this relationship
+     */
+    public void setStartAndEnd( long start, String startElementId, long end, String endElementId )
     {
         this.start = start;
+        this.startElementId = startElementId;
         this.end = end;
+        this.endElementId = endElementId;
     }
 
     @Override
@@ -67,12 +75,24 @@ public long startNodeId()
         return start;
     }
 
+    @Override
+    public String startNodeElementId()
+    {
+        return startElementId;
+    }
+
     @Override
     public long endNodeId()
     {
         return end;
     }
 
+    @Override
+    public String endNodeElementId()
+    {
+        return endElementId;
+    }
+
     @Override
     public String type()
     {

driver/src/main/java/org/neo4j/driver/internal/async/connection/BoltProtocolUtil.java

@@ -22,10 +22,10 @@
 
 import org.neo4j.driver.internal.messaging.BoltProtocolVersion;
 import org.neo4j.driver.internal.messaging.v3.BoltProtocolV3;
-import org.neo4j.driver.internal.messaging.v4.BoltProtocolV4;
 import org.neo4j.driver.internal.messaging.v41.BoltProtocolV41;
 import org.neo4j.driver.internal.messaging.v42.BoltProtocolV42;
 import org.neo4j.driver.internal.messaging.v44.BoltProtocolV44;
+import org.neo4j.driver.internal.messaging.v5.BoltProtocolV5;
 
 import static io.netty.buffer.Unpooled.copyInt;
 import static io.netty.buffer.Unpooled.unreleasableBuffer;
@@ -42,9 +42,9 @@ public final class BoltProtocolUtil
 
     private static final ByteBuf HANDSHAKE_BUF = unreleasableBuffer( copyInt(
             BOLT_MAGIC_PREAMBLE,
+            BoltProtocolV5.VERSION.toInt(),
             BoltProtocolV44.VERSION.toIntRange( BoltProtocolV42.VERSION ),
             BoltProtocolV41.VERSION.toInt(),
-            BoltProtocolV4.VERSION.toInt(),
             BoltProtocolV3.VERSION.toInt() ) ).asReadOnly();
 
     private static final String HANDSHAKE_STRING = createHandshakeString();

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

@@ -41,6 +41,7 @@
 import org.neo4j.driver.internal.messaging.v42.BoltProtocolV42;
 import org.neo4j.driver.internal.messaging.v43.BoltProtocolV43;
 import org.neo4j.driver.internal.messaging.v44.BoltProtocolV44;
+import org.neo4j.driver.internal.messaging.v5.BoltProtocolV5;
 import org.neo4j.driver.internal.spi.Connection;
 
 import static org.neo4j.driver.internal.async.connection.ChannelAttributes.protocolVersion;
@@ -171,6 +172,10 @@ else if ( BoltProtocolV44.VERSION.equals( version ) )
         {
             return BoltProtocolV44.INSTANCE;
         }
+        else if ( BoltProtocolV5.VERSION.equals( version ) )
+        {
+            return BoltProtocolV5.INSTANCE;
+        }
         throw new ClientException( "Unknown protocol version: " + version );
     }
 }