From 7d0d2a6ef656d0266fca5bf8770bb7fa5d95cff3 Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Wed, 27 Jul 2022 22:49:52 +0100 Subject: [PATCH] Enable compilation failures on warnings for tests --- .../org/neo4j/driver/SessionConfigTest.java | 1 + .../neo4j/driver/integration/BookmarkIT.java | 28 +-- .../integration/ConnectionHandlingIT.java | 6 + .../driver/integration/EntityTypeIT.java | 3 + .../org/neo4j/driver/integration/QueryIT.java | 1 + .../driver/integration/SessionBoltV3IT.java | 5 + .../neo4j/driver/integration/SessionIT.java | 29 +++ .../driver/integration/SessionMixIT.java | 1 + .../integration/UnsupportedBoltV3IT.java | 2 + .../integration/async/AsyncQueryIT.java | 1 + .../integration/async/AsyncSessionIT.java | 11 + .../integration/async/AsyncTransactionIT.java | 3 + .../reactive/RxNestedQueriesIT.java | 1 + .../integration/reactive/RxResultIT.java | 11 +- .../integration/reactive/RxSessionIT.java | 1 + .../integration/reactive/RxTransactionIT.java | 1 + .../driver/internal/InternalBookmarkTest.java | 9 + .../internal/SelfContainedNodeTest.java | 1 + .../async/InternalAsyncSessionTest.java | 5 + .../inbound/InboundMessageDispatcherTest.java | 2 +- .../async/pool/TestConnectionPool.java | 2 +- ...tiDatabasesRoutingProcedureRunnerTest.java | 5 +- ...ocedureClusterCompositionProviderTest.java | 34 +-- .../cluster/RoutingTableHandlerTest.java | 3 +- ...gleDatabaseRoutingProcedureRunnerTest.java | 5 +- .../cursor/RxResultCursorImplTest.java | 5 +- .../BasicPullResponseHandlerTestBase.java | 8 + ...ionPullResponseCompletionListenerTest.java | 4 + ...ionPullResponseCompletionListenerTest.java | 4 + .../reactive/InternalReactiveSessionTest.java | 5 + .../reactive/InternalRxResultTest.java | 1 + .../reactive/InternalRxSessionTest.java | 1 + .../reactive/InternalRxTransactionTest.java | 1 + .../reactive/util/ListBasedPullHandler.java | 3 +- .../driver/internal/util/BookmarkUtil.java | 5 + .../internal/util/ClusterCompositionUtil.java | 1 + .../ImmediateSchedulingEventExecutor.java | 1 + .../driver/internal/util/MatcherFactory.java | 195 ------------------ .../internal/util/MetadataExtractorTest.java | 8 +- .../util/Neo4jWithFeatureCondition.java | 2 +- .../messaging/KnowledgeableMessageFormat.java | 3 + .../neo4j/driver/stress/AbstractRxQuery.java | 1 + .../driver/stress/AbstractStressTestBase.java | 17 +- .../stress/AsyncFailingQueryWithRetries.java | 1 + .../stress/AsyncReadQueryWithRetries.java | 1 + .../neo4j/driver/stress/AsyncWriteQuery.java | 1 + .../driver/stress/AsyncWriteQueryInTx.java | 1 + .../stress/AsyncWriteQueryWithRetries.java | 2 + .../stress/AsyncWrongQueryWithRetries.java | 1 + .../BlockingFailingQueryWithRetries.java | 1 + .../stress/BlockingReadQueryWithRetries.java | 1 + .../driver/stress/BlockingWriteQuery.java | 1 + .../driver/stress/BlockingWriteQueryInTx.java | 1 + ...WriteQueryUsingReadSessionWithRetries.java | 1 + .../stress/BlockingWriteQueryWithRetries.java | 1 + .../stress/BlockingWrongQueryWithRetries.java | 1 + .../neo4j/driver/stress/RxFailingQuery.java | 1 + .../driver/stress/RxFailingQueryInTx.java | 1 + .../stress/RxFailingQueryWithRetries.java | 1 + .../org/neo4j/driver/stress/RxReadQuery.java | 2 + .../neo4j/driver/stress/RxReadQueryInTx.java | 2 + .../driver/stress/RxReadQueryWithRetries.java | 2 + .../org/neo4j/driver/stress/RxWriteQuery.java | 1 + .../neo4j/driver/stress/RxWriteQueryInTx.java | 1 + .../stress/RxWriteQueryWithRetries.java | 1 + ...RxResultRecordPublisherVerificationIT.java | 1 + .../neo4j/driver/util/DatabaseExtension.java | 4 +- .../neo4j/driver/util/SessionExtension.java | 6 + .../java/org/neo4j/driver/util/TestUtil.java | 16 +- pom.xml | 8 - 70 files changed, 221 insertions(+), 276 deletions(-) delete mode 100644 driver/src/test/java/org/neo4j/driver/internal/util/MatcherFactory.java diff --git a/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java b/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java index ad27a4eb0a..91de0e5a74 100644 --- a/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/SessionConfigTest.java @@ -174,6 +174,7 @@ void shouldTwoConfigBeEqual() { } @Test + @SuppressWarnings("deprecation") void shouldSerialize() throws Exception { SessionConfig config = SessionConfig.builder() .withBookmarks( diff --git a/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java b/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java index e33c21f102..1a7f5e1ada 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java @@ -28,7 +28,6 @@ import static org.neo4j.driver.internal.util.BookmarkUtil.assertBookmarkIsEmpty; import static org.neo4j.driver.internal.util.BookmarkUtil.assertBookmarksContainsSingleUniqueValues; -import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -59,6 +58,7 @@ void assumeBookmarkSupport() { @Test @DisabledOnNeo4jWith(Neo4jFeature.BOLT_V4) + @SuppressWarnings("deprecation") void shouldReceiveBookmarkOnSuccessfulCommit() throws Throwable { // Given assertBookmarkIsEmpty(session.lastBookmark()); @@ -72,6 +72,7 @@ void shouldReceiveBookmarkOnSuccessfulCommit() throws Throwable { @Test @EnabledOnNeo4jWith(Neo4jFeature.BOLT_V4) + @SuppressWarnings("deprecation") void shouldReceiveNewBookmarkOnSuccessfulCommit() throws Throwable { // Given Bookmark initialBookmark = session.lastBookmark(); @@ -96,6 +97,7 @@ void shouldThrowForInvalidBookmark() { } @Test + @SuppressWarnings("deprecation") void bookmarkRemainsAfterRolledBackTx() { assertBookmarkIsEmpty(session.lastBookmark()); @@ -113,6 +115,7 @@ void bookmarkRemainsAfterRolledBackTx() { } @Test + @SuppressWarnings("deprecation") void bookmarkRemainsAfterTxFailure() { assertBookmarkIsEmpty(session.lastBookmark()); @@ -128,6 +131,7 @@ void bookmarkRemainsAfterTxFailure() { } @Test + @SuppressWarnings("deprecation") void bookmarkRemainsAfterSuccessfulSessionRun() { assertBookmarkIsEmpty(session.lastBookmark()); @@ -142,6 +146,7 @@ void bookmarkRemainsAfterSuccessfulSessionRun() { } @Test + @SuppressWarnings("deprecation") void bookmarkRemainsAfterFailedSessionRun() { assertBookmarkIsEmpty(session.lastBookmark()); @@ -155,6 +160,7 @@ void bookmarkRemainsAfterFailedSessionRun() { } @Test + @SuppressWarnings("deprecation") void bookmarkIsUpdatedOnEveryCommittedTx() { assertBookmarkIsEmpty(session.lastBookmark()); @@ -174,6 +180,7 @@ void bookmarkIsUpdatedOnEveryCommittedTx() { } @Test + @SuppressWarnings("deprecation") void createSessionWithInitialBookmark() { Bookmark bookmark = parse("TheBookmark"); try (Session session = driver.session(builder().withBookmarks(bookmark).build())) { @@ -182,6 +189,7 @@ void createSessionWithInitialBookmark() { } @Test + @SuppressWarnings("deprecation") void createSessionWithAccessModeAndInitialBookmark() { Bookmark bookmark = parse("TheBookmark"); try (Session session = driver.session(builder().withBookmarks(bookmark).build())) { @@ -195,22 +203,4 @@ private static void createNodeInTx(Session session) { tx.commit(); } } - - private static boolean isUuid(String string) { - try { - UUID.fromString(string); - } catch (IllegalArgumentException | NullPointerException e) { - return false; - } - return true; - } - - private static boolean isNumeric(String string) { - try { - Long.parseLong(string); - } catch (NumberFormatException | NullPointerException e) { - return false; - } - return true; - } } 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 80213ab02e..07b54e0989 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java @@ -300,6 +300,7 @@ void connectionUsedForBeginTxReturnedToThePoolWhenSessionClose() { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void sessionCloseShouldReleaseConnectionUsedBySessionRun() { RxSession session = driver.rxSession(); RxResult res = session.run("UNWIND [1,2,3,4] AS a RETURN a"); @@ -320,6 +321,7 @@ void sessionCloseShouldReleaseConnectionUsedBySessionRun() { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void resultRecordsShouldReleaseConnectionUsedBySessionRun() { RxSession session = driver.rxSession(); RxResult res = session.run("UNWIND [1,2,3,4] AS a RETURN a"); @@ -339,6 +341,7 @@ void resultRecordsShouldReleaseConnectionUsedBySessionRun() { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void resultSummaryShouldReleaseConnectionUsedBySessionRun() { RxSession session = driver.rxSession(); RxResult res = session.run("UNWIND [1,2,3,4] AS a RETURN a"); @@ -354,6 +357,7 @@ void resultSummaryShouldReleaseConnectionUsedBySessionRun() { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void txCommitShouldReleaseConnectionUsedByBeginTx() { AtomicReference connection1Ref = new AtomicReference<>(); @@ -386,6 +390,7 @@ void txCommitShouldReleaseConnectionUsedByBeginTx() { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void txRollbackShouldReleaseConnectionUsedByBeginTx() { AtomicReference connection1Ref = new AtomicReference<>(); @@ -418,6 +423,7 @@ void txRollbackShouldReleaseConnectionUsedByBeginTx() { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void sessionCloseShouldReleaseConnectionUsedByBeginTx() { // Given RxSession session = driver.rxSession(); diff --git a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java b/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java index 6b3205ef35..5954ee8c14 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java @@ -36,6 +36,7 @@ class EntityTypeIT { static final SessionExtension session = new SessionExtension(); @Test + @SuppressWarnings("deprecation") void shouldReturnIdentitiesOfNodes() { // When Result cursor = session.run("CREATE (n) RETURN n"); @@ -46,6 +47,7 @@ void shouldReturnIdentitiesOfNodes() { } @Test + @SuppressWarnings("deprecation") void shouldReturnIdentitiesOfRelationships() { // When Result cursor = session.run("CREATE ()-[r:T]->() RETURN r"); @@ -58,6 +60,7 @@ void shouldReturnIdentitiesOfRelationships() { } @Test + @SuppressWarnings("deprecation") void shouldReturnIdentitiesOfPaths() { // When Result cursor = session.run("CREATE p=()-[r:T]->() RETURN p"); diff --git a/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java b/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java index 182237faf2..14406acbc9 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java @@ -169,6 +169,7 @@ void shouldFailForIllegalQueries() { } @Test + @SuppressWarnings("deprecation") void shouldBeAbleToLogSemanticWrongExceptions() { try { // When I run a query with the old syntax diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java index c6d9388d49..b185bcd955 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java @@ -189,6 +189,7 @@ void shouldSetTransactionMetadataWithWriteTransactionFunction() { } @Test + @SuppressWarnings("deprecation") void shouldUseBookmarksForAutoCommitTransactions() { Session session = driver.session(); Bookmark initialBookmark = session.lastBookmark(); @@ -213,6 +214,7 @@ void shouldUseBookmarksForAutoCommitTransactions() { } @Test + @SuppressWarnings("deprecation") void shouldUseBookmarksForAutoCommitAndUnmanagedTransactions() { Session session = driver.session(); Bookmark initialBookmark = session.lastBookmark(); @@ -243,6 +245,7 @@ void shouldUseBookmarksForAutoCommitAndUnmanagedTransactions() { } @Test + @SuppressWarnings("deprecation") void shouldUseBookmarksForAutoCommitTransactionsAndTransactionFunctions() { Session session = driver.session(); Bookmark initialBookmark = session.lastBookmark(); @@ -307,6 +310,7 @@ void shouldSendGoodbyeWhenClosingDriver() { } } + @SuppressWarnings("deprecation") private static void testTransactionMetadataWithAsyncTransactionFunctions(boolean read) { AsyncSession asyncSession = driver.asyncSession(); Map metadata = new HashMap<>(); @@ -329,6 +333,7 @@ private static void testTransactionMetadataWithAsyncTransactionFunctions(boolean assertEquals(metadata, await(metadataFuture)); } + @SuppressWarnings("deprecation") private static void testTransactionMetadataWithTransactionFunctions(boolean read) { Session session = driver.session(); Map metadata = new HashMap<>(); diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java index cc235c64a1..a16da7ac4a 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java @@ -183,6 +183,7 @@ void rollsBackWriteTxInWriteSessionWhenFunctionThrows() { } @Test + @SuppressWarnings("deprecation") void readTxRetriedUntilSuccess() { int failures = 6; int retries = failures + 1; @@ -202,6 +203,7 @@ void readTxRetriedUntilSuccess() { } @Test + @SuppressWarnings("deprecation") void writeTxRetriedUntilSuccess() { int failures = 4; int retries = failures + 1; @@ -223,6 +225,7 @@ void writeTxRetriedUntilSuccess() { } @Test + @SuppressWarnings("deprecation") void readTxRetriedUntilFailure() { int failures = 3; int retries = failures - 1; @@ -237,6 +240,7 @@ void readTxRetriedUntilFailure() { } @Test + @SuppressWarnings("deprecation") void writeTxRetriedUntilFailure() { int failures = 8; int retries = failures - 1; @@ -256,6 +260,7 @@ void writeTxRetriedUntilFailure() { } @Test + @SuppressWarnings("deprecation") void writeTxRetryErrorsAreCollected() { try (Driver driver = newDriverWithLimitedRetries(5, TimeUnit.SECONDS)) { ThrowingWork work = newThrowingWorkSpy("CREATE (:Person {name: 'Ronan'})", Integer.MAX_VALUE); @@ -277,6 +282,7 @@ void writeTxRetryErrorsAreCollected() { } @Test + @SuppressWarnings("deprecation") void readTxRetryErrorsAreCollected() { try (Driver driver = newDriverWithLimitedRetries(4, TimeUnit.SECONDS)) { ThrowingWork work = newThrowingWorkSpy("MATCH (n) RETURN n.name", Integer.MAX_VALUE); @@ -293,6 +299,7 @@ void readTxRetryErrorsAreCollected() { } @Test + @SuppressWarnings("deprecation") void readTxCommittedWithoutTxSuccess() { try (Driver driver = newDriverWithoutRetries(); Session session = driver.session()) { @@ -308,6 +315,7 @@ void readTxCommittedWithoutTxSuccess() { } @Test + @SuppressWarnings("deprecation") void writeTxCommittedWithoutTxSuccess() { try (Driver driver = newDriverWithoutRetries()) { try (Session session = driver.session()) { @@ -326,6 +334,7 @@ void writeTxCommittedWithoutTxSuccess() { } @Test + @SuppressWarnings("deprecation") void readTxRolledBackWithTxFailure() { try (Driver driver = newDriverWithoutRetries(); Session session = driver.session()) { @@ -345,6 +354,7 @@ void readTxRolledBackWithTxFailure() { } @Test + @SuppressWarnings("deprecation") void writeTxRolledBackWithTxFailure() { try (Driver driver = newDriverWithoutRetries()) { try (Session session = driver.session()) { @@ -365,6 +375,7 @@ void writeTxRolledBackWithTxFailure() { } @Test + @SuppressWarnings("deprecation") void readTxRolledBackWhenExceptionIsThrown() { try (Driver driver = newDriverWithoutRetries(); Session session = driver.session()) { @@ -386,6 +397,7 @@ void readTxRolledBackWhenExceptionIsThrown() { } @Test + @SuppressWarnings("deprecation") void writeTxRolledBackWhenExceptionIsThrown() { try (Driver driver = newDriverWithoutRetries()) { try (Session session = driver.session()) { @@ -405,6 +417,7 @@ void writeTxRolledBackWhenExceptionIsThrown() { } @Test + @SuppressWarnings("deprecation") void readTxRolledBackWhenMarkedBothSuccessAndFailure() { try (Driver driver = newDriverWithoutRetries(); Session session = driver.session()) { @@ -421,6 +434,7 @@ void readTxRolledBackWhenMarkedBothSuccessAndFailure() { } @Test + @SuppressWarnings("deprecation") void writeTxFailWhenBothCommitAndRollback() { try (Driver driver = newDriverWithoutRetries()) { try (Session session = driver.session()) { @@ -439,6 +453,7 @@ void writeTxFailWhenBothCommitAndRollback() { } @Test + @SuppressWarnings("deprecation") void readTxCommittedWhenCommitAndThrowsException() { try (Driver driver = newDriverWithoutRetries(); Session session = driver.session()) { @@ -458,6 +473,7 @@ void readTxCommittedWhenCommitAndThrowsException() { } @Test + @SuppressWarnings("deprecation") void writeTxCommittedWhenCommitAndThrowsException() { try (Driver driver = newDriverWithoutRetries()) { try (Session session = driver.session()) { @@ -478,6 +494,7 @@ void writeTxCommittedWhenCommitAndThrowsException() { } @Test + @SuppressWarnings("deprecation") void readRolledBackWhenRollbackAndThrowsException() { try (Driver driver = newDriverWithoutRetries(); Session session = driver.session()) { @@ -497,6 +514,7 @@ void readRolledBackWhenRollbackAndThrowsException() { } @Test + @SuppressWarnings("deprecation") void writeTxRolledBackWhenRollbackAndThrowsException() { try (Driver driver = newDriverWithoutRetries()) { try (Session session = driver.session()) { @@ -574,6 +592,7 @@ void transactionRunShouldFailOnDeadlocks() throws Exception { } @Test + @SuppressWarnings("deprecation") void writeTransactionFunctionShouldRetryDeadlocks() throws Exception { final int nodeId1 = 42; final int nodeId2 = 4242; @@ -653,6 +672,7 @@ void writeTransactionFunctionShouldRetryDeadlocks() throws Exception { } @Test + @SuppressWarnings("deprecation") void shouldExecuteTransactionWorkInCallerThread() { int maxFailures = 3; Thread callerThread = Thread.currentThread(); @@ -754,6 +774,7 @@ void shouldConsumePreviousResultBeforeRunningNewQuery() { } @Test + @SuppressWarnings("deprecation") void shouldNotRetryOnConnectionAcquisitionTimeout() { int maxPoolSize = 3; Config config = Config.builder() @@ -923,6 +944,7 @@ void shouldAllowLongRunningQueryWithConnectTimeout() throws Exception { } @Test + @SuppressWarnings("deprecation") void shouldAllowReturningNullFromTransactionFunction() { try (Session session = neo4j.driver().session()) { assertNull(session.readTransaction(tx -> null)); @@ -1049,6 +1071,7 @@ void shouldSupportNestedQueries() { @Test @DisabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void shouldErrorWhenTryingToUseRxAPIWithoutBoltV4() throws Throwable { // Given RxSession session = neo4j.driver().rxSession(); @@ -1115,6 +1138,7 @@ void shouldAllowDatabaseNameUsingTx() throws Throwable { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void shouldAllowDatabaseNameUsingTxWithRetries() throws Throwable { try (Session session = neo4j.driver().session(forDatabase("neo4j"))) { int num = session.readTransaction( @@ -1155,6 +1179,7 @@ void shouldErrorDatabaseNameUsingTxWhenDatabaseIsAbsent() throws Throwable { @Test @EnabledOnNeo4jWith(BOLT_V4) + @SuppressWarnings("deprecation") void shouldErrorDatabaseNameUsingTxWithRetriesWhenDatabaseIsAbsent() throws Throwable { // Given Session session = neo4j.driver().session(forDatabase("foo")); @@ -1167,6 +1192,7 @@ void shouldErrorDatabaseNameUsingTxWithRetriesWhenDatabaseIsAbsent() throws Thro session.close(); } + @SuppressWarnings("deprecation") private void testExecuteReadTx(AccessMode sessionMode) { Driver driver = neo4j.driver(); @@ -1193,6 +1219,7 @@ private void testExecuteReadTx(AccessMode sessionMode) { } } + @SuppressWarnings("deprecation") private void testExecuteWriteTx(AccessMode sessionMode) { Driver driver = neo4j.driver(); @@ -1216,6 +1243,7 @@ private void testExecuteWriteTx(AccessMode sessionMode) { } } + @SuppressWarnings("deprecation") private void testTxRollbackWhenFunctionThrows(AccessMode sessionMode) { Driver driver = neo4j.driver(); @@ -1330,6 +1358,7 @@ private static void await(CountDownLatch latch) { } } + @SuppressWarnings("deprecation") private static class ThrowingWork implements TransactionWork { final String query; final int failures; diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java index 761d9911d9..774f8b1a2a 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java @@ -114,6 +114,7 @@ void shouldAllowUsingBlockingApiInCommonPoolWhenChaining() { } @Test + @SuppressWarnings("deprecation") void shouldFailToExecuteBlockingRunInAsyncTransactionFunction() { AsyncTransactionWork> completionStageTransactionWork = tx -> { if (EventLoopGroupFactory.isEventLoopThread(Thread.currentThread())) { diff --git a/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java b/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java index d22432503d..75b7c33e72 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java @@ -58,11 +58,13 @@ void shouldNotSupportAsyncAutoCommitQueriesWithTransactionConfig() { } @Test + @SuppressWarnings("deprecation") void shouldNotSupportTransactionFunctionsWithTransactionConfig() { assertTxConfigNotSupported(() -> driver.session().readTransaction(tx -> tx.run("RETURN 42"), txConfig)); } @Test + @SuppressWarnings("deprecation") void shouldNotSupportAsyncTransactionFunctionsWithTransactionConfig() { assertTxConfigNotSupported( driver.asyncSession().readTransactionAsync(tx -> tx.runAsync("RETURN 42"), txConfig)); diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java index f873b65a51..b0fcafeb98 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncQueryIT.java @@ -51,6 +51,7 @@ void tearDown() { } @Test + @SuppressWarnings("deprecation") void shouldBeAbleToLogSemanticWrongExceptions() throws ExecutionException, InterruptedException { session.writeTransactionAsync(tx -> Flux.from(Mono.fromCompletionStage(tx.runAsync( "MATCH (n:Element) WHERE n.name = {param} RETURN n", parameters("param", "Luke")))) diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java index 0236bdf0a5..e028a6bec5 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java @@ -306,6 +306,7 @@ void shouldExposeResultSummaryForProfileQuery() { } @Test + @SuppressWarnings("deprecation") void shouldRunAsyncTransactionWithoutRetries() { InvocationTrackingWork work = new InvocationTrackingWork("CREATE (:Apa) RETURN 42"); CompletionStage txStage = session.writeTransactionAsync(work); @@ -319,6 +320,7 @@ void shouldRunAsyncTransactionWithoutRetries() { } @Test + @SuppressWarnings("deprecation") void shouldRunAsyncTransactionWithRetriesOnAsyncFailures() { InvocationTrackingWork work = new InvocationTrackingWork("CREATE (:Node) RETURN 24") .withAsyncFailures( @@ -337,6 +339,7 @@ void shouldRunAsyncTransactionWithRetriesOnAsyncFailures() { } @Test + @SuppressWarnings("deprecation") void shouldRunAsyncTransactionWithRetriesOnSyncFailures() { InvocationTrackingWork work = new InvocationTrackingWork("CREATE (:Test) RETURN 12") .withSyncFailures( @@ -354,6 +357,7 @@ void shouldRunAsyncTransactionWithRetriesOnSyncFailures() { } @Test + @SuppressWarnings("deprecation") void shouldRunAsyncTransactionThatCanNotBeRetried() { InvocationTrackingWork work = new InvocationTrackingWork("UNWIND [10, 5, 0] AS x CREATE (:Hi) RETURN 10/x"); CompletionStage txStage = session.writeTransactionAsync(work); @@ -365,6 +369,7 @@ void shouldRunAsyncTransactionThatCanNotBeRetried() { } @Test + @SuppressWarnings("deprecation") void shouldRunAsyncTransactionThatCanNotBeRetriedAfterATransientFailure() { // first throw TransientException directly from work, retry can happen afterwards // then return a future failed with DatabaseException, retry can't happen afterwards @@ -549,6 +554,7 @@ void shouldNotRunAfterBeginTxFailureOnBookmark() { } @Test + @SuppressWarnings("deprecation") void shouldExecuteReadTransactionUntilSuccessWhenWorkThrows() { int maxFailures = 1; @@ -571,6 +577,7 @@ public CompletionStage execute(AsyncTransaction tx) { } @Test + @SuppressWarnings("deprecation") void shouldExecuteWriteTransactionUntilSuccessWhenWorkThrows() { int maxFailures = 2; @@ -594,6 +601,7 @@ public CompletionStage execute(AsyncTransaction tx) { } @Test + @SuppressWarnings("deprecation") void shouldExecuteReadTransactionUntilSuccessWhenWorkFails() { int maxFailures = 3; @@ -619,6 +627,7 @@ public CompletionStage execute(AsyncTransaction tx) { } @Test + @SuppressWarnings("deprecation") void shouldExecuteWriteTransactionUntilSuccessWhenWorkFails() { int maxFailures = 2; @@ -728,6 +737,7 @@ void shouldPropagateFailureFromFirstIllegalQuery() { } @Test + @SuppressWarnings("deprecation") void shouldAllowReturningNullFromAsyncTransactionFunction() { CompletionStage readResult = session.readTransactionAsync(tx -> null); assertNull(await(readResult)); @@ -825,6 +835,7 @@ private void testConsume(String query) { assertThrows(ResultConsumedException.class, () -> await(cursor.nextAsync())); } + @SuppressWarnings("deprecation") private static class InvocationTrackingWork implements AsyncTransactionWork> { final String query; final AtomicInteger invocationCount; diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java index 753e04a819..b1d1cb7abe 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java @@ -88,6 +88,7 @@ void tearDown() { } @Test + @SuppressWarnings("deprecation") void shouldBePossibleToCommitEmptyTx() { Bookmark bookmarkBefore = session.lastBookmark(); @@ -101,6 +102,7 @@ void shouldBePossibleToCommitEmptyTx() { } @Test + @SuppressWarnings("deprecation") void shouldBePossibleToRollbackEmptyTx() { Bookmark bookmarkBefore = session.lastBookmark(); @@ -596,6 +598,7 @@ void shouldFailToRunQueryAfterRollback() { } @Test + @SuppressWarnings("deprecation") void shouldUpdateSessionBookmarkAfterCommit() { Bookmark bookmarkBefore = session.lastBookmark(); diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java index fd1e631008..46c680fa70 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxNestedQueriesIT.java @@ -36,6 +36,7 @@ @EnabledOnNeo4jWith(BOLT_V4) @ParallelizableIT +@SuppressWarnings("deprecation") class RxNestedQueriesIT { @RegisterExtension static final DatabaseExtension neo4j = new DatabaseExtension(); diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java index 2f1c12a6c1..9b049d39b2 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxResultIT.java @@ -18,7 +18,6 @@ */ package org.neo4j.driver.integration.reactive; -import static java.util.Collections.EMPTY_LIST; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.containsString; @@ -32,6 +31,7 @@ import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.internal.util.Neo4jFeature.BOLT_V4; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -50,6 +50,7 @@ @EnabledOnNeo4jWith(BOLT_V4) @ParallelizableIT +@SuppressWarnings("deprecation") class RxResultIT { @RegisterExtension static final DatabaseExtension neo4j = new DatabaseExtension(); @@ -430,8 +431,12 @@ void keysShouldNotReportRunError() { RxResult result = session.run("Invalid"); // When - StepVerifier.create(Flux.from(result.keys())).expectNext(EMPTY_LIST).verifyComplete(); - StepVerifier.create(Flux.from(result.keys())).expectNext(EMPTY_LIST).verifyComplete(); + StepVerifier.create(Flux.from(result.keys())) + .expectNext(Collections.emptyList()) + .verifyComplete(); + StepVerifier.create(Flux.from(result.keys())) + .expectNext(Collections.emptyList()) + .verifyComplete(); } @Test diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java index ab8c8270ee..8b2c80d78f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java @@ -53,6 +53,7 @@ @EnabledOnNeo4jWith(BOLT_V4) @ParallelizableIT +@SuppressWarnings("deprecation") class RxSessionIT { @RegisterExtension static final DatabaseExtension neo4j = new DatabaseExtension(); diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java index b77d9f7ddb..2767004569 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/RxTransactionIT.java @@ -77,6 +77,7 @@ @EnabledOnNeo4jWith(BOLT_V4) @ParallelizableIT +@SuppressWarnings("deprecation") class RxTransactionIT { @RegisterExtension static final DatabaseExtension neo4j = new DatabaseExtension(); diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java index 634eb34b5c..c51c939003 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java @@ -40,6 +40,7 @@ class InternalBookmarkTest { @Test + @SuppressWarnings("deprecation") void isEmptyForEmptyBookmark() { Bookmark bookmark = InternalBookmark.empty(); assertTrue(bookmark.isEmpty()); @@ -80,6 +81,7 @@ void shouldReserveBookmarkValuesCorrectly() { } @Test + @SuppressWarnings("deprecation") void isNotEmptyForNonEmptyBookmark() { Bookmark bookmark = InternalBookmark.parse("SomeBookmark"); assertFalse(bookmark.isEmpty()); @@ -92,6 +94,7 @@ void asBeginTransactionParametersForNonEmptyBookmark() { } @Test + @SuppressWarnings("deprecation") void bookmarkFromString() { Bookmark bookmark = InternalBookmark.parse("Cat"); assertEquals(singleton("Cat"), bookmark.values()); @@ -99,6 +102,7 @@ void bookmarkFromString() { } @Test + @SuppressWarnings("deprecation") void bookmarkFromNullString() { Bookmark bookmark = InternalBookmark.parse((String) null); assertTrue(bookmark.isEmpty()); @@ -112,12 +116,14 @@ void bookmarkFromSet() { } @Test + @SuppressWarnings("deprecation") void bookmarkFromNullIterable() { Bookmark bookmark = InternalBookmark.parse((Set) null); assertTrue(bookmark.isEmpty()); } @Test + @SuppressWarnings("deprecation") void bookmarkFromEmptyIterable() { Bookmark bookmark = InternalBookmark.parse(emptySet()); assertTrue(bookmark.isEmpty()); @@ -131,6 +137,7 @@ void asBeginTransactionParametersForBookmarkWithInvalidValue() { } @Test + @SuppressWarnings("deprecation") void shouldReturnAllBookmarks() { assertIterableEquals(emptyList(), InternalBookmark.empty().values()); assertIterableEquals( @@ -142,12 +149,14 @@ void shouldReturnAllBookmarks() { } @Test + @SuppressWarnings("deprecation") void valueShouldBeReadOnly() { Bookmark bookmark = InternalBookmark.parse(asSet("first", "second")); Set values = bookmark.values(); assertThrows(UnsupportedOperationException.class, () -> values.add("third")); } + @SuppressWarnings("deprecation") private static void verifyValues(Bookmark bookmark, String... expectedValues) { assertThat(bookmark.values().size(), equalTo(expectedValues.length)); assertThat(bookmark.values(), hasItems(expectedValues)); diff --git a/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java b/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java index d5d5652d97..894e125fb1 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java @@ -39,6 +39,7 @@ private Node adamTheNode() { } @Test + @SuppressWarnings("deprecation") void testIdentity() { // Given Node node = adamTheNode(); diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java index ce365d6696..e745ab204b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java @@ -120,6 +120,7 @@ private static Stream>> session -> session.beginTransactionAsync(TransactionConfig.empty())); } + @SuppressWarnings("deprecation") private static Stream>> allRunTxMethods() { return Stream.of( session -> session.readTransactionAsync(tx -> completedFuture("a")), @@ -251,6 +252,7 @@ void shouldDelegateExecuteReadToRetryLogic(ExecuteVariation executeVariation) then(logic).should().retryAsync(any()); } + @SuppressWarnings("deprecation") private void testTxRollbackWhenThrows(AccessMode transactionMode) { final RuntimeException error = new IllegalStateException("Oh!"); AsyncTransactionWork> work = tx -> { @@ -336,6 +338,7 @@ private void testTxIsRetriedUntilFailureWhenCommitFails(AccessMode mode) { verifyCommitTx(connection, times(failures)); } + @SuppressWarnings("deprecation") private static T executeTransaction( AsyncSession session, AccessMode mode, AsyncTransactionWork> work) { if (mode == READ) { @@ -347,10 +350,12 @@ private static T executeTransaction( } } + @SuppressWarnings("deprecation") private static void verifyInvocationCount(AsyncTransactionWork workSpy, int expectedInvocationCount) { verify(workSpy, times(expectedInvocationCount)).execute(any(AsyncTransaction.class)); } + @SuppressWarnings("deprecation") private static class TxWork implements AsyncTransactionWork> { final int result; final int timesToThrow; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java index 2b9abfbf59..99496b93e5 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java @@ -431,7 +431,7 @@ private static Channel newChannelMock() { when(channel.id()).thenReturn(DefaultChannelId.newInstance()); ChannelConfig channelConfig = mock(ChannelConfig.class); when(channel.config()).thenReturn(channelConfig); - Attribute attribute = mock(Attribute.class); + Attribute attribute = mock(Attribute.class); when(channel.attr(any())).thenReturn(attribute); return channel; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/pool/TestConnectionPool.java b/driver/src/test/java/org/neo4j/driver/internal/async/pool/TestConnectionPool.java index 03ab4c022b..1bdda1c37f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/pool/TestConnectionPool.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/pool/TestConnectionPool.java @@ -82,7 +82,7 @@ public CompletionStage acquire() { setServerAddress(channel, address); setPoolId(channel, id()); - ListenerEvent event = nettyChannelTracker.channelCreating(id()); + ListenerEvent event = nettyChannelTracker.channelCreating(id()); nettyChannelTracker.channelCreated(channel, event); nettyChannelTracker.channelAcquired(channel); diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java index ba77bc5705..de11e40f53 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/MultiDatabasesRoutingProcedureRunnerTest.java @@ -18,7 +18,6 @@ */ package org.neo4j.driver.internal.cluster; -import static java.util.Collections.EMPTY_MAP; import static java.util.Collections.singletonList; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.hamcrest.Matchers.equalTo; @@ -65,7 +64,7 @@ void shouldCallGetRoutingTableWithEmptyMapOnSystemDatabaseForDatabase(String db) assertThat(runner.connection.databaseName(), equalTo(systemDatabase())); assertThat(runner.connection.mode(), equalTo(AccessMode.READ)); - Query query = generateMultiDatabaseRoutingQuery(EMPTY_MAP, db); + Query query = generateMultiDatabaseRoutingQuery(Collections.emptyMap(), db); assertThat(runner.procedure, equalTo(query)); } @@ -101,7 +100,7 @@ SingleDatabaseRoutingProcedureRunner singleDatabaseRoutingProcedureRunner( return new TestRoutingProcedureRunner(context, runProcedureResult); } - private static Query generateMultiDatabaseRoutingQuery(Map context, String db) { + private static Query generateMultiDatabaseRoutingQuery(Map context, String db) { Value parameters = parameters(ROUTING_CONTEXT, context, DATABASE_NAME, db); return new Query(MULTI_DB_GET_ROUTING_TABLE, parameters); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java index eb0cfef14a..1936dddb7c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingProcedureClusterCompositionProviderTest.java @@ -65,7 +65,7 @@ void shouldProtocolErrorWhenNoRecord() { ClusterCompositionProvider provider = newClusterCompositionProvider(mockedRunner, connection); RoutingProcedureResponse noRecordsResponse = newRoutingResponse(); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(noRecordsResponse)); // When & Then @@ -85,7 +85,7 @@ void shouldProtocolErrorWhenMoreThanOneRecord() { Record aRecord = new InternalRecord(asList("key1", "key2"), new Value[] {new StringValue("a value")}); RoutingProcedureResponse routingResponse = newRoutingResponse(aRecord, aRecord); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); // When @@ -105,7 +105,7 @@ void shouldProtocolErrorWhenUnparsableRecord() { Record aRecord = new InternalRecord(asList("key1", "key2"), new Value[] {new StringValue("a value")}); RoutingProcedureResponse routingResponse = newRoutingResponse(aRecord); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); // When @@ -128,7 +128,7 @@ void shouldProtocolErrorWhenNoRouters() { value(100), value(asList(serverInfo("READ", "one:1337", "two:1337"), serverInfo("WRITE", "one:1337"))) }); RoutingProcedureResponse routingResponse = newRoutingResponse(record); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); when(mockedClock.millis()).thenReturn(12345L); @@ -152,7 +152,7 @@ void routeMessageRoutingProcedureShouldProtocolErrorWhenNoRouters() { value(100), value(asList(serverInfo("READ", "one:1337", "two:1337"), serverInfo("WRITE", "one:1337"))) }); RoutingProcedureResponse routingResponse = newRoutingResponse(record); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); when(mockedClock.millis()).thenReturn(12345L); @@ -176,7 +176,7 @@ void shouldProtocolErrorWhenNoReaders() { value(100), value(asList(serverInfo("WRITE", "one:1337"), serverInfo("ROUTE", "one:1337", "two:1337"))) }); RoutingProcedureResponse routingResponse = newRoutingResponse(record); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); when(mockedClock.millis()).thenReturn(12345L); @@ -200,7 +200,7 @@ void routeMessageRoutingProcedureShouldProtocolErrorWhenNoReaders() { value(100), value(asList(serverInfo("WRITE", "one:1337"), serverInfo("ROUTE", "one:1337", "two:1337"))) }); RoutingProcedureResponse routingResponse = newRoutingResponse(record); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); when(mockedClock.millis()).thenReturn(12345L); @@ -219,7 +219,7 @@ void shouldPropagateConnectionFailureExceptions() { Connection connection = mock(Connection.class); ClusterCompositionProvider provider = newClusterCompositionProvider(mockedRunner, connection); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(failedFuture(new ServiceUnavailableException("Connection breaks during cypher execution"))); // When & Then @@ -246,7 +246,7 @@ void shouldReturnSuccessResultWhenNoError() { serverInfo("ROUTE", "one:1337", "two:1337"))) }); RoutingProcedureResponse routingResponse = newRoutingResponse(record); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); when(mockedClock.millis()).thenReturn(12345L); @@ -277,7 +277,7 @@ void routeMessageRoutingProcedureShouldReturnSuccessResultWhenNoError() { serverInfo("ROUTE", "one:1337", "two:1337"))) }); RoutingProcedureResponse routingResponse = newRoutingResponse(record); - when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(mockedRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(routingResponse)); when(mockedClock.millis()).thenReturn(12345L); @@ -298,7 +298,7 @@ void shouldReturnFailureWhenProcedureRunnerFails() { Connection connection = mock(Connection.class); RuntimeException error = new RuntimeException("hi"); - when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedFuture(newRoutingResponse(error))); RoutingProcedureClusterCompositionProvider provider = @@ -319,11 +319,11 @@ void shouldUseMultiDBProcedureRunnerWhenConnectingWith40Server() throws Throwabl RoutingProcedureClusterCompositionProvider provider = newClusterCompositionProvider(procedureRunner, connection); - when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedWithNull()); provider.getClusterComposition(connection, defaultDatabase(), Collections.emptySet(), null); - verify(procedureRunner).run(eq(connection), any(DatabaseName.class), any(Set.class), any()); + verify(procedureRunner).run(eq(connection), any(DatabaseName.class), any(), any()); } @Test @@ -334,11 +334,11 @@ void shouldUseProcedureRunnerWhenConnectingWith35AndPreviousServers() throws Thr RoutingProcedureClusterCompositionProvider provider = newClusterCompositionProvider(procedureRunner, connection); - when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedWithNull()); provider.getClusterComposition(connection, defaultDatabase(), Collections.emptySet(), null); - verify(procedureRunner).run(eq(connection), any(DatabaseName.class), any(Set.class), any()); + verify(procedureRunner).run(eq(connection), any(DatabaseName.class), any(), any()); } @Test @@ -349,11 +349,11 @@ void shouldUseRouteMessageProcedureRunnerWhenConnectingWithProtocol43() throws T RoutingProcedureClusterCompositionProvider provider = newClusterCompositionProvider(procedureRunner, connection); - when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(Set.class), any())) + when(procedureRunner.run(eq(connection), any(DatabaseName.class), any(), any())) .thenReturn(completedWithNull()); provider.getClusterComposition(connection, defaultDatabase(), Collections.emptySet(), null); - verify(procedureRunner).run(eq(connection), any(DatabaseName.class), any(Set.class), any()); + verify(procedureRunner).run(eq(connection), any(DatabaseName.class), any(), any()); } private static Map serverInfo(String role, String... addresses) { diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java index 86ee59be57..e82eb58ae3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/RoutingTableHandlerTest.java @@ -258,8 +258,7 @@ private static Rediscovery newRediscoveryMock() { Rediscovery rediscovery = mock(RediscoveryImpl.class); Set noServers = Collections.emptySet(); ClusterComposition clusterComposition = new ClusterComposition(1, noServers, noServers, noServers, null); - when(rediscovery.lookupClusterComposition( - any(RoutingTable.class), any(ConnectionPool.class), any(Set.class), any())) + when(rediscovery.lookupClusterComposition(any(RoutingTable.class), any(ConnectionPool.class), any(), any())) .thenReturn(completedFuture(new ClusterCompositionLookupResult(clusterComposition))); return rediscovery; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java index d1312e1925..7cdc834857 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/SingleDatabaseRoutingProcedureRunnerTest.java @@ -18,7 +18,6 @@ */ package org.neo4j.driver.internal.cluster; -import static java.util.Collections.EMPTY_MAP; import static java.util.Collections.singletonList; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.hamcrest.Matchers.equalTo; @@ -66,7 +65,7 @@ void shouldCallGetRoutingTableWithEmptyMap() { assertThat(runner.connection.databaseName(), equalTo(defaultDatabase())); assertThat(runner.connection.mode(), equalTo(AccessMode.WRITE)); - Query query = generateRoutingQuery(EMPTY_MAP); + Query query = generateRoutingQuery(Collections.emptyMap()); assertThat(runner.procedure, equalTo(query)); } @@ -113,7 +112,7 @@ private static Stream invalidDatabaseNames() { return Stream.of(SYSTEM_DATABASE_NAME, "This is a string", "null"); } - private static Query generateRoutingQuery(Map context) { + private static Query generateRoutingQuery(Map context) { Value parameters = parameters(ROUTING_CONTEXT, context); return new Query(GET_ROUTING_TABLE, parameters); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/cursor/RxResultCursorImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/cursor/RxResultCursorImplTest.java index bfd5a25d48..bc622e3eee 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cursor/RxResultCursorImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cursor/RxResultCursorImplTest.java @@ -44,6 +44,7 @@ import java.util.function.BiConsumer; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; +import org.neo4j.driver.Record; import org.neo4j.driver.exceptions.ResultConsumedException; import org.neo4j.driver.internal.handlers.RunResponseHandler; import org.neo4j.driver.internal.handlers.pulln.PullResponseHandler; @@ -53,6 +54,7 @@ class RxResultCursorImplTest { @Test + @SuppressWarnings("unchecked") void shouldInstallSummaryConsumerWithoutReportingError() { // Given RuntimeException error = new RuntimeException("Hi"); @@ -154,7 +156,8 @@ void shouldCancel() { void shouldInstallRecordConsumerAndReportError() { // Given RuntimeException error = new RuntimeException("Hi"); - BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") + BiConsumer recordConsumer = mock(BiConsumer.class); // When RunResponseHandler runHandler = newRunResponseHandler(error); diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandlerTestBase.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandlerTestBase.java index 2cc327f701..ac566fea72 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandlerTestBase.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandlerTestBase.java @@ -83,7 +83,9 @@ void shouldRequestMoreWithHasMore() throws Throwable { void shouldInformSummaryConsumerSuccessWithHasMore() throws Throwable { // Given Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); BasicPullResponseHandler handler = newResponseHandlerWithStatus( conn, recordConsumer, summaryConsumer, BasicPullResponseHandler.State.STREAMING_STATE); @@ -123,7 +125,9 @@ void shouldErrorToRecordAndSummaryConsumer(BasicPullResponseHandler.State state) void shouldReportRecordInStreaming() throws Throwable { // Given a handler in streaming state Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); BasicPullResponseHandler handler = newResponseHandlerWithStatus( conn, recordConsumer, summaryConsumer, BasicPullResponseHandler.State.STREAMING_STATE); @@ -143,7 +147,9 @@ void shouldReportRecordInStreaming() throws Throwable { void shouldNotReportRecordWhenNotStreaming(BasicPullResponseHandler.State state) throws Throwable { // Given a handler in streaming state Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); BasicPullResponseHandler handler = newResponseHandlerWithStatus(conn, recordConsumer, summaryConsumer, state); @@ -242,7 +248,9 @@ static Connection mockConnection() { private BasicPullResponseHandler newResponseHandlerWithStatus( Connection conn, BasicPullResponseHandler.State state) { + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); return newResponseHandlerWithStatus(conn, recordConsumer, summaryConsumer, state); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/SessionPullResponseCompletionListenerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/SessionPullResponseCompletionListenerTest.java index 642c61c5ca..252cb4369d 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/SessionPullResponseCompletionListenerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/SessionPullResponseCompletionListenerTest.java @@ -40,7 +40,9 @@ class SessionPullResponseCompletionListenerTest extends BasicPullResponseHandler protected void shouldHandleSuccessWithSummary(BasicPullResponseHandler.State state) { // Given Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); BookmarksHolder bookmarksHolder = mock(BookmarksHolder.class); PullResponseHandler handler = @@ -60,7 +62,9 @@ protected void shouldHandleSuccessWithSummary(BasicPullResponseHandler.State sta protected void shouldHandleFailure(BasicPullResponseHandler.State state) { // Given Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); BasicPullResponseHandler handler = newResponseHandlerWithStatus(conn, recordConsumer, summaryConsumer, state); diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/TransactionPullResponseCompletionListenerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/TransactionPullResponseCompletionListenerTest.java index fdc6fcccc1..0762d4ed92 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/TransactionPullResponseCompletionListenerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/TransactionPullResponseCompletionListenerTest.java @@ -42,7 +42,9 @@ public class TransactionPullResponseCompletionListenerTest extends BasicPullResp protected void shouldHandleSuccessWithSummary(BasicPullResponseHandler.State state) { // Given Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); BasicPullResponseHandler handler = newResponseHandlerWithStatus(conn, recordConsumer, summaryConsumer, state); @@ -59,7 +61,9 @@ protected void shouldHandleSuccessWithSummary(BasicPullResponseHandler.State sta protected void shouldHandleFailure(BasicPullResponseHandler.State state) { // Given Connection conn = mockConnection(); + @SuppressWarnings("unchecked") BiConsumer recordConsumer = mock(BiConsumer.class); + @SuppressWarnings("unchecked") BiConsumer summaryConsumer = mock(BiConsumer.class); UnmanagedTransaction tx = mock(UnmanagedTransaction.class); when(tx.isOpen()).thenReturn(true); diff --git a/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalReactiveSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalReactiveSessionTest.java index 37cb5f19ad..175ad56354 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalReactiveSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalReactiveSessionTest.java @@ -172,6 +172,7 @@ void shouldReleaseConnectionIfFailedToBeginTx(Function> allSessionRunMethods() { return Stream.of( diff --git a/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalRxTransactionTest.java b/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalRxTransactionTest.java index 54daf140af..a2c12aa5fd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalRxTransactionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/reactive/InternalRxTransactionTest.java @@ -52,6 +52,7 @@ import org.reactivestreams.Publisher; import reactor.test.StepVerifier; +@SuppressWarnings("deprecation") class InternalRxTransactionTest { @Test void commitShouldDelegate() { diff --git a/driver/src/test/java/org/neo4j/driver/internal/reactive/util/ListBasedPullHandler.java b/driver/src/test/java/org/neo4j/driver/internal/reactive/util/ListBasedPullHandler.java index f2acd0f7f9..e36ddc9fbd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/reactive/util/ListBasedPullHandler.java +++ b/driver/src/test/java/org/neo4j/driver/internal/reactive/util/ListBasedPullHandler.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.when; import java.util.List; -import java.util.Map; import org.neo4j.driver.Query; import org.neo4j.driver.Record; import org.neo4j.driver.Value; @@ -66,7 +65,7 @@ private ListBasedPullHandler(List list, Throwable error) { mock(PullResponseCompletionListener.class)); this.list = list; this.error = error; - when(super.metadataExtractor.extractSummary(any(Query.class), any(Connection.class), anyLong(), any(Map.class))) + when(super.metadataExtractor.extractSummary(any(Query.class), any(Connection.class), anyLong(), any())) .thenReturn(mock(ResultSummary.class)); if (list.size() > 1) { Record record = list.get(0); 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 index 2985aef268..ebe7a8f16b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/BookmarkUtil.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/BookmarkUtil.java @@ -38,6 +38,7 @@ public class BookmarkUtil { /** * Bookmark is empty. */ + @SuppressWarnings("deprecation") public static void assertBookmarkIsEmpty(Bookmark bookmark) { assertNotNull(bookmark); assertThat(bookmark, instanceOf(InternalBookmark.class)); @@ -47,6 +48,7 @@ public static void assertBookmarkIsEmpty(Bookmark bookmark) { /** * Bookmark is not empty but I do not care what value it has. */ + @SuppressWarnings("deprecation") public static void assertBookmarkIsNotEmpty(Bookmark bookmark) { assertNotNull(bookmark); assertThat(bookmark, instanceOf(InternalBookmark.class)); @@ -63,6 +65,7 @@ public static void assertBookmarkContainsSingleValue(Bookmark bookmark) { /** * Bookmark contains one single value and the value matches the requirement set by matcher. */ + @SuppressWarnings("deprecation") public static void assertBookmarkContainsSingleValue(Bookmark bookmark, Matcher matcher) { assertNotNull(bookmark); assertThat(bookmark, instanceOf(InternalBookmark.class)); @@ -75,6 +78,7 @@ public static void assertBookmarkContainsSingleValue(Bookmark bookmark, Matcher< /** * Bookmark contains values matching the requirement set by matcher. */ + @SuppressWarnings("deprecation") public static void assertBookmarkContainsValues(Bookmark bookmark, Matcher> matcher) { assertNotNull(bookmark); assertThat(bookmark, instanceOf(InternalBookmark.class)); @@ -86,6 +90,7 @@ public static void assertBookmarkContainsValues(Bookmark bookmark, Matcher bookmarkStrings = new HashSet<>(); diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/ClusterCompositionUtil.java b/driver/src/test/java/org/neo4j/driver/internal/util/ClusterCompositionUtil.java index 1984a2ccf5..5d47116036 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/ClusterCompositionUtil.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/ClusterCompositionUtil.java @@ -46,6 +46,7 @@ public static ClusterComposition createClusterComposition(List... servers) { Set routers = new LinkedHashSet<>(); diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java b/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java index af9d6406e8..a663cd4fbd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java @@ -154,6 +154,7 @@ public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) } @Override + @SuppressWarnings("unchecked") public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) { scheduleDelays.add(unit.toMillis(delay)); delegate.submit(callable); diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/MatcherFactory.java b/driver/src/test/java/org/neo4j/driver/internal/util/MatcherFactory.java deleted file mode 100644 index b6c01c2792..0000000000 --- a/driver/src/test/java/org/neo4j/driver/internal/util/MatcherFactory.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.util; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.SelfDescribing; -import org.hamcrest.TypeSafeDiagnosingMatcher; -import org.hamcrest.TypeSafeMatcher; - -public abstract class MatcherFactory implements SelfDescribing { - public abstract Matcher createMatcher(); - - /** - * Matches a collection based on the number of elements in the collection that match a given matcher. - * - * @param matcher - * The matcher used for counting matching elements. - * @param count - * The matcher used for evaluating the number of matching elements. - * @param - * The type of elements in the collection. - * @return A matcher for a collection. - */ - public static Matcher> count(final Matcher matcher, final Matcher count) { - return new TypeSafeDiagnosingMatcher>() { - @Override - protected boolean matchesSafely(Iterable collection, Description mismatchDescription) { - int matches = 0; - for (T item : collection) { - if (matcher.matches(item)) { - matches++; - } - } - if (count.matches(matches)) { - return true; - } - mismatchDescription - .appendText("actual number of matches was ") - .appendValue(matches) - .appendText(" in ") - .appendValue(collection); - return false; - } - - @Override - public void describeTo(Description description) { - description - .appendText("collection containing ") - .appendDescriptionOf(count) - .appendText(" occurences of ") - .appendDescriptionOf(matcher); - } - }; - } - - /** - * Matches a collection that contains elements that match the specified matchers. The elements must be in the same - * order as the given matchers, but the collection may contain other elements in between the matching elements. - * - * @param matchers - * The matchers for the elements of the collection. - * @param - * The type of the elements in the collection. - * @return A matcher for a collection. - */ - @SafeVarargs - public static Matcher> containsAtLeast(final Matcher... matchers) { - @SuppressWarnings("unchecked") - MatcherFactory[] factories = new MatcherFactory[matchers.length]; - for (int i = 0; i < factories.length; i++) { - factories[i] = matches(matchers[i]); - } - return containsAtLeast(factories); - } - - @SafeVarargs - public static Matcher> containsAtLeast(final MatcherFactory... matcherFactories) { - return new TypeSafeMatcher>() { - @Override - protected boolean matchesSafely(Iterable collection) { - @SuppressWarnings("unchecked") - Matcher[] matchers = new Matcher[matcherFactories.length]; - for (int i = 0; i < matchers.length; i++) { - matchers[i] = matcherFactories[i].createMatcher(); - } - int i = 0; - for (T item : collection) { - if (i >= matchers.length) { - return true; - } - if (matchers[i].matches(item)) { - i++; - } - } - return i == matchers.length; - } - - @Override - public void describeTo(Description description) { - description.appendText("collection containing at least "); - for (int i = 0; i < matcherFactories.length; i++) { - if (i != 0) { - if (i == matcherFactories.length - 1) { - description.appendText(" and "); - } else { - description.appendText(", "); - } - } - description.appendDescriptionOf(matcherFactories[i]); - } - description.appendText(" (in that order) "); - } - }; - } - - @SafeVarargs - public static MatcherFactory inAnyOrder(final Matcher... matchers) { - return new MatcherFactory() { - @Override - public Matcher createMatcher() { - final List> remaining = new ArrayList<>(matchers.length); - Collections.addAll(remaining, matchers); - return new BaseMatcher() { - @Override - public boolean matches(Object item) { - for (Iterator> matcher = remaining.iterator(); matcher.hasNext(); ) { - if (matcher.next().matches(item)) { - matcher.remove(); - return remaining.isEmpty(); - } - } - return remaining.isEmpty(); - } - - @Override - public void describeTo(Description description) { - describe(description); - } - }; - } - - @Override - public void describeTo(Description description) { - describe(description); - } - - private void describe(Description description) { - description.appendText("in any order"); - String sep = " {"; - for (Matcher matcher : matchers) { - description.appendText(sep); - description.appendDescriptionOf(matcher); - sep = ", "; - } - description.appendText("}"); - } - }; - } - - public static MatcherFactory matches(final Matcher matcher) { - return new MatcherFactory() { - @Override - public Matcher createMatcher() { - return matcher; - } - - @Override - public void describeTo(Description description) { - matcher.describeTo(description); - } - }; - } -} diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/MetadataExtractorTest.java b/driver/src/test/java/org/neo4j/driver/internal/util/MetadataExtractorTest.java index 80396ceada..290c6aadbe 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/MetadataExtractorTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/MetadataExtractorTest.java @@ -342,28 +342,28 @@ void shouldBuildResultSummaryWithoutResultConsumedAfter() { void shouldExtractBookmark() { String bookmarkValue = "neo4j:bookmark:v1:tx123456"; - Bookmark bookmark = extractor.extractBookmarks(singletonMap("bookmark", value(bookmarkValue))); + Bookmark bookmark = MetadataExtractor.extractBookmarks(singletonMap("bookmark", value(bookmarkValue))); assertEquals(InternalBookmark.parse(bookmarkValue), bookmark); } @Test void shouldExtractNoBookmarkWhenMetadataContainsNull() { - Bookmark bookmark = extractor.extractBookmarks(singletonMap("bookmark", null)); + Bookmark bookmark = MetadataExtractor.extractBookmarks(singletonMap("bookmark", null)); assertEquals(InternalBookmark.empty(), bookmark); } @Test void shouldExtractNoBookmarkWhenMetadataContainsNullValue() { - Bookmark bookmark = extractor.extractBookmarks(singletonMap("bookmark", Values.NULL)); + Bookmark bookmark = MetadataExtractor.extractBookmarks(singletonMap("bookmark", Values.NULL)); assertEquals(InternalBookmark.empty(), bookmark); } @Test void shouldExtractNoBookmarkWhenMetadataContainsValueOfIncorrectType() { - Bookmark bookmark = extractor.extractBookmarks(singletonMap("bookmark", value(42))); + Bookmark bookmark = MetadataExtractor.extractBookmarks(singletonMap("bookmark", value(42))); assertEquals(InternalBookmark.empty(), bookmark); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java b/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java index 656c8fb16c..cfcec2bd39 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java @@ -65,7 +65,7 @@ private static ConditionEvaluationResult checkFeatureAvailability(Neo4jFeature f Driver driver = DatabaseExtension.getInstance().driver(); if (driver != null) { try (Session session = driver.session()) { - String agent = session.readTransaction( + String agent = session.executeRead( tx -> tx.run("RETURN 1").consume().server().agent()); Pattern pattern = Pattern.compile("^Neo4j/(\\d+)\\.(\\d+)\\.(\\d+)(-dev)?$"); Matcher matcher = pattern.matcher(agent); diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java b/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java index 402a0bd409..c34fb2dd84 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java @@ -117,6 +117,7 @@ protected void packInternalValue(InternalValue value) throws IOException { } } + @SuppressWarnings("deprecation") private void packPath(Path path) throws IOException { packer.packStructHeader(3, CommonValueUnpacker.PATH); @@ -162,6 +163,7 @@ private void packPath(Path path) throws IOException { } } + @SuppressWarnings("deprecation") private void packRelationship(Relationship rel) throws IOException { packer.packStructHeader(elementIdEnabled ? 8 : 5, CommonValueUnpacker.RELATIONSHIP); packer.pack(rel.id()); @@ -179,6 +181,7 @@ private void packRelationship(Relationship rel) throws IOException { } } + @SuppressWarnings("deprecation") private void packNode(Node node) throws IOException { packer.packStructHeader(elementIdEnabled ? 4 : 3, CommonValueUnpacker.NODE); packer.pack(node.id()); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AbstractRxQuery.java b/driver/src/test/java/org/neo4j/driver/stress/AbstractRxQuery.java index 4f7ced88d6..775fa3d077 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AbstractRxQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AbstractRxQuery.java @@ -33,6 +33,7 @@ public AbstractRxQuery(Driver driver, boolean useBookmark) { this.useBookmark = useBookmark; } + @SuppressWarnings("deprecation") public RxSession newSession(AccessMode mode, C context) { if (useBookmark) { return driver.rxSession(builder() diff --git a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java index db6cc1bba1..6710b98199 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java @@ -36,6 +36,7 @@ import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; +import java.lang.reflect.Array; import java.lang.reflect.Method; import java.net.URI; import java.time.Duration; @@ -310,7 +311,9 @@ private Future launchRxWorkerThread(ExecutorService executor, List executeRxCommands(C context, List> commands, int count) { - CompletableFuture[] executions = new CompletableFuture[count]; + @SuppressWarnings("unchecked") + CompletableFuture[] executions = + (CompletableFuture[]) Array.newInstance(CompletableFuture.class, count); for (int i = 0; i < count; i++) { RxCommand command = randomOf(commands); CompletionStage execution = command.execute(context); @@ -357,9 +360,10 @@ private Future launchAsyncWorkerThread(ExecutorService executor, List executeAsyncCommands(C context, List> commands, int count) { - CompletableFuture[] executions = new CompletableFuture[count]; + @SuppressWarnings("unchecked") + CompletableFuture[] executions = + (CompletableFuture[]) Array.newInstance(CompletableFuture.class, count); for (int i = 0; i < count; i++) { AsyncCommand command = randomOf(commands); CompletionStage execution = command.execute(context); @@ -452,6 +456,7 @@ private static int bigDataTestBatchCount() { return BIG_DATA_TEST_NODE_COUNT / BIG_DATA_TEST_BATCH_SIZE; } + @SuppressWarnings("deprecation") private static Bookmark createNodesBlocking(int batchCount, int batchSize, Driver driver) { Bookmark bookmark; @@ -469,6 +474,7 @@ private static Bookmark createNodesBlocking(int batchCount, int batchSize, Drive return bookmark; } + @SuppressWarnings("deprecation") private static void readNodesBlocking(Driver driver, Bookmark bookmark, int expectedNodeCount) { long start = System.nanoTime(); try (Session session = driver.session(builder().withBookmarks(bookmark).build())) { @@ -496,6 +502,7 @@ private static void readNodesBlocking(Driver driver, Bookmark bookmark, int expe System.out.println("Reading nodes with blocking API took: " + NANOSECONDS.toMillis(end - start) + "ms"); } + @SuppressWarnings("deprecation") private static Bookmark createNodesAsync(int batchCount, int batchSize, Driver driver) throws Throwable { long start = System.nanoTime(); @@ -521,6 +528,7 @@ private static Bookmark createNodesAsync(int batchCount, int batchSize, Driver d return session.lastBookmark(); } + @SuppressWarnings("deprecation") private static void readNodesAsync(Driver driver, Bookmark bookmark, int expectedNodeCount) throws Throwable { long start = System.nanoTime(); @@ -555,6 +563,7 @@ private static void readNodesAsync(Driver driver, Bookmark bookmark, int expecte System.out.println("Reading nodes with async API took: " + NANOSECONDS.toMillis(end - start) + "ms"); } + @SuppressWarnings("deprecation") private Bookmark createNodesRx(int batchCount, int batchSize, InternalDriver driver) { long start = System.nanoTime(); @@ -571,6 +580,7 @@ private Bookmark createNodesRx(int batchCount, int batchSize, InternalDriver dri return session.lastBookmark(); } + @SuppressWarnings("deprecation") private Publisher createNodesInTxRx(RxTransaction tx, int batchIndex, int batchSize) { return Flux.concat(Flux.range(0, batchSize) .map(index -> batchIndex * batchSize + index) @@ -580,6 +590,7 @@ private Publisher createNodesInTxRx(RxTransaction tx, int batchIndex, int })); } + @SuppressWarnings("deprecation") private void readNodesRx(InternalDriver driver, Bookmark bookmark, int expectedNodeCount) { long start = System.nanoTime(); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryWithRetries.java index 1ade362b0c..3e6830b30d 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryWithRetries.java @@ -38,6 +38,7 @@ public AsyncFailingQueryWithRetries(Driver driver) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { AsyncSession session = newSession(AccessMode.READ, context); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncReadQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncReadQueryWithRetries.java index da43b584b5..cf17f4aade 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncReadQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncReadQueryWithRetries.java @@ -35,6 +35,7 @@ public AsyncReadQueryWithRetries(Driver driver, boolean useBookmark) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { AsyncSession session = newSession(AccessMode.READ, context); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java index 52fc97041d..0ae34acfc2 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQuery.java @@ -36,6 +36,7 @@ public AsyncWriteQuery(AbstractStressTestBase stressTest, Driver driver, bool } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { AsyncSession session = newSession(AccessMode.WRITE, context); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java index bb45615f8c..37c6d96acc 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryInTx.java @@ -36,6 +36,7 @@ public AsyncWriteQueryInTx(AbstractStressTestBase stressTest, Driver driver, } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { AsyncSession session = newSession(AccessMode.WRITE, context); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryWithRetries.java index 424ff62ddf..74ab5ff85d 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWriteQueryWithRetries.java @@ -36,6 +36,7 @@ public AsyncWriteQueryWithRetries(AbstractStressTestBase stressTest, Driver d } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { AsyncSession session = newSession(AccessMode.WRITE, context); @@ -61,6 +62,7 @@ private Void recordAndRethrowThrowable(Throwable throwable, C context) { return null; } + @SuppressWarnings("deprecation") private void finalizeSession(AsyncSession session, C context) { context.setBookmark(session.lastBookmark()); session.closeAsync(); diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryWithRetries.java index 59fb40b376..b038445ca8 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryWithRetries.java @@ -41,6 +41,7 @@ public AsyncWrongQueryWithRetries(Driver driver) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { AsyncSession session = newSession(AccessMode.READ, context); diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryWithRetries.java index b3b98addbe..f5646094e7 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryWithRetries.java @@ -33,6 +33,7 @@ public BlockingFailingQueryWithRetries(Driver driver) { } @Override + @SuppressWarnings("deprecation") public void execute(C context) { try (Session session = newSession(AccessMode.READ, context)) { Exception e = assertThrows( diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingReadQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingReadQueryWithRetries.java index c951cf7e36..9afa42b5eb 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingReadQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingReadQueryWithRetries.java @@ -36,6 +36,7 @@ public BlockingReadQueryWithRetries(Driver driver, boolean useBookmark) { } @Override + @SuppressWarnings("deprecation") public void execute(C context) { try (Session session = newSession(AccessMode.READ, context)) { ResultSummary resultSummary = session.readTransaction(tx -> { diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java index 890d728ed3..d2626383f3 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQuery.java @@ -34,6 +34,7 @@ public BlockingWriteQuery(AbstractStressTestBase stressTest, Driver driver, b } @Override + @SuppressWarnings("deprecation") public void execute(C context) { ResultSummary summary = null; Throwable queryError = null; diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryInTx.java index 8c8e6bf607..2710eb8b80 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryInTx.java @@ -35,6 +35,7 @@ public BlockingWriteQueryInTx(AbstractStressTestBase stressTest, Driver drive } @Override + @SuppressWarnings("deprecation") public void execute(C context) { Result result = null; Throwable txError = null; diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryUsingReadSessionWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryUsingReadSessionWithRetries.java index 9514fe56b5..5cbe9edb03 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryUsingReadSessionWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryUsingReadSessionWithRetries.java @@ -31,6 +31,7 @@ public BlockingWriteQueryUsingReadSessionWithRetries(Driver driver, boolean useB } @Override + @SuppressWarnings("deprecation") public void execute(C context) { try (Session session = newSession(AccessMode.READ, context)) { assertThrows(ClientException.class, () -> session.readTransaction(tx -> tx.run("CREATE ()"))); diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryWithRetries.java index beab3835b9..a9bba17bfe 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWriteQueryWithRetries.java @@ -34,6 +34,7 @@ public BlockingWriteQueryWithRetries(AbstractStressTestBase stressTest, Drive } @Override + @SuppressWarnings("deprecation") public void execute(C context) { try (Session session = newSession(AccessMode.WRITE, context)) { ResultSummary resultSummary = diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryWithRetries.java index 460aab6437..5b41a98e68 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryWithRetries.java @@ -33,6 +33,7 @@ public BlockingWrongQueryWithRetries(Driver driver) { } @Override + @SuppressWarnings("deprecation") public void execute(C context) { try (Session session = newSession(AccessMode.READ, context)) { Exception e = assertThrows( diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQuery.java b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQuery.java index a5031347a0..32079a6c27 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQuery.java @@ -39,6 +39,7 @@ public RxFailingQuery(Driver driver) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); Flux.usingWhen( diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryInTx.java index 9864390edd..f009683d67 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryInTx.java @@ -39,6 +39,7 @@ public RxFailingQueryInTx(Driver driver) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); RxSession session = newSession(AccessMode.READ, context); diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryWithRetries.java index 8828104f66..3c49d0a83b 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryWithRetries.java @@ -39,6 +39,7 @@ public RxFailingQueryWithRetries(Driver driver) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); Flux.usingWhen( diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxReadQuery.java b/driver/src/test/java/org/neo4j/driver/stress/RxReadQuery.java index fa26ac19c1..ffb282571e 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxReadQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxReadQuery.java @@ -36,6 +36,7 @@ public RxReadQuery(Driver driver, boolean useBookmark) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); Flux.usingWhen( @@ -54,6 +55,7 @@ public CompletionStage execute(C context) { return queryFinished; } + @SuppressWarnings("deprecation") private Publisher processAndGetSummary(RxSession session) { RxResult result = session.run("MATCH (n) RETURN n LIMIT 1"); Mono records = Flux.from(result.records()).singleOrEmpty().map(record -> record.get(0) diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryInTx.java index 7d7f167b87..d236a58a51 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryInTx.java @@ -37,6 +37,7 @@ public RxReadQueryInTx(Driver driver, boolean useBookmark) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); RxSession session = newSession(AccessMode.READ, context); @@ -58,6 +59,7 @@ public CompletionStage execute(C context) { return queryFinished; } + @SuppressWarnings("deprecation") private Publisher processAndGetSummary(RxTransaction tx) { RxResult result = tx.run("MATCH (n) RETURN n LIMIT 1"); Mono records = Flux.from(result.records()).singleOrEmpty().map(record -> record.get(0) diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryWithRetries.java index 6030096387..ace4fe663b 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryWithRetries.java @@ -36,6 +36,7 @@ public RxReadQueryWithRetries(Driver driver, boolean useBookmark) { } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); Flux.usingWhen( @@ -54,6 +55,7 @@ public CompletionStage execute(C context) { return queryFinished; } + @SuppressWarnings("deprecation") private Publisher processAndGetSummary(RxSession session) { return session.readTransaction(tx -> { RxResult result = tx.run("MATCH (n) RETURN n LIMIT 1"); diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java index d618287a03..ff4c9c45b3 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQuery.java @@ -38,6 +38,7 @@ public RxWriteQuery(AbstractStressTestBase stressTest, Driver driver, boolean } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); Flux.usingWhen( diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java index 2535ad10ed..82ccc7355b 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryInTx.java @@ -42,6 +42,7 @@ public RxWriteQueryInTx(AbstractStressTestBase stressTest, Driver driver, boo } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); diff --git a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryWithRetries.java b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryWithRetries.java index 3dc4d9bf04..254112a31b 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxWriteQueryWithRetries.java @@ -38,6 +38,7 @@ public RxWriteQueryWithRetries(AbstractStressTestBase stressTest, Driver driv } @Override + @SuppressWarnings("deprecation") public CompletionStage execute(C context) { CompletableFuture queryFinished = new CompletableFuture<>(); diff --git a/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java b/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java index 63bb4f2dc9..df4a6f6589 100644 --- a/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java +++ b/driver/src/test/java/org/neo4j/driver/tck/reactive/RxResultRecordPublisherVerificationIT.java @@ -33,6 +33,7 @@ import org.testng.annotations.BeforeClass; @Testcontainers(disabledWithoutDocker = true) +@SuppressWarnings("deprecation") public class RxResultRecordPublisherVerificationIT extends PublisherVerification { private final Neo4jManager NEO4J = new Neo4jManager(); private static final long MAX_NUMBER_OF_RECORDS = 30000; diff --git a/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java b/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java index c0eea975f1..246eae6b8b 100644 --- a/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java +++ b/driver/src/test/java/org/neo4j/driver/util/DatabaseExtension.java @@ -252,7 +252,7 @@ public boolean isNeo4j43OrEarlier() { private boolean isNeo4jVersionOrEarlier(int major, int minor) { try (Session session = driver.session()) { - String neo4jVersion = session.readTransaction( + String neo4jVersion = session.executeRead( tx -> tx.run("CALL dbms.components() YIELD versions " + "RETURN versions[0] AS version") .single() .get("version") @@ -312,6 +312,7 @@ private static Neo4jContainer setupNeo4jContainer(File cert, File key, Map setupNginxContainer() { ImageFromDockerfile extendedNginxImage = new ImageFromDockerfile() .withDockerfileFromBuilder(builder -> builder.from("nginx:1.23.0-alpine") @@ -319,7 +320,6 @@ private static GenericContainer setupNginxContainer() { .build()) .withFileFromClasspath("nginx.conf", "nginx.conf"); - //noinspection rawtypes return new GenericContainer(extendedNginxImage.get()) .withNetwork(network) .withExposedPorts(BOLT_PORT, HTTP_PORT) diff --git a/driver/src/test/java/org/neo4j/driver/util/SessionExtension.java b/driver/src/test/java/org/neo4j/driver/util/SessionExtension.java index 0670940592..5b6aef62ef 100644 --- a/driver/src/test/java/org/neo4j/driver/util/SessionExtension.java +++ b/driver/src/test/java/org/neo4j/driver/util/SessionExtension.java @@ -78,11 +78,13 @@ public Transaction beginTransaction(TransactionConfig config) { } @Override + @SuppressWarnings("deprecation") public T readTransaction(TransactionWork work) { return realSession.readTransaction(work); } @Override + @SuppressWarnings("deprecation") public T readTransaction(TransactionWork work, TransactionConfig config) { return realSession.readTransaction(work, config); } @@ -93,11 +95,13 @@ public T executeRead(TransactionCallback callback, TransactionConfig conf } @Override + @SuppressWarnings("deprecation") public T writeTransaction(TransactionWork work) { return realSession.writeTransaction(work); } @Override + @SuppressWarnings("deprecation") public T writeTransaction(TransactionWork work, TransactionConfig config) { return realSession.writeTransaction(work, config); } @@ -108,11 +112,13 @@ public T executeWrite(TransactionCallback callback, TransactionConfig con } @Override + @SuppressWarnings("deprecation") public Bookmark lastBookmark() { return realSession.lastBookmark(); } @Override + @SuppressWarnings("deprecation") public Set lastBookmarks() { Bookmark bookmark = lastBookmark(); if (bookmark == null || bookmark.isEmpty()) { diff --git a/driver/src/test/java/org/neo4j/driver/util/TestUtil.java b/driver/src/test/java/org/neo4j/driver/util/TestUtil.java index 42b084dd6d..b33d96adb0 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestUtil.java +++ b/driver/src/test/java/org/neo4j/driver/util/TestUtil.java @@ -32,7 +32,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.driver.AccessMode.WRITE; -import static org.neo4j.driver.SessionConfig.builder; import static org.neo4j.driver.SessionConfig.forDatabase; import static org.neo4j.driver.internal.DatabaseNameUtil.database; import static org.neo4j.driver.internal.DatabaseNameUtil.defaultDatabase; @@ -129,6 +128,7 @@ public static List await(Flux publisher) { } @SafeVarargs + @SuppressWarnings("varargs") public static List awaitAll(CompletionStage... stages) { return awaitAll(Arrays.asList(stages)); } @@ -187,26 +187,20 @@ public static void assertByteBufEquals(ByteBuf expected, ByteBuf actual) { } @SafeVarargs + @SuppressWarnings("varargs") public static Set asOrderedSet(T... elements) { return new LinkedHashSet<>(Arrays.asList(elements)); } @SafeVarargs + @SuppressWarnings("varargs") public static Set asSet(T... elements) { return new HashSet<>(Arrays.asList(elements)); } - public static long countNodes(Driver driver, Bookmark bookmark) { - try (Session session = driver.session(builder().withBookmarks(bookmark).build())) { - return session.readTransaction( - tx -> tx.run("MATCH (n) RETURN count(n)").single().get(0).asLong()); - } - } - - public static Bookmark cleanDb(Driver driver) { + public static void cleanDb(Driver driver) { try (Session session = driver.session()) { cleanDb(session); - return session.lastBookmark(); } } @@ -550,7 +544,7 @@ private static void cleanDb(Session session) { } private static int deleteBatchOfNodes(Session session) { - return session.writeTransaction(tx -> { + return session.executeWrite(tx -> { Result result = tx.run("MATCH (n) WITH n LIMIT 1000 DETACH DELETE n RETURN count(n)"); return result.single().get(0).asInt(); }); diff --git a/pom.xml b/pom.xml index 00dcac12be..f775cac913 100644 --- a/pom.xml +++ b/pom.xml @@ -507,14 +507,6 @@ -Werror - - - default-testCompile - - - - - org.apache.maven.plugins