diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalNotificationCategory.java b/driver/src/main/java/org/neo4j/driver/internal/InternalNotificationCategory.java index e63c509d68..1f79bcf9c7 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/InternalNotificationCategory.java +++ b/driver/src/main/java/org/neo4j/driver/internal/InternalNotificationCategory.java @@ -35,7 +35,7 @@ public enum Type { UNSUPPORTED, PERFORMANCE, DEPRECATION, - GENERIC; + GENERIC } public static Optional valueOf(String value) { diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalPair.java b/driver/src/main/java/org/neo4j/driver/internal/InternalPair.java index 87843cb5f1..3ed69803ef 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/InternalPair.java +++ b/driver/src/main/java/org/neo4j/driver/internal/InternalPair.java @@ -46,7 +46,7 @@ public static Pair of(K key, V value) { @Override public String toString() { - return String.format("%s: %s", Objects.toString(key), Objects.toString(value)); + return String.format("%s: %s", key, value); } @Override diff --git a/driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingSettings.java b/driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingSettings.java index cf3860bbd2..c0c20b0830 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingSettings.java +++ b/driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingSettings.java @@ -20,22 +20,6 @@ import static java.util.concurrent.TimeUnit.SECONDS; -public class RoutingSettings { +public record RoutingSettings(long routingTablePurgeDelayMs, RoutingContext routingContext) { public static final long STALE_ROUTING_TABLE_PURGE_DELAY_MS = SECONDS.toMillis(30); - - private final RoutingContext routingContext; - private final long routingTablePurgeDelayMs; - - public RoutingSettings(long routingTablePurgeDelayMs, RoutingContext routingContext) { - this.routingContext = routingContext; - this.routingTablePurgeDelayMs = routingTablePurgeDelayMs; - } - - public RoutingContext routingContext() { - return routingContext; - } - - public long routingTablePurgeDelayMs() { - return routingTablePurgeDelayMs; - } } 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 index 93313c2334..1207bd9377 100644 --- 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 @@ -232,8 +232,7 @@ private void packPoint(Point point) throws IOException { } else if (point instanceof InternalPoint3D) { packPoint3D(point); } else { - throw new IOException( - String.format("Unknown type: type: %s, value: %s", point.getClass(), point.toString())); + throw new IOException(String.format("Unknown type: type: %s, value: %s", point.getClass(), point)); } } 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 index dc227dd007..647c9bf378 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java +++ b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.Serial; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -204,7 +205,7 @@ public class PackStream { private static final String EMPTY_STRING = ""; private static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; - private static final Charset UTF_8 = Charset.forName("UTF-8"); + private static final Charset UTF_8 = StandardCharsets.UTF_8; private PackStream() {} diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/Format.java b/driver/src/main/java/org/neo4j/driver/internal/util/Format.java index 815c1f4291..3235c4f47b 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/util/Format.java +++ b/driver/src/main/java/org/neo4j/driver/internal/util/Format.java @@ -52,7 +52,7 @@ public static String formatPairs(Map entries) { } private static String keyValueString(Entry entry) { - return String.format("%s: %s", entry.getKey(), String.valueOf(entry.getValue())); + return String.format("%s: %s", entry.getKey(), entry.getValue()); } /** diff --git a/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java b/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java index 23e00e2dd7..1f5a60767e 100644 --- a/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java +++ b/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java @@ -93,54 +93,49 @@ void shouldFailToCreateEncryptedDriverWhenServerDoesNotRespond() throws IOExcept @Test void shouldAcceptNullTokenOnFactoryWithString() { - AuthToken token = null; - GraphDatabase.driver("neo4j://host", token); + GraphDatabase.driver("neo4j://host", (AuthToken) null); } @Test void shouldAcceptNullTokenOnFactoryWithUri() { - AuthToken token = null; - GraphDatabase.driver(URI.create("neo4j://host"), token); + GraphDatabase.driver(URI.create("neo4j://host"), (AuthToken) null); } @Test void shouldAcceptNullTokenOnFactoryWithStringAndConfig() { - AuthToken token = null; - GraphDatabase.driver("neo4j://host", token, Config.defaultConfig()); + GraphDatabase.driver("neo4j://host", (AuthToken) null, Config.defaultConfig()); } @Test void shouldAcceptNullTokenOnFactoryWithUriAndConfig() { - AuthToken token = null; - GraphDatabase.driver(URI.create("neo4j://host"), token, Config.defaultConfig()); + GraphDatabase.driver(URI.create("neo4j://host"), (AuthToken) null, Config.defaultConfig()); } @Test void shouldRejectNullAuthTokenManagerOnFactoryWithString() { - AuthTokenManager manager = null; - assertThrows(NullPointerException.class, () -> GraphDatabase.driver("neo4j://host", manager)); + assertThrows(NullPointerException.class, () -> GraphDatabase.driver("neo4j://host", (AuthTokenManager) null)); } @Test void shouldRejectNullAuthTokenManagerOnFactoryWithUri() { - AuthTokenManager manager = null; - assertThrows(NullPointerException.class, () -> GraphDatabase.driver(URI.create("neo4j://host"), manager)); + assertThrows( + NullPointerException.class, + () -> GraphDatabase.driver(URI.create("neo4j://host"), (AuthTokenManager) null)); } @Test void shouldRejectNullAuthTokenManagerOnFactoryWithStringAndConfig() { - AuthTokenManager manager = null; assertThrows( NullPointerException.class, - () -> GraphDatabase.driver("neo4j://host", manager, Config.defaultConfig())); + () -> GraphDatabase.driver("neo4j://host", (AuthTokenManager) null, Config.defaultConfig())); } @Test void shouldRejectNullAuthTokenManagerOnFactoryWithUriAndConfig() { - AuthTokenManager manager = null; assertThrows( NullPointerException.class, - () -> GraphDatabase.driver(URI.create("neo4j://host"), manager, Config.defaultConfig())); + () -> GraphDatabase.driver( + URI.create("neo4j://host"), (AuthTokenManager) null, Config.defaultConfig())); } private static void testFailureWhenServerDoesNotRespond(boolean encrypted) throws IOException { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java index 9cb7c070f3..8689e15deb 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java @@ -19,10 +19,9 @@ package org.neo4j.driver.integration; import static java.util.Collections.singletonList; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.atLeastOnce; @@ -328,7 +327,7 @@ void resultRecordsShouldReleaseConnectionUsedBySessionRun() { .verifyComplete(); var connection2 = connectionPool.lastAcquiredConnectionSpy; - assertNotSame(connection1, connection2); + assertNotNull(connection2); verify(connection2).release(); } @@ -344,7 +343,7 @@ void resultSummaryShouldReleaseConnectionUsedBySessionRun() { StepVerifier.create(Mono.from(res.consume())).expectNextCount(1).verifyComplete(); var connection2 = connectionPool.lastAcquiredConnectionSpy; - assertNotSame(connection1, connection2); + assertNotNull(connection2); verify(connection2).release(); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingContextTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingContextTest.java index d5e6462e7e..aef32e586c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingContextTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingContextTest.java @@ -139,9 +139,6 @@ private static void testIllegalUri(URI uri) { private static void testEmptyRoutingContext(URI uri) { var context = new RoutingContext(uri); - Map expectedMap = new HashMap<>(); - expectedMap.put("address", "localhost:7687"); - assertFalse(context.isDefined()); assertEquals(singletonMap("address", "localhost:7687"), context.toMap()); } diff --git a/driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java b/driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java index 1cca46e282..5aaf9e25f3 100644 --- a/driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/StdIOCapture.java @@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -31,11 +32,9 @@ */ public class StdIOCapture implements AutoCloseable { private final List stdout = new CopyOnWriteArrayList<>(); - private final List stderr = new CopyOnWriteArrayList<>(); private final PrintStream originalStdOut; private final PrintStream originalStdErr; private final ByteArrayOutputStream capturedStdOut; - private final ByteArrayOutputStream capturedStdErr; /** Put this in a try-with-resources block to capture all standard io that happens within the try block */ public static StdIOCapture capture() { @@ -46,7 +45,7 @@ private StdIOCapture() { originalStdOut = System.out; originalStdErr = System.err; capturedStdOut = new ByteArrayOutputStream(); - capturedStdErr = new ByteArrayOutputStream(); + var capturedStdErr = new ByteArrayOutputStream(); System.setOut(new PrintStream(capturedStdOut)); System.setErr(new PrintStream(capturedStdErr)); @@ -60,7 +59,6 @@ public List stdout() { public void close() throws UnsupportedEncodingException { System.setOut(originalStdOut); System.setErr(originalStdErr); - stdout.addAll(asList(capturedStdOut.toString("UTF-8").split(System.lineSeparator()))); - stderr.addAll(asList(capturedStdErr.toString("UTF-8").split(System.lineSeparator()))); + stdout.addAll(asList(capturedStdOut.toString(StandardCharsets.UTF_8).split(System.lineSeparator()))); } }