Couple small cleanups

lutovich · lutovich · commit cc6e52058501 · 2017-10-19T11:28:40.000+02:00
diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/PullAllResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/PullAllResponseHandler.java
@@ -236,7 +236,7 @@ private Throwable extractFailure()
     {
         if ( failure == null )
         {
-            throw new IllegalStateException( "Can't consume failure because it does not exist" );
+            throw new IllegalStateException( "Can't extract failure because it does not exist" );
         }
 
         Throwable error = failure;
diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/Futures.java b/driver/src/main/java/org/neo4j/driver/internal/util/Futures.java
@@ -26,8 +26,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
 public final class Futures
 {
     private Futures()
@@ -118,16 +116,4 @@ public static Throwable completionErrorCause( Throwable error )
         }
         return error;
     }
-
-    public static <T> CompletionStage<T> firstNotNull( CompletionStage<T> stage1, CompletionStage<T> stage2 )
-    {
-        return stage1.thenCompose( value ->
-        {
-            if ( value != null )
-            {
-                return completedFuture( value );
-            }
-            return stage2;
-        } );
-    }
 }
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java
@@ -726,7 +726,6 @@ public void shouldBeginTxAfterRunFailureToAcquireConnection()
     }
 
     @Test
-<<<<<<<HEAD
     public void shouldExecuteReadTransactionUntilSuccessWhenWorkThrows()
     {
         int maxFailures = 1;
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java
@@ -1119,8 +1119,7 @@ public void shouldExecuteTransactionWorkInCallerThread()
         int maxFailures = 3;
         Thread callerThread = Thread.currentThread();
 
-        try ( Driver driver = newDriver();
-              Session session = driver.session() )
+        try ( Session session = neo4j.driver().session() )
         {
             String result = session.readTransaction( new TransactionWork<String>()
             {
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java
@@ -969,8 +969,6 @@ public void shouldFailToCommitWhenQueriesFailAndErrorNotConsumed() throws Interr
         tx.runAsync( "RETURN 10 / 0" );
         tx.runAsync( "CREATE (:TestNode)" );
 
-        Thread.sleep( 1000 );
-
         try
         {
             getBlocking( tx.commitAsync() );

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ private Throwable extractFailure()`
`236`	`236`	`{`
`237`	`237`	`if ( failure == null )`
`238`	`238`	`{`
`239`		`- throw new IllegalStateException( "Can't consume failure because it does not exist" );`
	`239`	`+ throw new IllegalStateException( "Can't extract failure because it does not exist" );`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`Throwable error = failure;`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@`
`26`	`26`	`import java.util.concurrent.ExecutionException;`
`27`	`27`	`import java.util.concurrent.Future;`
`28`	`28`
`29`		`-import static java.util.concurrent.CompletableFuture.completedFuture;`
`30`		`-`
`31`	`29`	`public final class Futures`
`32`	`30`	`{`
`33`	`31`	`private Futures()`
`@@ -118,16 +116,4 @@ public static Throwable completionErrorCause( Throwable error )`
`118`	`116`	`}`
`119`	`117`	`return error;`
`120`	`118`	`}`
`121`		`-`
`122`		`- public static <T> CompletionStage<T> firstNotNull( CompletionStage<T> stage1, CompletionStage<T> stage2 )`
`123`		`- {`
`124`		`- return stage1.thenCompose( value ->`
`125`		`- {`
`126`		`- if ( value != null )`
`127`		`- {`
`128`		`- return completedFuture( value );`
`129`		`- }`
`130`		`- return stage2;`
`131`		`- } );`
`132`		`- }`
`133`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,6 @@ public void shouldBeginTxAfterRunFailureToAcquireConnection()`
`726`	`726`	`}`
`727`	`727`
`728`	`728`	`@Test`
`729`		`-<<<<<<<HEAD`
`730`	`729`	`public void shouldExecuteReadTransactionUntilSuccessWhenWorkThrows()`
`731`	`730`	`{`
`732`	`731`	`int maxFailures = 1;`
Original file line number	Diff line number	Diff line change
`@@ -1119,8 +1119,7 @@ public void shouldExecuteTransactionWorkInCallerThread()`
`1119`	`1119`	`int maxFailures = 3;`
`1120`	`1120`	`Thread callerThread = Thread.currentThread();`
`1121`	`1121`
`1122`		`- try ( Driver driver = newDriver();`
`1123`		`- Session session = driver.session() )`
	`1122`	`+ try ( Session session = neo4j.driver().session() )`
`1124`	`1123`	`{`
`1125`	`1124`	`String result = session.readTransaction( new TransactionWork<String>()`
`1126`	`1125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -969,8 +969,6 @@ public void shouldFailToCommitWhenQueriesFailAndErrorNotConsumed() throws Interr`
`969`	`969`	`tx.runAsync( "RETURN 10 / 0" );`
`970`	`970`	`tx.runAsync( "CREATE (:TestNode)" );`
`971`	`971`
`972`		`- Thread.sleep( 1000 );`
`973`		`-`
`974`	`972`	`try`
`975`	`973`	`{`
`976`	`974`	`getBlocking( tx.commitAsync() );`