Merge branch 1.6 into 1.7

lutovich · lutovich · commit 590f0575dec7 · 2018-09-27T14:20:30.000+02:00
diff --git a/driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java b/driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java
@@ -57,6 +57,7 @@
 import org.neo4j.driver.v1.Record;
 import org.neo4j.driver.v1.Session;
 import org.neo4j.driver.v1.StatementResult;
+import org.neo4j.driver.v1.StatementResultCursor;
 import org.neo4j.driver.v1.Transaction;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.util.DaemonThreadFactory;
@@ -549,11 +550,11 @@ private static void createNodeInTx( Transaction tx, boolean async, int nodeIndex
 
         if ( async )
         {
-            tx.runAsync( query, params );
+            tx.runAsync( query, params ).thenCompose( StatementResultCursor::consumeAsync );
         }
         else
         {
-            tx.run( query, params );
+            tx.run( query, params ).consume();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@`
`57`	`57`	`import org.neo4j.driver.v1.Record;`
`58`	`58`	`import org.neo4j.driver.v1.Session;`
`59`	`59`	`import org.neo4j.driver.v1.StatementResult;`
	`60`	`+import org.neo4j.driver.v1.StatementResultCursor;`
`60`	`61`	`import org.neo4j.driver.v1.Transaction;`
`61`	`62`	`import org.neo4j.driver.v1.types.Node;`
`62`	`63`	`import org.neo4j.driver.v1.util.DaemonThreadFactory;`
`@@ -549,11 +550,11 @@ private static void createNodeInTx( Transaction tx, boolean async, int nodeIndex`
`549`	`550`
`550`	`551`	`if ( async )`
`551`	`552`	`{`
`552`		`- tx.runAsync( query, params );`
	`553`	`+ tx.runAsync( query, params ).thenCompose( StatementResultCursor::consumeAsync );`
`553`	`554`	`}`
`554`	`555`	`else`
`555`	`556`	`{`
`556`		`- tx.run( query, params );`
	`557`	`+ tx.run( query, params ).consume();`
`557`	`558`	`}`
`558`	`559`	`}`
`559`	`560`