Merge branch '1.0' into 1.0-tck-tests

Author: RagnarW

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

@@ -18,18 +18,13 @@
  */
 package org.neo4j.driver.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.neo4j.driver.v1.Function;
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.RecordAccessor;
-import org.neo4j.driver.v1.ResultCursor;
-import org.neo4j.driver.v1.ResultSummary;
-import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.*;
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static org.neo4j.driver.v1.Records.recordAsIs;
@@ -178,7 +173,7 @@ else if ( records == 0) {
     @Override
     public Record first()
     {
-        if( position() > 0 )
+        if( position() >= 1 )
         {
             throw new NoSuchRecordException( "Cannot retrieve the first record, because this result cursor has been moved already. " +
                                              "Please ensure you are not calling `first` multiple times, or are mixing it with calls " +
@@ -197,6 +192,19 @@ public Record first()
         return record();
     }
 
+
+    @Override
+    public Value first(String fieldName) throws NoSuchRecordException
+    {
+        return first().get( fieldName );
+    }
+
+    @Override
+    public Value first(int index) throws NoSuchRecordException
+    {
+        return first().get( index );
+    }
+
     @Override
     public Record single()
     {
@@ -210,6 +218,18 @@ public Record single()
         return first;
     }
 
+    @Override
+    public Value single( String fieldName ) throws NoSuchRecordException
+    {
+        return single().get( fieldName );
+    }
+
+    @Override
+    public Value single( int index ) throws NoSuchRecordException
+    {
+        return single().get( index );
+    }
+
     @Override
     public Record peek()
     {

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

@@ -139,6 +139,7 @@ protected void finalize() throws Throwable
                           "method on Sessions before disposing of the objects.", null );
             connection.close();
         }
+        super.finalize();
     }
 
     private void ensureNoOpenTransaction()

driver/src/main/java/org/neo4j/driver/internal/pool/InternalConnectionPool.java

@@ -65,16 +65,22 @@ public class InternalConnectionPool implements ConnectionPool
      */
     private final ValidationStrategy<PooledConnection> connectionValidation;
 
+    /**
+     * Timeout in milliseconds if there are no available sessions.
+     */
+    private final long acquireSessionTimeout;
+
     private final Clock clock;
     private final Config config;
 
     public InternalConnectionPool( Config config )
     {
-        this( loadConnectors(), Clock.SYSTEM, config );
+        this( loadConnectors(), Clock.SYSTEM, config, Long.getLong( "neo4j.driver.acquireSessionTimeout", 30_000 ) );
     }
 
-    public InternalConnectionPool( Collection<Connector> conns, Clock clock, Config config )
+    public InternalConnectionPool( Collection<Connector> conns, Clock clock, Config config, long acquireTimeout )
     {
+        this.acquireSessionTimeout = acquireTimeout;
         this.config = config;
         this.clock = clock;
         this.connectionValidation = new PooledConnectionValidator( config.idleTimeBeforeConnectionTest() );
@@ -92,7 +98,7 @@ public Connection acquire( URI sessionURI )
     {
         try
         {
-            Connection conn = pool( sessionURI ).acquire( 30, TimeUnit.SECONDS );
+            Connection conn = pool( sessionURI ).acquire( acquireSessionTimeout, TimeUnit.MILLISECONDS );
             if( conn == null )
             {
                 throw new ClientException(

driver/src/main/java/org/neo4j/driver/internal/summary/InternalNotification.java

@@ -23,6 +23,8 @@
 import org.neo4j.driver.v1.Notification;
 import org.neo4j.driver.v1.Value;
 
+import static org.neo4j.driver.internal.value.NullValue.NULL;
+
 public class InternalNotification implements Notification
 {
     public static final Function<Value, Notification> VALUE_TO_NOTIFICATION = new Function<Value,Notification>()
@@ -36,7 +38,7 @@ public Notification apply( Value value )
 
             Value posValue = value.get( "position" );
             InputPosition position = null;
-            if( posValue != null )
+            if( posValue != NULL )
             {
                 position = new InternalInputPosition( posValue.get( "offset" ).asInt(),
                                                     posValue.get( "line" ).asInt(),

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

@@ -161,25 +161,45 @@ public ConfigBuilder withLogging( Logging logging )
         }
 
         /**
-         * The max number of connections to open at any given time per Neo4j instance.
-         * @param size the size of the connection pool
+         * The max number of sessions to keep open at once. Configure this
+         * higher if you want more concurrent sessions, or lower if you want
+         * to lower the pressure on the database instance.
+         *
+         * If the driver is asked to provide more sessions than this, it will
+         * block waiting for another session to be closed, with a timeout.
+         *
+         * @param size the max number of sessions to keep open
          * @return this builder
          */
-        public ConfigBuilder withConnectionPoolSize( int size )
+        public ConfigBuilder withMaxSessions( int size )
         {
             this.connectionPoolSize = size;
             return this;
         }
 
         /**
-         * Pooled connections that have been unused for longer than this timeout will be tested before they are
-         * used again, to ensure they are still live.
-         * @param milliSecond minimum idle time in milliseconds
+         * Pooled sessions that have been unused for longer than this timeout
+         * will be tested before they are used again, to ensure they are still live.
+         *
+         * If this option is set too low, an additional network call will be
+         * incurred when acquiring a session, which causes a performance hit.
+         *
+         * If this is set high, you may receive sessions that are no longer live,
+         * which will lead to exceptions in your application. Assuming the
+         * database is running, these exceptions will go away if you retry acquiring
+         * sessions.
+         *
+         * Hence, this parameter tunes a balance between the likelihood of your
+         * application seeing connection problems, and performance.
+         *
+         * You normally should not need to tune this parameter.
+         *
+         * @param timeout minimum idle time in milliseconds
          * @return this builder
          */
-        public ConfigBuilder withMinIdleTimeBeforeConnectionTest( long milliSecond )
+        public ConfigBuilder withSessionLivenessCheckTimeout( long timeout )
         {
-            this.idleTimeBeforeConnectionTest = milliSecond;
+            this.idleTimeBeforeConnectionTest = timeout;
             return this;
         }
 

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

@@ -34,7 +34,7 @@ public class GraphDatabase
      */
     public static Driver driver( String url )
     {
-        return driver( URI.create( url ) );
+        return driver( url, Config.defaultConfig() );
     }
 
     /**

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

@@ -25,11 +25,6 @@
  */
 public abstract class Records
 {
-    private Records()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     public static Function<RecordAccessor, Record> recordAsIs()
     {
         return RECORD;

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

@@ -18,11 +18,11 @@
  */
 package org.neo4j.driver.v1;
 
-import java.util.List;
-
 import org.neo4j.driver.v1.exceptions.ClientException;
 import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
 
+import java.util.List;
+
 
 /**
  * The result of running a statement, a stream of records represented as a cursor.
@@ -92,23 +92,65 @@ public interface ResultCursor extends RecordAccessor, Resource
 
     /**
      * Return the first record in the stream. Fail with an exception if the stream is empty
-     * or if this cursor has already been used to move "into" the stream.
+     * or if this cursor has already been used to move past the first record.
      *
      * @return the first record in the stream
      * @throws NoSuchRecordException if there is no first record or the cursor has been used already
      *
      */
     Record first() throws NoSuchRecordException;
 
+    /**
+     * Return a field value from the first record in the stream. Fail with an exception if the stream is empty
+     * or if this cursor has already been used to move past the first record.
+     *
+     * @param fieldName the name of the field to return from the first record in the stream
+     * @return the specified field from the first record in the stream
+     * @throws NoSuchRecordException if there is no first record or the cursor has been used already
+     *
+     */
+    Value first( String fieldName ) throws NoSuchRecordException;
+
+    /**
+     * Return a field value from the first record in the stream. Fail with an exception if the stream is empty
+     * or if this cursor has already been used to move past the first record.
+     *
+     * @param index the index of the field to return from the first record in the stream
+     * @return the specified field from the first record in the stream
+     * @throws NoSuchRecordException if there is no first record or the cursor has been used already
+     *
+     */
+    Value first( int index ) throws NoSuchRecordException;
+
     /**
      * Move to the first record and return an immutable copy of it, failing if there is not exactly
-     * one record in the stream, or if this cursor has already been used to move "into" the stream.
+     * one record in the stream, or if this cursor has already been used to move past the first record.
      *
      * @return the first and only record in the stream
      * @throws NoSuchRecordException if there is not exactly one record in the stream, or if the cursor has been used already
      */
     Record single() throws NoSuchRecordException;
 
+    /**
+     * Move to the first record and return a field value from it, failing if there is not exactly
+     * one record in the stream, or if this cursor has already been used to move past the first record.
+     *
+     * @param fieldName the name of the field to return from the first and only record in the stream
+     * @return the value of the specified field of the first and only record in the stream
+     * @throws NoSuchRecordException if there is not exactly one record in the stream, or if the cursor has been used already
+     */
+    Value single( String fieldName ) throws NoSuchRecordException;
+
+    /**
+     * Move to the first record and return a field value from it, failing if there is not exactly
+     * one record in the stream, or if this cursor has already been used to move past the first record.
+     *
+     * @param index the index of the field to return from the first and only record in the stream
+     * @return the value of the specified field of the first and only record in the stream
+     * @throws NoSuchRecordException if there is not exactly one record in the stream, or if the cursor has been used already
+     */
+    Value single( int index ) throws NoSuchRecordException;
+
     /**
      * Investigate the next upcoming record without changing the position of this cursor.
      *
@@ -157,4 +199,4 @@ public interface ResultCursor extends RecordAccessor, Resource
      * @return a summary for the whole query
      */
     ResultSummary summarize();
-}
+}

driver/src/main/java/org/neo4j/driver/v1/exceptions/DatabaseException.java

@@ -24,11 +24,6 @@
  */
 public class DatabaseException extends Neo4jException
 {
-    public DatabaseException( String message )
-    {
-        super( message );
-    }
-
     public DatabaseException( String code, String message )
     {
         super( code, message );

driver/src/main/java/org/neo4j/driver/v1/exceptions/TransientException.java

@@ -24,11 +24,6 @@
  */
 public class TransientException extends Neo4jException
 {
-    public TransientException( String message )
-    {
-        super( message );
-    }
-
     public TransientException( String code, String message )
     {
         super( code, message );

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

@@ -18,14 +18,16 @@
  */
 package org.neo4j.driver.internal;
 
-import java.io.File;
-
 import org.junit.Test;
 
+import java.io.File;
+
 import org.neo4j.driver.v1.Config;
 
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class ConfigTest
@@ -76,6 +78,16 @@ public void shouldChangeToTrustedCert()
         assertEquals( trustedCert.getAbsolutePath(), authConfig.certFile().getAbsolutePath() );
     }
 
+    @Test
+    public void shouldConfigureMinIdleTime() throws Throwable
+    {
+        // when
+        Config config = Config.build().withSessionLivenessCheckTimeout( 1337 ).toConfig();
+
+        // then
+        assertThat( config.idleTimeBeforeConnectionTest(), equalTo( 1337l ));
+    }
+
     public static void deleteDefaultKnownCertFileIfExists()
     {
         if( DEFAULT_KNOWN_CERTS.exists() )