Merge with 1.0

Author: RagnarW

driver/pom.xml

@@ -12,6 +12,7 @@
     <groupId>org.neo4j.driver</groupId>
     <artifactId>neo4j-java-driver-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>neo4j-java-driver</artifactId>

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
@@ -106,7 +106,7 @@ public Iterable<String> keys()
     }
 
     @Override
-    public Value value( String key )
+    public Value get( String key )
     {
         Value value = properties.get( key );
         return value == null ? Values.NULL : value;

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
@@ -75,7 +75,7 @@ public boolean containsKey( String key )
     }
 
     @Override
-    public Value value( String key )
+    public Value get( String key )
     {
         Integer fieldIndex = keyIndexLookup.get( key );
 
@@ -90,7 +90,7 @@ public Value value( String key )
     }
 
     @Override
-    public Value value( int index )
+    public Value get( int index )
     {
         return index >= 0 && index < values.length ? values[index] : Values.NULL;
     }
@@ -101,12 +101,6 @@ public int size()
         return values.length;
     }
 
-    @Override
-    public boolean hasRecord()
-    {
-        return true;
-    }
-
     @Override
     public Record record()
     {
@@ -145,8 +139,8 @@ else if ( other instanceof Record )
             }
             for ( int i = 0; i < size; i++ )
             {
-                Value value = value( i );
-                Value otherValue = otherRecord.value( i );
+                Value value = get( i );
+                Value otherValue = otherRecord.get( i );
                 if ( ! value.equals( otherValue ) )
                 {
                     return false;

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.