Merge branch '1.0' into 1.0-tck-tests

Author: RagnarW

README.md

@@ -13,7 +13,7 @@ Add the driver to your project:
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>1.0.0-M01</version>
+            <version>1.0.0-M04</version>
         </dependency>
     </dependencies>
 
@@ -23,10 +23,12 @@ Connect to a Neo4j 3.0.0+ database
 
     Session session = driver.session();
 
-    Result rs = session.run("CREATE (n) RETURN n");
+    StatementResult rs = session.run("CREATE (n) RETURN n");
 
     session.close();
 
+    driver.close();
+
 # Building
 
 ## Java version

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

@@ -23,28 +23,26 @@
 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.v1.Entity;
-import org.neo4j.driver.v1.Function;
-import org.neo4j.driver.v1.Identity;
-import org.neo4j.driver.v1.Pair;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
+import org.neo4j.driver.v1.types.Entity;
+import org.neo4j.driver.v1.util.Function;
 
-import static org.neo4j.driver.v1.Values.valueAsIs;
+import static org.neo4j.driver.v1.Values.ofObject;
 
 public abstract class InternalEntity implements Entity, AsValue
 {
-    private final Identity id;
+    private final long id;
     private final Map<String,Value> properties;
 
-    public InternalEntity( Identity id, Map<String, Value> properties )
+    public InternalEntity( long id, Map<String, Value> properties )
     {
         this.id = id;
         this.properties = properties;
     }
 
     @Override
-    public Identity identity()
+    public long id()
     {
         return id;
     }
@@ -55,6 +53,19 @@ public int size()
         return properties.size();
     }
 
+    @Override
+    public Map<String,Object> asMap()
+    {
+        return asMap( ofObject() );
+    }
+
+    @Override
+    public <T> Map<String,T> asMap( Function<Value,T> mapFunction )
+    {
+        return Extract.map( properties, mapFunction );
+    }
+
+    @Override
     public Value asValue()
     {
         return new MapValue( properties );
@@ -74,14 +85,14 @@ public boolean equals( Object o )
 
         InternalEntity that = (InternalEntity) o;
 
-        return id.equals( that.id );
+        return id == that.id;
 
     }
 
     @Override
     public int hashCode()
     {
-        return id.hashCode();
+        return (int)(id ^ (id >>> 32));
     }
 
     @Override
@@ -123,16 +134,4 @@ public <T> Iterable<T> values( Function<Value,T> mapFunction )
     {
         return Iterables.map( properties.values(), mapFunction );
     }
-
-    @Override
-    public Iterable<Pair<String, Value>> properties()
-    {
-        return properties( valueAsIs() );
-    }
-
-    @Override
-    public <V> Iterable<Pair<String, V>> properties( final Function<Value, V> Function )
-    {
-        return Extract.properties( this, Function );
-    }
 }

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

@@ -23,8 +23,7 @@
 import java.util.Map;
 
 import org.neo4j.driver.internal.value.NodeValue;
-import org.neo4j.driver.v1.Identity;
-import org.neo4j.driver.v1.Node;
+import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.Value;
 
 /**
@@ -41,12 +40,7 @@ public InternalNode( long id )
 
     public InternalNode( long id, Collection<String> labels, Map<String, Value> properties )
     {
-        this( Identities.identity( id ), labels, properties );
-    }
-
-    public InternalNode( Identity identity, Collection<String> labels, Map<String, Value> properties )
-    {
-        super( identity, properties );
+        super( id, properties );
         this.labels = labels;
     }
 
@@ -71,6 +65,6 @@ public Value asValue()
     @Override
     public String toString()
     {
-        return String.format( "node<%s>", identity()  );
+        return String.format( "node<%s>", id()  );
     }
 }

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

@@ -20,8 +20,8 @@
 
 import java.util.Objects;
 
-import org.neo4j.driver.v1.Function;
-import org.neo4j.driver.v1.Pair;
+import org.neo4j.driver.v1.util.Function;
+import org.neo4j.driver.v1.util.Pair;
 
 public class InternalPair<K, V> implements Pair<K, V>
 {

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

@@ -25,10 +25,10 @@
 import java.util.List;
 
 import org.neo4j.driver.internal.value.PathValue;
-import org.neo4j.driver.v1.Entity;
-import org.neo4j.driver.v1.Node;
-import org.neo4j.driver.v1.Path;
-import org.neo4j.driver.v1.Relationship;
+import org.neo4j.driver.v1.types.Entity;
+import org.neo4j.driver.v1.types.Node;
+import org.neo4j.driver.v1.types.Path;
+import org.neo4j.driver.v1.types.Relationship;
 import org.neo4j.driver.v1.Value;
 
 /**
@@ -96,15 +96,15 @@ public int hashCode()
         @Override
         public String toString()
         {
-            return String.format( relationship.start().equals( start.identity() ) ?
+            return String.format( relationship.startNodeId() == start.id() ?
                                   "(%s)-[%s:%s]->(%s)" : "(%s)<-[%s:%s]-(%s)",
-                    start.identity(), relationship.identity(), relationship.type(), end.identity() );
+                    start.id(), relationship.id(), relationship.type(), end.id() );
         }
     }
 
     private static boolean isEndpoint( Node node, Relationship relationship )
     {
-        return node.identity().equals( relationship.start() ) || node.identity().equals( relationship.end() );
+        return node.id() ==  relationship.startNodeId() || node.id() == relationship.endNodeId();
     }
 
     private final List<Node> nodes;

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

@@ -19,23 +19,24 @@
 package org.neo4j.driver.internal;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
 import org.neo4j.driver.internal.util.Extract;
 import org.neo4j.driver.internal.value.InternalValue;
+import org.neo4j.driver.v1.util.Function;
+import org.neo4j.driver.v1.util.Pair;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.Values;
 
 import static java.lang.String.format;
-
 import static org.neo4j.driver.internal.util.Format.formatPairs;
-import static org.neo4j.driver.v1.Values.valueAsIs;
+import static org.neo4j.driver.v1.Values.ofValue;
+import static org.neo4j.driver.v1.Values.ofObject;
 
-public class InternalRecord extends InternalRecordAccessor implements Record
+public class InternalRecord implements Record
 {
     private final List<String> keys;
     private final Value[] values;
@@ -53,6 +54,12 @@ public List<String> keys()
         return keys;
     }
 
+    @Override
+    public List<Pair<String, Value>> fields()
+    {
+        return Extract.fields( this, ofValue() );
+    }
+
     @Override
     public int index( String key )
     {
@@ -101,21 +108,21 @@ public int size()
     }
 
     @Override
-    public Record record()
+    public Map<String, Object> asMap()
     {
-        return this;
+        return Extract.map( this, ofObject() );
     }
 
     @Override
-    public Map<String, Value> asMap()
+    public <T> Map<String,T> asMap( Function<Value,T> mapper )
     {
-        return Extract.map( this, valueAsIs() );
+        return Extract.map( this, mapper );
     }
 
     @Override
     public String toString()
     {
-        return format( "Record<%s>", formatPairs( InternalValue.Format.VALUE_WITH_TYPE, size(), fields() ) );
+        return format( "Record<%s>", formatPairs( InternalValue.Format.VALUE_ONLY, asMap( ofValue() ) ) );
     }
 
     public boolean equals( Object other )