Add fieldIndex

Author: boggle

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

@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 import org.neo4j.driver.internal.util.Extract;
 import org.neo4j.driver.v1.Function;
@@ -55,6 +56,20 @@ public List<String> keys()
         return keys;
     }
 
+    @Override
+    public int fieldIndex( String key )
+    {
+        Integer result = keyIndexLookup.get( key );
+        if ( result == null )
+        {
+            throw new NoSuchElementException( "Unknown key: " + key );
+        }
+        else
+        {
+            return result;
+        }
+    }
+
     @Override
     public boolean containsKey( String key )
     {

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

@@ -59,7 +59,7 @@ public boolean isOpen()
 
     public Value value( int index )
     {
-        return current == null ? throwNoRecord() : current.value( index );
+        return record().value( index );
     }
 
     @Override
@@ -73,10 +73,15 @@ public List<String> keys()
         return keys;
     }
 
+    @Override
+    public int fieldIndex( String key )
+    {
+        return record().fieldIndex( key );
+    }
+
     public Value value( String key )
     {
-        assertOpen();
-        return current == null ? throwNoRecord() : current.value( key );
+        return record().value( key );
     }
 
     private Value throwNoRecord()
@@ -102,23 +107,20 @@ public Record record()
     public long position()
     {
         assertOpen();
-
         return position;
     }
 
     @Override
     public boolean atEnd()
     {
         assertOpen();
-
         return !iter.hasNext();
     }
 
     @Override
     public boolean next()
     {
         assertOpen();
-
         if ( iter.hasNext() )
         {
             current = iter.next();

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

@@ -40,6 +40,15 @@ public interface RecordAccessor extends ListAccessor, MapAccessor
      */
     int fieldCount();
 
+    /**
+     * Retrieve the index of the field with the given key
+     *
+     * @throws java.util.NoSuchElementException if the given key is not from {@link #keys()}
+     * @param key the give key
+     * @return the index of the field as used by {@link #value(int)}
+     */
+    int fieldIndex( String key );
+
     /**
      * Retrieve all record fields
      *

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

@@ -18,11 +18,11 @@
  */
 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.junit.Test;
 
@@ -35,6 +35,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import static org.neo4j.driver.v1.Values.value;
 
@@ -57,6 +58,29 @@ public void shouldHaveCorrectFieldCount()
         assertThat( record.fieldCount(), equalTo( 2 ) );
     }
 
+    @Test
+    public void shouldHaveCorrectFieldIndices()
+    {
+        InternalRecord record = createRecord();
+        assertThat( record.fieldIndex( "k1" ), equalTo( 0 ) );
+        assertThat( record.fieldIndex( "k2" ), equalTo( 1 ) );
+    }
+
+    @Test
+    public void shouldThrowWhenAskingForIndexOfUnknownField()
+    {
+        InternalRecord record = createRecord();
+        try
+        {
+            record.fieldIndex( "BATMAN" );
+            fail( "Expected NoSuchElementException to be thrown" );
+        }
+        catch ( NoSuchElementException e )
+        {
+            // yay
+        }
+    }
+
     @Test
     public void accessingOutOfBoundsShouldBeNull()
     {