Merge pull request #130 from pontusmelke/1.0-null-collector

Make sure collector is not null

Author: jakewins

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

@@ -22,6 +22,7 @@
 import java.util.Map;
 
 import org.neo4j.driver.internal.spi.Connection;
+import org.neo4j.driver.internal.spi.StreamCollector;
 import org.neo4j.driver.internal.types.InternalTypeSystem;
 import org.neo4j.driver.v1.ResultCursor;
 import org.neo4j.driver.v1.Statement;
@@ -68,7 +69,7 @@ public InternalTransaction( Connection conn, Runnable cleanup )
         this.cleanup = cleanup;
 
         // Note there is no sync here, so this will just value queued locally
-        conn.run( "BEGIN", Collections.<String, Value>emptyMap(), null );
+        conn.run( "BEGIN", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP );
         conn.discardAll();
     }
 
@@ -106,7 +107,7 @@ public void close()
             {
                 if ( state == State.MARKED_SUCCESS )
                 {
-                    conn.run( "COMMIT", Collections.<String, Value>emptyMap(), null );
+                    conn.run( "COMMIT", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP );
                     conn.discardAll();
                     conn.sync();
                     state = State.SUCCEEDED;
@@ -115,7 +116,7 @@ else if ( state == State.MARKED_FAILED || state == State.ACTIVE )
                 {
                     // If alwaysValid of the things we've put in the queue have been sent off, there is no need to
                     // do this, we could just clear the queue. Future optimization.
-                    conn.run( "ROLLBACK", Collections.<String, Value>emptyMap(), null );
+                    conn.run( "ROLLBACK", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP );
                     conn.discardAll();
                     conn.sync();
                     state = State.ROLLED_BACK;

driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java

@@ -82,16 +82,13 @@ public void handleFailureMessage( String code, String message )
     public void handleSuccessMessage( Map<String,Value> meta )
     {
         StreamCollector collector = collectors.remove();
-        if ( collector != null )
-        {
-            collectFields( collector, meta.get( "fields" ) );
-            collectType( collector, meta.get( "type" ) );
-            collectStatistics( collector, meta.get( "stats" ) );
-            collectPlan( collector, meta.get( "plan" ) );
-            collectProfile( collector, meta.get( "profile" ) );
-            collectNotifications( collector, meta.get( "notifications" ) );
-            collector.done();
-        }
+        collectFields( collector, meta.get( "fields" ) );
+        collectType( collector, meta.get( "type" ) );
+        collectStatistics( collector, meta.get( "stats" ) );
+        collectPlan( collector, meta.get( "plan" ) );
+        collectProfile( collector, meta.get( "profile" ) );
+        collectNotifications( collector, meta.get( "notifications" ) );
+        collector.done();
     }
 
     private void collectNotifications( StreamCollector collector, Value notifications )
@@ -121,7 +118,7 @@ private void collectProfile( StreamCollector collector, Value plan )
 
     private void collectFields( StreamCollector collector, Value fieldValue )
     {
-        if (fieldValue != null)
+        if ( fieldValue != null )
         {
             if ( !fieldValue.isEmpty() )
             {
@@ -211,6 +208,8 @@ public void handleRunMessage( String statement, Map<String,Value> parameters )
 
     public void appendResultCollector( StreamCollector collector )
     {
+        assert collector != null;
+
         collectors.add( collector );
     }
 

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

@@ -18,12 +18,13 @@
  */
 package org.neo4j.driver.internal;
 
-import java.util.Collections;
-
 import org.junit.Test;
 import org.mockito.InOrder;
 
+import java.util.Collections;
+
 import org.neo4j.driver.internal.spi.Connection;
+import org.neo4j.driver.internal.spi.StreamCollector;
 import org.neo4j.driver.v1.Value;
 
 import static org.mockito.Mockito.inOrder;
@@ -48,10 +49,10 @@ public void shouldRollbackOnImplicitFailure() throws Throwable
 
         // Then
         InOrder order = inOrder( conn );
-        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), null );
+        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP );
         order.verify( conn ).discardAll();
         order.verify( conn ).isOpen();
-        order.verify( conn ).run( "ROLLBACK", Collections.<String, Value>emptyMap(), null );
+        order.verify( conn ).run( "ROLLBACK", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP );
         order.verify( conn ).discardAll();
         order.verify( conn ).sync();
         verify( cleanup ).run();
@@ -74,10 +75,10 @@ public void shouldRollbackOnExplicitFailure() throws Throwable
 
         // Then
         InOrder order = inOrder( conn );
-        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), null );
+        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP);
         order.verify( conn ).discardAll();
         order.verify( conn ).isOpen();
-        order.verify( conn ).run( "ROLLBACK", Collections.<String, Value>emptyMap(), null );
+        order.verify( conn ).run( "ROLLBACK", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP);
         order.verify( conn ).discardAll();
         order.verify( conn ).sync();
         verify( cleanup ).run();
@@ -100,10 +101,10 @@ public void shouldCommitOnSuccess() throws Throwable
         // Then
 
         InOrder order = inOrder( conn );
-        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), null );
+        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP);
         order.verify( conn ).discardAll();
         order.verify( conn ).isOpen();
-        order.verify( conn ).run( "COMMIT", Collections.<String, Value>emptyMap(), null );
+        order.verify( conn ).run( "COMMIT", Collections.<String, Value>emptyMap(), StreamCollector.NO_OP);
         order.verify( conn ).discardAll();
         order.verify( conn ).sync();
         verify( cleanup ).run();