Added support for server on session

Author: pontusmelke

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

@@ -22,8 +22,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.neo4j.driver.internal.spi.Connection;
-import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.internal.types.InternalTypeSystem;
+import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Session;
 import org.neo4j.driver.v1.Statement;
@@ -144,6 +144,12 @@ public void close()
         }
     }
 
+    @Override
+    public String server()
+    {
+        return connection.server();
+    }
+
     @Override
     public Transaction beginTransaction()
     {

driver/src/main/java/org/neo4j/driver/internal/net/ConcurrencyGuardingConnection.java

@@ -228,4 +228,10 @@ private void markAsInUse()
                                        "do that is to give each thread its own dedicated session." );
         }
     }
+
+    @Override
+    public String server()
+    {
+        return delegate.server();
+    }
 }

driver/src/main/java/org/neo4j/driver/internal/net/SocketConnection.java

@@ -47,6 +47,7 @@ public class SocketConnection implements Connection
     private final Queue<Message> pendingMessages = new LinkedList<>();
     private final SocketResponseHandler responseHandler;
     private AtomicBoolean interrupted = new AtomicBoolean( false );
+    private final StreamCollector.InitStreamCollector initStreamCollector = new StreamCollector.InitStreamCollector();
 
     private final SocketClient socket;
 
@@ -70,7 +71,7 @@ public SocketConnection( BoltServerAddress address, SecurityPlan securityPlan, L
     @Override
     public void init( String clientName, Map<String,Value> authToken )
     {
-        queueMessage( new InitMessage( clientName, authToken ), StreamCollector.INIT );
+        queueMessage( new InitMessage( clientName, authToken ), initStreamCollector );
         sync();
     }
 
@@ -231,4 +232,10 @@ public boolean isInterrupted()
     {
         return interrupted.get();
     }
+
+    @Override
+    public String server()
+    {
+        return initStreamCollector.server(  );
+    }
 }

driver/src/main/java/org/neo4j/driver/internal/net/SocketResponseHandler.java

@@ -84,6 +84,7 @@ public void handleFailureMessage( String code, String message )
     public void handleSuccessMessage( Map<String,Value> meta )
     {
         StreamCollector collector = collectors.remove();
+        collectServer( collector, meta.get( "server" ));
         collectFields( collector, meta.get( "fields" ) );
         collectType( collector, meta.get( "type" ) );
         collectStatistics( collector, meta.get( "stats" ) );
@@ -95,6 +96,14 @@ public void handleSuccessMessage( Map<String,Value> meta )
         collector.doneSuccess();
     }
 
+    private void collectServer( StreamCollector collector, Value server )
+    {
+        if (server != null)
+        {
+            collector.server( server.asString() );
+        }
+    }
+
     private void collectResultAvailableAfter( StreamCollector collector, Value resultAvailableAfter )
     {
         if (resultAvailableAfter != null)

driver/src/main/java/org/neo4j/driver/internal/net/pooling/PooledConnection.java

@@ -230,6 +230,12 @@ public boolean isInterrupted()
         return delegate.isInterrupted();
     }
 
+    @Override
+    public String server()
+    {
+        return delegate.server();
+    }
+
     public void dispose()
     {
         delegate.close();
@@ -280,7 +286,6 @@ private boolean isClientOrTransientError( RuntimeException e )
 
     public long idleTime()
     {
-        long idleTime = clock.millis() - lastUsed;
-        return idleTime;
+        return clock.millis() - lastUsed;
     }
 }

driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java

@@ -100,7 +100,7 @@ public interface Connection extends AutoCloseable
      * runnable. This is used in the driver to clean up resources associated with
      * the connection, like an open transaction.
      *
-     * @param runnable
+     * @param runnable To be run on error.
      */
     void onError( Runnable runnable );
 
@@ -117,4 +117,10 @@ public interface Connection extends AutoCloseable
      * @return true if the current session statement execution has been interrupted by another thread, otherwise false
      */
     boolean isInterrupted();
+
+    /**
+     * Returns the version of the server connected to.
+     * @return The version of the server connected to.
+     */
+    String server();
 }

driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java

@@ -50,15 +50,27 @@ public void doneIgnored()
         }
     };
 
-    StreamCollector INIT = new NoOperationStreamCollector()
+    class InitStreamCollector extends NoOperationStreamCollector
     {
+        private String server;
         @Override
         public void doneIgnored()
         {
             throw new ClientException(
                     "Invalid server response message `IGNORED` received for client message `INIT`." );
         }
-    };
+
+        @Override
+        public void server( String server )
+        {
+            this.server = server;
+        }
+
+        public String server()
+        {
+            return server;
+        }
+    }
 
     StreamCollector RESET = new ResetStreamCollector();
 
@@ -146,16 +158,13 @@ public void doneIgnored()
         }
 
         @Override
-        public void resultAvailableAfter( long l )
-        {
-
-        }
+        public void resultAvailableAfter( long l ) {}
 
         @Override
-        public void resultConsumedAfter( long l )
-        {
+        public void resultConsumedAfter( long l ) {}
 
-        }
+        @Override
+        public void server( String server ){}
     }
 
     // TODO: This should be modified to simply have head/record/tail methods
@@ -185,5 +194,7 @@ public void resultConsumedAfter( long l )
     void resultAvailableAfter( long l );
 
     void resultConsumedAfter( long l );
+
+    void server( String server );
 }
 

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

@@ -163,6 +163,12 @@ public void resultConsumedAfter( long l )
         this.resultConsumedAfter = l;
     }
 
+    @Override
+    public void server( String server )
+    {
+        // intentionally empty
+    }
+
     public ResultSummary build()
     {
         return new ResultSummary()

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

@@ -75,4 +75,10 @@ public interface Session extends Resource, StatementRunner
      */
     @Override
     void close();
+
+    /**
+     * Returns a string telling which version of the server the session is connected to.
+     * @return The server version of <code>null</code> if not available.
+     */
+    String server();
 }

driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java

@@ -34,6 +34,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -48,7 +49,7 @@ public class SessionIT
     public void shouldKnowSessionIsClosed() throws Throwable
     {
         // Given
-        try( Driver driver =  GraphDatabase.driver( neo4j.uri() ); )
+        try( Driver driver =  GraphDatabase.driver( neo4j.uri() ) )
         {
             Session session = driver.session();
 
@@ -173,6 +174,19 @@ public void shouldKillLongStreamingResult() throws Throwable
         }
     }
 
+    @Test
+    public void shouldShowServerVersion() throws Throwable
+    {
+        // Given
+        try( Driver driver = GraphDatabase.driver( neo4j.uri() ) )
+        {
+            try ( Session session = driver.session() )
+            {
+                assertNotNull( session.server() );
+            }
+        }
+    }
+
     private void resetSessionAfterTimeout( final Session session, final int timeout )
     {
         new Thread( new Runnable()

driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java

@@ -24,11 +24,11 @@
 import java.util.Map;
 
 import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.driver.v1.Session;
+import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.driver.v1.Transaction;
-import org.neo4j.driver.v1.types.TypeSystem;
 import org.neo4j.driver.v1.Value;
+import org.neo4j.driver.v1.types.TypeSystem;
 
 /**
  * A little utility for integration testing, this provides tests with a session they can work with.
@@ -94,6 +94,12 @@ public void close()
         throw new UnsupportedOperationException( "Disallowed on this test session" );
     }
 
+    @Override
+    public String server()
+    {
+        return realSession.server();
+    }
+
     @Override
     public Transaction beginTransaction()
     {