Add missing RecordAccessor methods: index, field(String), field(int)

Author: boggle

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

@@ -55,14 +55,20 @@ public Value value( int index )
         return index >= 0 && index < values.length ? values[index] : Values.NULL;
     }
 
+    @Override
+    public String key( int index )
+    {
+        return keys.get( index );
+    }
+
     @Override
     public List<String> keys()
     {
         return keys;
     }
 
     @Override
-    public int fieldIndex( String key )
+    public int index( String key )
     {
         Integer result = keyIndexLookup.get( key );
         if ( result == null )

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

@@ -36,6 +36,19 @@ public int fieldCount()
         return keys().size();
     }
 
+    @Override
+    public Field field( String key )
+    {
+        int index = index( key );
+        return InternalField.of( key, index, value( index ) );
+    }
+
+    @Override
+    public Field field( int index )
+    {
+        return InternalField.of( key( index ), index, value( index) );
+    }
+
     @Override
     public List<Field<Value>> fields()
     {

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

@@ -62,26 +62,32 @@ public Value value( int index )
         return record().value( index );
     }
 
+    public Value value( String key )
+    {
+        return record().value( key );
+    }
+
     @Override
     public boolean containsKey( String key )
     {
         return keys.contains( key );
     }
 
-    public List<String> keys()
+    @Override
+    public String key( int index )
     {
-        return keys;
+        return record().key( index );
     }
 
     @Override
-    public int fieldIndex( String key )
+    public int index( String key )
     {
-        return record().fieldIndex( key );
+        return record().index( key );
     }
 
-    public Value value( String key )
+    public List<String> keys()
     {
-        return record().value( key );
+        return keys;
     }
 
     private Value throwNoRecord()

driver/src/main/java/org/neo4j/driver/v1/RecordAccessor.java

@@ -36,9 +36,12 @@ public interface RecordAccessor extends ListAccessor, MapAccessor
     List<String> keys();
 
     /**
-     * @return number of fields in this record
+     * Retrieve the key of the field for the given index
+     *
+     * @param index the index of the key
+     * @return the key of the field for the given index
      */
-    int fieldCount();
+    String key( int index );
 
     /**
      * Retrieve the index of the field with the given key
@@ -47,7 +50,28 @@ public interface RecordAccessor extends ListAccessor, MapAccessor
      * @param key the give key
      * @return the index of the field as used by {@link #value(int)}
      */
-    int fieldIndex( String key );
+    int index( String key );
+
+    /**
+     * Retrieve the field for the given key
+     *
+     * @param key the key
+     * @return the field for the given key
+     */
+    Field field( String key );
+
+    /**
+     * Retrieve the field at the given index
+     *
+     * @param index the index
+     * @return the field at the given index
+     */
+    Field field( int index );
+
+    /**
+     * @return number of fields in this record
+     */
+    int fieldCount();
 
     /**
      * Retrieve all record fields

driver/src/main/java/org/neo4j/driver/v1/Value.java

@@ -229,15 +229,15 @@ public interface Value extends PropertyMapAccessor, ListAccessor
     Identity asIdentity();
 
     /**
-     * @return the value as a list of values, if possible
+     * @return the value as a Java list of values, if possible
      */
     List<Value> asList();
 
     /**
      * @param mapFunction a function to map from Value to T. See {@link Values} for some predefined functions, such
      * as {@link Values#valueAsBoolean()}, {@link Values#valueAsList(Function)}.
-     * @param <T> the type of list elements
-     * @return the value as a list of T, if possible
+     * @param <T> the type of target list elements
+     * @return the value as a list of T obtained by mapping from the list elements, if possible
      */
     <T> List<T> asList( Function<Value, T> mapFunction );
 
@@ -304,15 +304,15 @@ public interface Value extends PropertyMapAccessor, ListAccessor
     float[] asFloatArray();
 
     /**
-     * @return the value as a value map, if possible
+     * @return the value as a Java value map, if possible
      */
     Map<String, Value> asMap();
 
     /**
      * @param mapFunction a function to map from Value to T. See {@link Values} for some predefined functions, such
      * as {@link Values#valueAsBoolean()}, {@link Values#valueAsList(Function)}.
      * @param <T> the type of map values
-     * @return the value as a map from string keys to values of type T, if possible
+     * @return the value as a map from string keys to values of type T obtained from mapping he original map values, if possible
      */
     <T> Map<String, T> asMap( Function<Value, T> mapFunction );
 

driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java

@@ -62,8 +62,8 @@ public void shouldHaveCorrectFieldCount()
     public void shouldHaveCorrectFieldIndices()
     {
         InternalRecord record = createRecord();
-        assertThat( record.fieldIndex( "k1" ), equalTo( 0 ) );
-        assertThat( record.fieldIndex( "k2" ), equalTo( 1 ) );
+        assertThat( record.index( "k1" ), equalTo( 0 ) );
+        assertThat( record.index( "k2" ), equalTo( 1 ) );
     }
 
     @Test
@@ -72,7 +72,7 @@ public void shouldThrowWhenAskingForIndexOfUnknownField()
         InternalRecord record = createRecord();
         try
         {
-            record.fieldIndex( "BATMAN" );
+            record.index( "BATMAN" );
             fail( "Expected NoSuchElementException to be thrown" );
         }
         catch ( NoSuchElementException e )