neo4j · injectives · Oct 24, 2023 · Oct 20, 2023
diff --git a/driver/src/main/java/org/neo4j/driver/Result.java b/driver/src/main/java/org/neo4j/driver/Result.java
@@ -36,7 +36,6 @@
  * Results are valid until the next query is run or until the end of the current transaction,
  * whichever comes first. To keep a result around while further queries are run, or to use a result outside the scope
  * of the current transaction, see {@link #list()}.
- *
  * <h2>Important note on semantics</h2>
  *
  * In order to handle very large results, and to minimize memory overhead and maximize

diff --git a/driver/src/main/java/org/neo4j/driver/Session.java b/driver/src/main/java/org/neo4j/driver/Session.java
@@ -260,7 +260,6 @@ default void executeWriteWithoutResult(Consumer<TransactionContext> contextConsu
      * This version of run takes a {@link Map} of parameters. The values in the map
      * must be values that can be converted to Neo4j types. See {@link Values#parameters(Object...)} for
      * a list of allowed types.
-     *
      * <h4>Example</h4>
      * <pre>
      * {@code

diff --git a/driver/src/main/java/org/neo4j/driver/SimpleQueryRunner.java b/driver/src/main/java/org/neo4j/driver/SimpleQueryRunner.java
@@ -22,7 +22,6 @@
 
 /**
  * Common interface for components that can execute Neo4j queries.
- *
  * <h2>Important notes on semantics</h2>
  * <p>
  * queries run in the same {@link QueryRunner} are guaranteed to execute in order, meaning changes made by one query will be seen by all subsequent queries in
@@ -64,7 +63,6 @@ public interface SimpleQueryRunner {
      * send it back as parameters.
      * <p>
      * If you are creating parameters programmatically, {@link #run(String, Map)} might be more helpful, it converts your map to a {@link Value} for you.
-     *
      * <h4>Example</h4>
      * <pre class="doctest:QueryRunnerDocIT#parameterTest">
      * {@code
@@ -88,7 +86,6 @@ public interface SimpleQueryRunner {
      * <p>
      * This version of run takes a {@link Map} of parameters. The values in the map must be values that can be converted to Neo4j types. See {@link
      * Values#parameters(Object...)} for a list of allowed types.
-     *
      * <h4>Example</h4>
      * <pre class="doctest:QueryRunnerDocIT#parameterTest">
      * {@code

diff --git a/driver/src/main/java/org/neo4j/driver/Value.java b/driver/src/main/java/org/neo4j/driver/Value.java
@@ -53,7 +53,6 @@
  * The second set of methods perform coercions to Java types (wherever possible).
  * For example, a common String value should be tested for using <code>isString</code>
  * and extracted using <code>stringValue</code>.
- *
  * <h2>Navigating a tree structure</h2>
  *
  * Because Neo4j often handles dynamic structures, this interface is designed to help

diff --git a/driver/src/main/java/org/neo4j/driver/async/AsyncQueryRunner.java b/driver/src/main/java/org/neo4j/driver/async/AsyncQueryRunner.java
@@ -30,7 +30,6 @@
 
 /**
  * Asynchronous interface for components that can execute Neo4j queries.
- *
  * <h2>Important notes on semantics</h2>
  * <p>
  * Queries run in the same {@link AsyncQueryRunner} are guaranteed
@@ -62,7 +61,6 @@
  * While these semantics introduce some complexity, it gives the driver the ability
  * to handle infinite result streams (like subscribing to events), significantly lowers
  * the memory overhead for your application and improves performance.
- *
  * <h2>Asynchronous API</h2>
  * <p>
  * All overloads of {@link #runAsync(Query)} execute queries in async fashion and return {@link CompletionStage} of

diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/connection/EventLoopGroupFactory.java b/driver/src/main/java/org/neo4j/driver/internal/async/connection/EventLoopGroupFactory.java
@@ -114,6 +114,7 @@ private static class DriverThreadFactory extends DefaultThreadFactory {
             super(THREAD_NAME_PREFIX, THREAD_IS_DAEMON, THREAD_PRIORITY);
         }
 
+        @SuppressWarnings("InstantiatingAThreadWithDefaultRunMethod")
         @Override
         protected Thread newThread(Runnable r, String name) {
             return new DriverThread(threadGroup, r, name);

diff --git a/driver/src/main/java/org/neo4j/driver/internal/cluster/ClusterRoutingTable.java b/driver/src/main/java/org/neo4j/driver/internal/cluster/ClusterRoutingTable.java
@@ -37,8 +37,6 @@
 import org.neo4j.driver.internal.DatabaseName;
 
 public class ClusterRoutingTable implements RoutingTable {
-    private static final int MIN_ROUTERS = 1;
-
     private final ReadWriteLock tableLock = new ReentrantReadWriteLock();
     private final DatabaseName databaseName;
     private final Clock clock;
@@ -66,9 +64,9 @@ public boolean isStaleFor(AccessMode mode) {
         return executeWithLock(
                 tableLock.readLock(),
                 () -> expirationTimestamp < clock.millis()
-                        || routers.size() < MIN_ROUTERS
-                        || mode == AccessMode.READ && readers.size() == 0
-                        || mode == AccessMode.WRITE && writers.size() == 0);
+                        || routers.isEmpty()
+                        || mode == AccessMode.READ && readers.isEmpty()
+                        || mode == AccessMode.WRITE && writers.isEmpty());
     }
 
     @Override

diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandler.java
@@ -286,7 +286,7 @@ protected void state(State state) {
         this.state = state;
     }
 
-    enum State {
+    protected enum State {
         READY_STATE {
             @Override
             void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata) {

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
@@ -96,7 +96,7 @@ public final void pack(Value value) throws IOException {
 
     @Override
     public final void pack(Map<String, Value> map) throws IOException {
-        if (map == null || map.size() == 0) {
+        if (map == null || map.isEmpty()) {
             packer.packMapHeader(0);
             return;
         }

diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/request/HelloMessage.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/request/HelloMessage.java
@@ -94,17 +94,7 @@ private static Map<String, Value> buildMetadata(
             result.put(USER_AGENT_METADATA_KEY, value(userAgent));
         }
         if (boltAgent != null) {
-            var boltAgentMap = new HashMap<String, String>();
-            boltAgentMap.put(BOLT_AGENT_PRODUCT_KEY, boltAgent.product());
-            if (boltAgent.platform() != null) {
-                boltAgentMap.put(BOLT_AGENT_PLATFORM_KEY, boltAgent.platform());
-            }
-            if (boltAgent.language() != null) {
-                boltAgentMap.put(BOLT_AGENT_LANGUAGE_KEY, boltAgent.language());
-            }
-            if (boltAgent.languageDetails() != null) {
-                boltAgentMap.put(BOLT_AGENT_LANGUAGE_DETAIL_KEY, boltAgent.languageDetails());
-            }
+            var boltAgentMap = toMap(boltAgent);
             result.put(BOLT_AGENT_METADATA_KEY, value(boltAgentMap));
         }
         if (routingContext != null) {
@@ -116,4 +106,19 @@ private static Map<String, Value> buildMetadata(
         MessageWithMetadata.appendNotificationConfig(result, notificationConfig);
         return result;
     }
+
+    private static HashMap<String, String> toMap(BoltAgent boltAgent) {
+        var boltAgentMap = new HashMap<String, String>();
+        boltAgentMap.put(BOLT_AGENT_PRODUCT_KEY, boltAgent.product());
+        if (boltAgent.platform() != null) {
+            boltAgentMap.put(BOLT_AGENT_PLATFORM_KEY, boltAgent.platform());
+        }
+        if (boltAgent.language() != null) {
+            boltAgentMap.put(BOLT_AGENT_LANGUAGE_KEY, boltAgent.language());
+        }
+        if (boltAgent.languageDetails() != null) {
+            boltAgentMap.put(BOLT_AGENT_LANGUAGE_DETAIL_KEY, boltAgent.languageDetails());
+        }
+        return boltAgentMap;
+    }
 }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/InternalPlan.java b/driver/src/main/java/org/neo4j/driver/internal/summary/InternalPlan.java
@@ -97,7 +97,7 @@ public int hashCode() {
         return result;
     }
 
-    public static final PlanCreator<Plan> EXPLAIN_PLAN =
+    private static final PlanCreator<Plan> EXPLAIN_PLAN =
             (operatorType, arguments, identifiers, children, originalPlanValue) ->
                     new InternalPlan<>(operatorType, arguments, identifiers, children);
 

diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/InternalProfiledPlan.java b/driver/src/main/java/org/neo4j/driver/internal/summary/InternalProfiledPlan.java
@@ -87,7 +87,7 @@ public long time() {
         return time;
     }
 
-    public static final PlanCreator<ProfiledPlan> PROFILED_PLAN =
+    private static final PlanCreator<ProfiledPlan> PROFILED_PLAN =
             (operatorType, arguments, identifiers, children, originalPlanValue) -> new InternalProfiledPlan(
                     operatorType,
                     arguments,

diff --git a/driver/src/main/java/org/neo4j/driver/reactive/ReactiveSession.java b/driver/src/main/java/org/neo4j/driver/reactive/ReactiveSession.java
@@ -199,7 +199,6 @@ default Publisher<ReactiveResult> run(String query, TransactionConfig config) {
      * <p>
      * This version of run takes a {@link Map} of parameters. The values in the map must be values that can be converted to Neo4j types. See {@link
      * Values#parameters(Object...)} for a list of allowed types.
-     *
      * <h4>Example</h4>
      * <pre>
      * {@code
@@ -232,7 +231,6 @@ default Publisher<ReactiveResult> run(String query, Map<String, Object> paramete
      * <p>
      * Invoking this method will result in a Bolt RUN message exchange with server and the returned publisher will either emit an instance of {@link
      * ReactiveResult} on success or an error otherwise.
-     *
      * <h4>Example</h4>
      * <pre>
      * {@code

diff --git a/driver/src/main/java/org/neo4j/driver/reactive/RxSession.java b/driver/src/main/java/org/neo4j/driver/reactive/RxSession.java
@@ -171,7 +171,6 @@ default Publisher<RxTransaction> beginTransaction() {
      * This version of run takes a {@link Map} of parameters.
      * The values in the map must be values that can be converted to Neo4j types.
      * See {@link Values#parameters(Object...)} for a list of allowed types.
-     *
      * <h4>Example</h4>
      * <pre>
      * {@code

diff --git a/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveSession.java b/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveSession.java
@@ -199,7 +199,6 @@ default Publisher<ReactiveResult> run(String query, TransactionConfig config) {
      * <p>
      * This version of run takes a {@link Map} of parameters. The values in the map must be values that can be converted to Neo4j types. See {@link
      * Values#parameters(Object...)} for a list of allowed types.
-     *
      * <h4>Example</h4>
      * <pre>
      * {@code
@@ -232,7 +231,6 @@ default Publisher<ReactiveResult> run(String query, Map<String, Object> paramete
      * <p>
      * Invoking this method will result in a Bolt RUN message exchange with server and the returned publisher will either emit an instance of {@link
      * ReactiveResult} on success or an error otherwise.
-     *
      * <h4>Example</h4>
      * <pre>
      * {@code

diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java
@@ -233,7 +233,7 @@ public void run() {
             }
         }
 
-        @SuppressWarnings("BusyWait")
+        @SuppressWarnings({"BusyWait", "CallToPrintStackTrace"})
         void assertSessionsAvailableWithin() throws InterruptedException {
             var deadline = System.currentTimeMillis() + 1000 * 120;
             while (System.currentTimeMillis() < deadline) {

diff --git a/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java b/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java
@@ -71,7 +71,7 @@ void shouldRunWithParameters() {
         // Then nothing should've failed
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("ConstantValue")
     @Test
     void shouldRunWithNullValuesAsParameters() {
         // Given
@@ -83,7 +83,7 @@ void shouldRunWithNullValuesAsParameters() {
         // Then nothing should've failed
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("ConstantValue")
     @Test
     void shouldRunWithNullRecordAsParameters() {
         // Given
@@ -95,7 +95,7 @@ void shouldRunWithNullRecordAsParameters() {
         // Then nothing should've failed
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("ConstantValue")
     @Test
     void shouldRunWithNullMapAsParameters() {
         // Given

diff --git a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java
@@ -213,7 +213,7 @@ void shouldHandleFailureAfterClosingTransaction() {
                 ClientException.class, () -> session.run("CREAT (n) RETURN n").consume());
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("ConstantValue")
     @Test
     void shouldHandleNullRecordParameters() {
         // When
@@ -226,7 +226,7 @@ void shouldHandleNullRecordParameters() {
         // Then it wasn't the end of the world as we know it
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("ConstantValue")
     @Test
     void shouldHandleNullValueParameters() {
         // When
@@ -239,7 +239,7 @@ void shouldHandleNullValueParameters() {
         // Then it wasn't the end of the world as we know it
     }
 
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings("ConstantValue")
     @Test
     void shouldHandleNullMapParameters() {
         // When

diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalExecutableQueryTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalExecutableQueryTest.java
@@ -122,7 +122,7 @@ static List<RoutingControl> routingControls() {
 
     @ParameterizedTest
     @MethodSource("routingControls")
-    @SuppressWarnings({"unchecked", "resource", "ResultOfMethodCallIgnored"})
+    @SuppressWarnings({"unchecked", "resource"})
     void shouldExecuteAndReturnResult(RoutingControl routingControl) {
         // GIVEN
         var driver = mock(Driver.class);

diff --git a/...va/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java b/...va/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java
@@ -363,7 +363,7 @@ public CompletionStage<ClusterCompositionLookupResult> lookupClusterComposition(
                     .mapToObj(SERVERS::get)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-            if (servers.size() == 0) {
+            if (servers.isEmpty()) {
                 var address = SERVERS.stream()
                         .filter(Objects::nonNull)
                         .findFirst()

diff --git a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java
@@ -1267,7 +1267,7 @@ private static List<Long> delaysWithoutJitter(long initialDelay, double multipli
         var delay = initialDelay;
         do {
             values.add(delay);
-            delay *= multiplier;
+            delay *= (long) multiplier;
         } while (--count > 0);
         return values;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/BookmarkUtil.java b/driver/src/test/java/org/neo4j/driver/internal/util/BookmarkUtil.java
@@ -69,7 +69,7 @@ public static void assertBookmarkContainsSingleValue(Bookmark bookmark, Matcher<
         assertNotNull(bookmark);
         assertThat(bookmark, instanceOf(InternalBookmark.class));
 
-        var values = asList(((InternalBookmark) bookmark).values());
+        var values = asList((bookmark).values());
         assertThat(values.size(), equalTo(1));
         assertThat(values.get(0), matcher);
     }
@@ -84,7 +84,7 @@ public static void assertBookmarksContainsSingleUniqueValues(Bookmark... bookmar
 
         for (var bookmark : bookmarks) {
             assertBookmarkContainsSingleValue(bookmark);
-            var values = asList(((InternalBookmark) bookmark).values());
+            var values = asList((bookmark).values());
             bookmarkStrings.addAll(values);
         }
         assertEquals(count, bookmarkStrings.size());

diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java
@@ -29,7 +29,7 @@
 public class AsyncWriteQuery<C extends AbstractContext> extends AbstractAsyncQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public AsyncWriteQuery(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    AsyncWriteQuery(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java
@@ -28,7 +28,7 @@
 public class AsyncWriteQueryInTx<C extends AbstractContext> extends AbstractAsyncQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public AsyncWriteQueryInTx(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    AsyncWriteQueryInTx(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryWithRetries.java
@@ -30,7 +30,7 @@
 public class AsyncWriteQueryWithRetries<C extends AbstractContext> extends AbstractAsyncQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public AsyncWriteQueryWithRetries(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    AsyncWriteQueryWithRetries(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java
@@ -27,7 +27,7 @@
 public class BlockingWriteQuery<C extends AbstractContext> extends AbstractBlockingQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public BlockingWriteQuery(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    BlockingWriteQuery(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryInTx.java
@@ -27,7 +27,7 @@
 public class BlockingWriteQueryInTx<C extends AbstractContext> extends AbstractBlockingQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public BlockingWriteQueryInTx(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    BlockingWriteQueryInTx(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryWithRetries.java
@@ -26,7 +26,7 @@
 public class BlockingWriteQueryWithRetries<C extends AbstractContext> extends AbstractBlockingQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public BlockingWriteQueryWithRetries(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    BlockingWriteQueryWithRetries(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java
@@ -32,7 +32,7 @@
 public class RxWriteQuery<C extends AbstractContext> extends AbstractRxQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public RxWriteQuery(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    RxWriteQuery(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java
@@ -36,7 +36,7 @@
 public class RxWriteQueryInTx<C extends AbstractContext> extends AbstractRxQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public RxWriteQueryInTx(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    RxWriteQueryInTx(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }

diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryWithRetries.java
@@ -32,7 +32,7 @@
 public class RxWriteQueryWithRetries<C extends AbstractContext> extends AbstractRxQuery<C> {
     private final AbstractStressTestBase<C> stressTest;
 
-    public RxWriteQueryWithRetries(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
+    RxWriteQueryWithRetries(AbstractStressTestBase<C> stressTest, Driver driver, boolean useBookmark) {
         super(driver, useBookmark);
         this.stressTest = stressTest;
     }