Refactoring (#1474)

neo4j · Aug 2, 2023 · 80fd687 · 80fd687
1 parent f3984a2
commit 80fd687
Show file tree

Hide file tree

Showing 67 changed files with 170 additions and 42 deletions.
diff --git a/driver/src/main/java/org/neo4j/driver/TransactionWork.java b/driver/src/main/java/org/neo4j/driver/TransactionWork.java
@@ -26,6 +26,7 @@
  * @deprecated superseded by {@link TransactionCallback}.
  */
 @Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
 public interface TransactionWork<T> {
     /**
      * Executes all given operations against the same transaction.

diff --git a/driver/src/main/java/org/neo4j/driver/async/AsyncTransactionWork.java b/driver/src/main/java/org/neo4j/driver/async/AsyncTransactionWork.java
@@ -27,6 +27,7 @@
  * @deprecated superseded by {@link AsyncTransactionCallback}.
  */
 @Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
 public interface AsyncTransactionWork<T> {
     /**
      * Executes all given operations against the same transaction.

diff --git a/driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java b/driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java
@@ -310,6 +310,7 @@ private CompletionStage<ClusterComposition> lookupOnRouter(
                 });
     }
 
+    @SuppressWarnings("ThrowableNotThrown")
     private ClusterComposition handleRoutingProcedureError(
             Throwable error, RoutingTable routingTable, BoltServerAddress routerAddress, Throwable baseError) {
         if (mustAbortDiscovery(error)) {

diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/RunResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/RunResponseHandler.java
@@ -61,6 +61,7 @@ public void onSuccess(Map<String, Value> metadata) {
     }
 
     @Override
+    @SuppressWarnings("ThrowableNotThrown")
     public void onFailure(Throwable error) {
         if (tx != null) {
             tx.markTerminated(error);

diff --git a/...in/java/org/neo4j/driver/internal/handlers/TransactionPullResponseCompletionListener.java b/...in/java/org/neo4j/driver/internal/handlers/TransactionPullResponseCompletionListener.java
@@ -35,6 +35,7 @@ public TransactionPullResponseCompletionListener(UnmanagedTransaction tx) {
     public void afterSuccess(Map<String, Value> metadata) {}
 
     @Override
+    @SuppressWarnings("ThrowableNotThrown")
     public void afterFailure(Throwable error) {
         // always mark transaction as terminated because every error is "acknowledged" with a RESET message
         // so database forgets about the transaction after the first error

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/common/CommonValuePacker.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/common/CommonValuePacker.java
@@ -173,6 +173,7 @@ private void packLocalDateTime(LocalDateTime localDateTime) throws IOException {
         packer.pack(nano);
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private void packZonedDateTimeUsingUtcBaseline(ZonedDateTime zonedDateTime) throws IOException {
         var instant = zonedDateTime.toInstant();
         var epochSecondLocal = instant.getEpochSecond();
@@ -196,6 +197,7 @@ private void packZonedDateTimeUsingUtcBaseline(ZonedDateTime zonedDateTime) thro
         }
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private void packZonedDateTime(ZonedDateTime zonedDateTime) throws IOException {
         var epochSecondLocal = zonedDateTime.toLocalDateTime().toEpochSecond(UTC);
         var nano = zonedDateTime.getNano();

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/common/CommonValueUnpacker.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/common/CommonValueUnpacker.java
@@ -277,6 +277,7 @@ protected Value unpackRelationship() throws IOException {
         return new RelationshipValue(adapted);
     }
 
+    @SuppressWarnings("DuplicatedCode")
     protected InternalNode unpackNode() throws IOException {
         var urn = unpacker.unpackLong();
 
@@ -295,7 +296,7 @@ protected InternalNode unpackNode() throws IOException {
         return new InternalNode(urn, String.valueOf(urn), labels, props);
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({"deprecation", "DuplicatedCode"})
     protected Value unpackPath() throws IOException {
         // List of unique nodes
         var uniqNodes = new Node[(int) unpacker.unpackListHeader()];

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4.java
@@ -48,6 +48,7 @@ public MessageWriterV4(PackOutput output) {
         super(new CommonValuePacker(output, false), buildEncoders());
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private static Map<Byte, MessageEncoder> buildEncoders() {
         Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
         result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43.java
@@ -56,6 +56,7 @@ public MessageWriterV43(PackOutput output, boolean dateTimeUtcEnabled) {
         super(new CommonValuePacker(output, dateTimeUtcEnabled), buildEncoders());
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private static Map<Byte, MessageEncoder> buildEncoders() {
         Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
         result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44.java
@@ -53,6 +53,7 @@ public MessageWriterV44(PackOutput output, boolean dateTimeUtcEnabled) {
         super(new CommonValuePacker(output, dateTimeUtcEnabled), buildEncoders());
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private static Map<Byte, MessageEncoder> buildEncoders() {
         Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
         result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v5/MessageWriterV5.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v5/MessageWriterV5.java
@@ -50,6 +50,7 @@ public MessageWriterV5(PackOutput output) {
         super(new CommonValuePacker(output, true), buildEncoders());
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private static Map<Byte, MessageEncoder> buildEncoders() {
         Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
         result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v5/ValueUnpackerV5.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v5/ValueUnpackerV5.java
@@ -55,6 +55,7 @@ protected int getRelationshipFields() {
         return RELATIONSHIP_FIELDS;
     }
 
+    @SuppressWarnings("DuplicatedCode")
     @Override
     protected InternalNode unpackNode() throws IOException {
         var urn = unpacker.unpackLong();
@@ -76,6 +77,7 @@ protected InternalNode unpackNode() throws IOException {
         return new InternalNode(urn, elementId, labels, props);
     }
 
+    @SuppressWarnings("DuplicatedCode")
     @Override
     protected Value unpackPath() throws IOException {
         // List of unique nodes

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/v51/MessageWriterV51.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/v51/MessageWriterV51.java
@@ -54,6 +54,7 @@ public MessageWriterV51(PackOutput output) {
         super(new CommonValuePacker(output, true), buildEncoders());
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private static Map<Byte, MessageEncoder> buildEncoders() {
         Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
         result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java
@@ -346,6 +346,7 @@ public void packBytesHeader(int size) throws IOException {
             }
         }
 
+        @SuppressWarnings("DuplicatedCode")
         private void packStringHeader(int size) throws IOException {
             if (size < 0x10) {
                 out.writeByte((byte) (TINY_STRING | size));
@@ -358,6 +359,7 @@ private void packStringHeader(int size) throws IOException {
             }
         }
 
+        @SuppressWarnings("DuplicatedCode")
         public void packListHeader(int size) throws IOException {
             if (size < 0x10) {
                 out.writeByte((byte) (TINY_LIST | size));
@@ -370,6 +372,7 @@ public void packListHeader(int size) throws IOException {
             }
         }
 
+        @SuppressWarnings("DuplicatedCode")
         public void packMapHeader(int size) throws IOException {
             if (size < 0x10) {
                 out.writeByte((byte) (TINY_MAP | size));

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
@@ -62,6 +62,7 @@ Publisher<S> doBeginTransaction(TransactionConfig config) {
         return doBeginTransaction(config, null);
     }
 
+    @SuppressWarnings("DuplicatedCode")
     protected Publisher<S> doBeginTransaction(TransactionConfig config, String txType) {
         return createSingleItemPublisher(
                 () -> {
@@ -80,6 +81,7 @@ protected Publisher<S> doBeginTransaction(TransactionConfig config, String txTyp
                 tx -> Mono.fromDirect(closeTransaction(tx, false)).subscribe());
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private Publisher<S> beginTransaction(AccessMode mode, TransactionConfig config) {
         return createSingleItemPublisher(
                 () -> {
@@ -101,21 +103,24 @@ private Publisher<S> beginTransaction(AccessMode mode, TransactionConfig config)
     @SuppressWarnings("deprecation")
     protected <T> Publisher<T> runTransaction(
             AccessMode mode, Function<S, ? extends Publisher<T>> work, TransactionConfig config) {
-        work = work.andThen(publisher -> Flux.from(publisher).map(value -> {
+        work = work.andThen(publisher -> Flux.from(publisher).handle((value, sink) -> {
             if (value instanceof ReactiveResult) {
-                throw new ClientException(String.format(
+                sink.error(new ClientException(String.format(
                         "%s is not a valid return value, it should be consumed before producing a return value",
-                        ReactiveResult.class.getName()));
+                        ReactiveResult.class.getName())));
+                return;
             } else if (value instanceof org.neo4j.driver.reactive.ReactiveResult) {
-                throw new ClientException(String.format(
+                sink.error(new ClientException(String.format(
                         "%s is not a valid return value, it should be consumed before producing a return value",
-                        org.neo4j.driver.reactive.ReactiveResult.class.getName()));
+                        org.neo4j.driver.reactive.ReactiveResult.class.getName())));
+                return;
             } else if (value instanceof RxResult) {
-                throw new ClientException(String.format(
+                sink.error(new ClientException(String.format(
                         "%s is not a valid return value, it should be consumed before producing a return value",
-                        RxResult.class.getName()));
+                        RxResult.class.getName())));
+                return;
             }
-            return value;
+            sink.next(value);
         }));
         var repeatableWork = Flux.usingWhen(
                 beginTransaction(mode, config),

diff --git a/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalReactiveTransaction.java b/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalReactiveTransaction.java
@@ -37,6 +37,7 @@ protected InternalReactiveTransaction(UnmanagedTransaction tx) {
     }
 
     @Override
+    @SuppressWarnings({"ThrowableNotThrown", "DuplicatedCode"})
     public Publisher<ReactiveResult> run(Query query) {
         CompletionStage<RxResultCursor> cursorStage;
         try {

diff --git a/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxResult.java b/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxResult.java
@@ -36,6 +36,7 @@
 import reactor.core.publisher.Mono;
 
 @Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
 public class InternalRxResult implements RxResult {
     private Supplier<CompletionStage<RxResultCursor>> cursorFutureSupplier;
     private volatile CompletionStage<RxResultCursor> cursorFuture;

diff --git a/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxSession.java b/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxSession.java
@@ -37,6 +37,7 @@
 import org.reactivestreams.Publisher;
 
 @Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
 public class InternalRxSession extends AbstractReactiveSession<RxTransaction> implements RxSession {
     public InternalRxSession(NetworkSession session) {
         super(session);

diff --git a/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxTransaction.java b/driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxTransaction.java
@@ -28,12 +28,14 @@
 import org.reactivestreams.Publisher;
 
 @Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
 public class InternalRxTransaction extends AbstractReactiveTransaction implements RxTransaction {
     public InternalRxTransaction(UnmanagedTransaction tx) {
         super(tx);
     }
 
     @Override
+    @SuppressWarnings("ThrowableNotThrown")
     public RxResult run(Query query) {
         return new InternalRxResult(() -> {
             var cursorFuture = new CompletableFuture<RxResultCursor>();

diff --git a/.../src/main/java/org/neo4j/driver/internal/reactivestreams/InternalReactiveTransaction.java b/.../src/main/java/org/neo4j/driver/internal/reactivestreams/InternalReactiveTransaction.java
@@ -36,6 +36,7 @@ protected InternalReactiveTransaction(UnmanagedTransaction tx) {
     }
 
     @Override
+    @SuppressWarnings({"ThrowableNotThrown", "DuplicatedCode"})
     public Publisher<ReactiveResult> run(Query query) {
         CompletionStage<RxResultCursor> cursorStage;
         try {

diff --git a/driver/src/main/java/org/neo4j/driver/reactive/RxTransactionWork.java b/driver/src/main/java/org/neo4j/driver/reactive/RxTransactionWork.java
@@ -27,6 +27,7 @@
  * @deprecated superseded by {@link org.neo4j.driver.reactive.ReactiveTransactionCallback} and {@link org.neo4j.driver.reactivestreams.ReactiveTransactionCallback}
  */
 @Deprecated
+@SuppressWarnings("DeprecatedIsStillUsed")
 public interface RxTransactionWork<T> {
     /**
      * Executes all given operations against the same transaction.

diff --git a/driver/src/main/java/org/neo4j/driver/types/Relationship.java b/driver/src/main/java/org/neo4j/driver/types/Relationship.java
@@ -32,6 +32,7 @@ public interface Relationship extends Entity {
      * @deprecated superseded by {@link #startNodeElementId()}
      */
     @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
     long startNodeId();
 
     /**
@@ -50,6 +51,7 @@ public interface Relationship extends Entity {
      * @deprecated superseded by {@link #endNodeElementId()}
      */
     @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
     long endNodeId();
 
     /**