Refactoring (#1477)

injectives · web-flow · commit 53a29e36526a · 2023-08-08T09:59:23.000+01:00
diff --git a/driver/pom.xml b/driver/pom.xml
@@ -79,10 +79,6 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.junit.support</groupId>
-      <artifactId>testng-engine</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.rauschig</groupId>
       <artifactId>jarchivelib</artifactId>
@@ -263,6 +259,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit-platform</artifactId>
+            <version>${surefire.and.failsafe.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-testng</artifactId>
+            <version>${surefire.and.failsafe.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/driver/src/main/java/org/neo4j/driver/Values.java b/driver/src/main/java/org/neo4j/driver/Values.java
@@ -610,7 +610,7 @@ public static Value parameters(Object... keysAndValues) {
      * @return a function that returns the value passed into it - the identity function
      */
     public static Function<Value, Value> ofValue() {
-        return val -> val;
+        return Function.identity();
     }
 
     /**
diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/NetworkSession.java b/driver/src/main/java/org/neo4j/driver/internal/async/NetworkSession.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import org.neo4j.driver.AccessMode;
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.Bookmark;
@@ -112,7 +113,7 @@ public CompletionStage<ResultCursor> runAsync(Query query, TransactionConfig con
         resultCursorStage = newResultCursorStage.exceptionally(error -> null);
         return newResultCursorStage
                 .thenCompose(AsyncResultCursor::mapSuccessfulRunCompletionAsync)
-                .thenApply(cursor -> cursor); // convert the return type
+                .thenApply(Function.identity()); // convert the return type
     }
 
     public CompletionStage<RxResultCursor> runRx(
@@ -320,7 +321,7 @@ private CompletionStage<Throwable> closeTransactionAndReleaseConnection() {
                         // there exists an open transaction, let's close it and propagate the error, if any
                         return tx.closeAsync()
                                 .thenApply(ignore -> (Throwable) null)
-                                .exceptionally(error -> error);
+                                .exceptionally(Function.identity());
                     }
                     // no open transaction so nothing to close
                     return completedWithNull();
diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/UnmanagedTransaction.java b/driver/src/main/java/org/neo4j/driver/internal/async/UnmanagedTransaction.java
@@ -169,7 +169,7 @@ public CompletionStage<ResultCursor> runAsync(Query query) {
         resultCursors.add(cursorStage);
         return cursorStage
                 .thenCompose(AsyncResultCursor::mapSuccessfulRunCompletionAsync)
-                .thenApply(cursor -> cursor);
+                .thenApply(Function.identity());
     }
 
     public CompletionStage<RxResultCursor> runRx(Query query) {
diff --git a/driver/src/main/java/org/neo4j/driver/internal/reactive/AbstractReactiveSession.java b/driver/src/main/java/org/neo4j/driver/internal/reactive/AbstractReactiveSession.java
@@ -202,7 +202,7 @@ private CompletionStage<RxResultCursor> runAsStage(
                         }
                     }
                 })
-                .thenCompose(stage -> stage);
+                .thenCompose(Function.identity());
     }
 
     private <T> CompletionStage<T> releaseConnectionAndRethrow(Throwable throwable) {
diff --git a/driver/src/test/java/org/neo4j/driver/integration/QueryRunnerCloseIT.java b/driver/src/test/java/org/neo4j/driver/integration/QueryRunnerCloseIT.java
@@ -23,6 +23,7 @@
 import static org.neo4j.driver.testutil.TestUtil.await;
 
 import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -67,7 +68,7 @@ void shouldErrorToAccessRecordsAfterConsume() {
         assertThrows(ResultConsumedException.class, result::peek);
         assertThrows(ResultConsumedException.class, () -> result.stream().toArray());
         assertThrows(ResultConsumedException.class, () -> result.forEachRemaining(record -> {}));
-        assertThrows(ResultConsumedException.class, () -> result.list(record -> record));
+        assertThrows(ResultConsumedException.class, () -> result.list(Function.identity()));
     }
 
     @Test
@@ -88,7 +89,7 @@ void shouldErrorToAccessRecordsAfterClose() {
         assertThrows(ResultConsumedException.class, result::peek);
         assertThrows(ResultConsumedException.class, () -> result.stream().toArray());
         assertThrows(ResultConsumedException.class, () -> result.forEachRemaining(record -> {}));
-        assertThrows(ResultConsumedException.class, () -> result.list(record -> record));
+        assertThrows(ResultConsumedException.class, () -> result.list(Function.identity()));
     }
 
     @Test
@@ -145,7 +146,7 @@ void shouldErrorToAccessRecordsAfterConsumeAsync() {
         assertThrows(ResultConsumedException.class, () -> await(result.singleAsync()));
         assertThrows(ResultConsumedException.class, () -> await(result.forEachAsync(record -> {})));
         assertThrows(ResultConsumedException.class, () -> await(result.listAsync()));
-        assertThrows(ResultConsumedException.class, () -> await(result.listAsync(record -> record)));
+        assertThrows(ResultConsumedException.class, () -> await(result.listAsync(Function.identity())));
     }
 
     @Test
@@ -164,7 +165,7 @@ void shouldErrorToAccessRecordsAfterCloseAsync() {
         assertThrows(ResultConsumedException.class, () -> await(result.singleAsync()));
         assertThrows(ResultConsumedException.class, () -> await(result.forEachAsync(record -> {})));
         assertThrows(ResultConsumedException.class, () -> await(result.listAsync()));
-        assertThrows(ResultConsumedException.class, () -> await(result.listAsync(record -> record)));
+        assertThrows(ResultConsumedException.class, () -> await(result.listAsync(Function.identity())));
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveSessionIT.java
@@ -127,7 +127,7 @@ public void onComplete() {
                             return subscription;
                         });
                     }))
-                    .map(future -> future.thenCompose(itself -> itself))
+                    .map(future -> future.thenCompose(Function.identity()))
                     .toArray(CompletableFuture[]::new);
 
             CompletableFuture.allOf(subscriptionFutures).join();
diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveStreamsSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveStreamsSessionIT.java
@@ -117,7 +117,7 @@ protected void hookOnNext(@NonNull ReactiveResult result) {
                             return subscription;
                         });
                     }))
-                    .map(future -> future.thenCompose(itself -> itself))
+                    .map(future -> future.thenCompose(Function.identity()))
                     .toArray(CompletableFuture[]::new);
 
             CompletableFuture.allOf(subscriptionFutures).join();
diff --git a/driver/src/test/java/org/neo4j/driver/internal/cursor/DisposableAsyncResultCursorTest.java b/driver/src/test/java/org/neo4j/driver/internal/cursor/DisposableAsyncResultCursorTest.java
@@ -30,6 +30,7 @@
 import static org.neo4j.driver.testutil.TestUtil.await;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.neo4j.driver.internal.util.Futures;
@@ -84,7 +85,7 @@ void shouldNotDisposeCursor() {
         await(cursor.singleAsync());
         await(cursor.forEachAsync(record -> {}));
         await(cursor.listAsync());
-        await(cursor.listAsync(record -> record));
+        await(cursor.listAsync(Function.identity()));
         await(cursor.pullAllFailureAsync());
 
         // Then
diff --git a/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java b/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
@@ -701,7 +702,7 @@ private void assertMap(int size) throws Throwable {
         var packer = machine.packer();
         var map = IntStream.range(0, size)
                 .boxed()
-                .collect(Collectors.toMap(i -> Integer.toString(i), i -> i, (a, b) -> b, HashMap::new));
+                .collect(Collectors.toMap(i -> Integer.toString(i), Function.identity(), (a, b) -> b, HashMap::new));
         packer.pack(map);
 
         // Then
diff --git a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java
@@ -497,8 +497,9 @@ private static Bookmark createNodesAsync(int batchCount, Driver driver) throws T
             writeTransactions = writeTransactions.thenCompose(ignore -> session.writeTransactionAsync(
                     tx -> createNodesInTxAsync(tx, batchIndex, AbstractStressTestBase.BIG_DATA_TEST_BATCH_SIZE)));
         }
-        writeTransactions =
-                writeTransactions.exceptionally(error -> error).thenCompose(error -> safeCloseSession(session, error));
+        writeTransactions = writeTransactions
+                .exceptionally(Function.identity())
+                .thenCompose(error -> safeCloseSession(session, error));
 
         var error = Futures.blockingGet(writeTransactions);
         if (error != null) {
@@ -532,7 +533,7 @@ private static void readNodesAsync(Driver driver, Bookmark bookmark) throws Thro
                             verifyNodeProperties(node);
                         })))
                 .thenApply(summary -> (Throwable) null)
-                .exceptionally(error -> error)
+                .exceptionally(Function.identity())
                 .thenCompose(error -> safeCloseSession(session, error));
 
         var error = Futures.blockingGet(readQuery);
@@ -628,7 +629,7 @@ private static CompletionStage<Throwable> createNodesInTxAsync(
 
         return CompletableFuture.allOf(queryFutures)
                 .thenApply(ignored -> (Throwable) null)
-                .exceptionally(error -> error);
+                .exceptionally(Function.identity());
     }
 
     private static CompletableFuture<Void> createNodeInTxAsync(AsyncTransaction tx, int nodeIndex) {
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,8 @@
     <hamcrest.version>2.2</hamcrest.version>
     <mockito-core.version>5.4.0</mockito-core.version>
     <junit.version>5.10.0</junit.version>
-    <testng-engine.version>1.0.4</testng-engine.version>
+    <!-- supply a newer version than the one supplied by the reactive-streams 1.0.4 -->
+    <testng.version>7.8.0</testng.version>
     <jarchivelib.version>1.2.0</jarchivelib.version>
     <bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
     <logback-classic.version>1.2.12</logback-classic.version>
@@ -153,16 +154,9 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.junit.support</groupId>
-        <artifactId>testng-engine</artifactId>
-        <version>${testng-engine.version}</version>
-        <exclusions>
-          <exclusion>
-            <!-- Use the version supplied by the org.junit.jupiter:junit-jupiter -->
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-engine</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>org.testng</groupId>
+        <artifactId>testng</artifactId>
+        <version>${testng.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ public static Value parameters(Object... keysAndValues) {`
`610`	`610`	`* @return a function that returns the value passed into it - the identity function`
`611`	`611`	`*/`
`612`	`612`	`public static Function<Value, Value> ofValue() {`
`613`		`- return val -> val;`
	`613`	`+ return Function.identity();`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public CompletionStage<ResultCursor> runAsync(Query query) {`
`169`	`169`	`resultCursors.add(cursorStage);`
`170`	`170`	`return cursorStage`
`171`	`171`	`.thenCompose(AsyncResultCursor::mapSuccessfulRunCompletionAsync)`
`172`		`- .thenApply(cursor -> cursor);`
	`172`	`+ .thenApply(Function.identity());`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`public CompletionStage<RxResultCursor> runRx(Query query) {`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private CompletionStage<RxResultCursor> runAsStage(`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`	`})`
`205`		`- .thenCompose(stage -> stage);`
	`205`	`+ .thenCompose(Function.identity());`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`private <T> CompletionStage<T> releaseConnectionAndRethrow(Throwable throwable) {`