From 0e406b298834ceba794e4101cc94d6835da7fcb1 Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Wed, 2 Aug 2023 18:12:48 +0100 Subject: [PATCH] Refactoring --- CONTRIBUTING.md | 2 +- ISSUE_TEMPLATE.md | 6 +- README.md | 4 +- driver/pom.xml | 2 +- .../main/java/org/neo4j/driver/Config.java | 1 + .../main/java/org/neo4j/driver/Driver.java | 1 + .../main/java/org/neo4j/driver/Logging.java | 1 + .../AuthTokenManagerExecutionException.java | 2 +- .../neo4j/driver/internal/InternalPath.java | 2 +- .../NettyDomainNameResolverGroup.java | 1 + .../internal/cluster/RediscoveryImpl.java | 2 +- .../internal/logging/DevNullLogging.java | 1 + .../internal/packstream/PackStream.java | 1 + .../retry/ExponentialBackoffRetryLogic.java | 3 + .../reactivestreams/ReactiveResult.java | 8 +- .../reactivestreams/ReactiveSession.java | 4 +- .../java/org/neo4j/driver/summary/Plan.java | 2 +- .../neo4j/driver/summary/SummaryCounters.java | 2 +- .../org/neo4j/driver/types/MapAccessor.java | 4 +- .../types/MapAccessorWithDefaultValue.java | 2 +- .../java/org/neo4j/driver/types/Point.java | 1 + .../org/neo4j/driver/types/Relationship.java | 8 +- .../java/org/neo4j/driver/types/Type.java | 2 +- .../org/neo4j/driver/types/TypeSystem.java | 1 + .../java/org/neo4j/driver/AuthTokensTest.java | 2 +- .../org/neo4j/driver/GraphDatabaseTest.java | 2 +- .../java/org/neo4j/driver/ParametersTest.java | 2 +- .../org/neo4j/driver/QueryConfigTest.java | 1 + .../test/java/org/neo4j/driver/QueryTest.java | 2 +- .../integration/ChannelConnectorImplIT.java | 2 +- .../driver/integration/ConnectionPoolIT.java | 2 +- .../driver/integration/CredentialsIT.java | 2 +- .../driver/integration/DirectDriverIT.java | 2 +- .../driver/integration/EncryptionIT.java | 2 +- .../org/neo4j/driver/integration/ErrorIT.java | 2 +- .../org/neo4j/driver/integration/QueryIT.java | 2 + .../driver/integration/ResultStreamIT.java | 2 +- .../driver/integration/RoutingDriverIT.java | 2 +- .../neo4j/driver/integration/SessionIT.java | 2 +- .../driver/integration/SessionMixIT.java | 2 +- .../driver/integration/SessionResetIT.java | 2 +- .../neo4j/driver/integration/SummaryIT.java | 2 +- .../driver/integration/TransactionIT.java | 2 +- .../integration/UnmanagedTransactionIT.java | 2 +- .../integration/async/AsyncSessionIT.java | 3 +- .../integration/async/AsyncTransactionIT.java | 2 +- .../reactive/ReactiveTransactionIT.java | 17 ++ .../reactive/RxNestedQueriesIT.java | 2 +- .../integration/reactive/RxResultIT.java | 2 +- .../integration/reactive/RxTransactionIT.java | 18 +- .../driver/internal/DatabaseNameUtilTest.java | 1 + .../DirectConnectionProviderTest.java | 2 +- .../driver/internal/DriverFactoryTest.java | 2 +- .../neo4j/driver/internal/ExtractTest.java | 2 +- .../internal/InternalIsoDurationTest.java | 2 +- ...ternalMapAccessorWithDefaultValueTest.java | 2 +- .../driver/internal/InternalNodeTest.java | 2 +- .../driver/internal/InternalPairTest.java | 2 +- .../driver/internal/InternalPathTest.java | 2 +- .../driver/internal/InternalRecordTest.java | 2 +- .../internal/InternalRelationshipTest.java | 2 +- .../driver/internal/InternalResultTest.java | 2 +- .../internal/SessionFactoryImplTest.java | 2 +- .../org/neo4j/driver/internal/ValuesTest.java | 4 +- .../async/AsyncResultCursorImplTest.java | 2 +- .../async/InternalAsyncSessionTest.java | 2 +- .../async/LeakLoggingNetworkSessionTest.java | 2 +- .../internal/async/NetworkConnectionTest.java | 2 +- .../internal/async/NetworkSessionTest.java | 2 +- .../connection/ChannelErrorHandlerTest.java | 2 +- .../ChannelPipelineBuilderImplTest.java | 2 +- .../connection/EventLoopGroupFactoryTest.java | 2 +- .../connection/HandshakeHandlerTest.java | 2 +- .../NettyChannelInitializerTest.java | 2 +- .../connection/RoutingConnectionTest.java | 2 +- .../inbound/InboundMessageHandlerTest.java | 2 +- .../async/pool/ConnectionPoolImplIT.java | 2 +- .../pool/NettyChannelHealthCheckerTest.java | 2 +- .../cluster/ClusterCompositionTest.java | 2 +- .../cluster/IdentityResolverTest.java | 2 +- ...tiDatabasesRoutingProcedureRunnerTest.java | 2 +- ...gleDatabaseRoutingProcedureRunnerTest.java | 2 +- .../loadbalancing/LoadBalancerTest.java | 2 +- .../RoutingTableAndConnectionPoolTest.java | 2 +- .../handlers/RoutingResponseHandlerTest.java | 2 +- .../internal/logging/Slf4jLoggingTest.java | 2 +- .../messaging/v3/BoltProtocolV3Test.java | 3 +- .../messaging/v4/BoltProtocolV4Test.java | 3 +- .../messaging/v41/BoltProtocolV41Test.java | 3 +- .../messaging/v42/BoltProtocolV42Test.java | 3 +- .../messaging/v43/BoltProtocolV43Test.java | 3 +- .../messaging/v44/BoltProtocolV44Test.java | 3 +- .../messaging/v5/BoltProtocolV5Test.java | 3 +- .../messaging/v51/BoltProtocolV51Test.java | 3 +- .../messaging/v52/BoltProtocolV52Test.java | 3 +- .../messaging/v53/BoltProtocolV53Test.java | 3 +- .../internal/net/BoltServerAddressTest.java | 2 +- .../ExponentialBackoffRetryLogicTest.java | 2 +- .../internal/summary/InternalPlanTest.java | 2 +- .../driver/internal/util/BookmarkUtil.java | 2 +- .../driver/internal/util/ErrorUtilTest.java | 2 +- .../driver/internal/util/FuturesTest.java | 2 +- .../internal/util/MetadataExtractorTest.java | 2 +- .../internal/value/BooleanValueTest.java | 2 +- .../driver/internal/value/BytesValueTest.java | 2 +- .../driver/internal/value/FloatValueTest.java | 2 +- .../internal/value/IntegerValueTest.java | 2 +- .../driver/internal/value/ListValueTest.java | 2 +- .../driver/internal/value/MapValueTest.java | 2 +- .../driver/internal/value/NodeValueTest.java | 2 +- .../driver/internal/value/PathValueTest.java | 2 +- .../internal/value/RelationshipValueTest.java | 2 +- .../internal/value/StringValueTest.java | 2 +- .../value/UnsupportedDateTimeValueTest.java | 1 + .../driver/stress/AbstractStressTestBase.java | 2 +- .../driver/stress/AsyncFailingQuery.java | 2 +- .../driver/stress/AsyncFailingQueryInTx.java | 2 +- .../stress/AsyncFailingQueryWithRetries.java | 2 +- .../neo4j/driver/stress/AsyncWrongQuery.java | 2 +- .../driver/stress/AsyncWrongQueryInTx.java | 2 +- .../stress/AsyncWrongQueryWithRetries.java | 2 +- .../driver/stress/BlockingFailingQuery.java | 2 +- .../stress/BlockingFailingQueryInTx.java | 2 +- .../BlockingFailingQueryWithRetries.java | 2 +- .../driver/stress/BlockingWrongQuery.java | 2 +- .../driver/stress/BlockingWrongQueryInTx.java | 2 +- .../stress/BlockingWrongQueryWithRetries.java | 2 +- .../org/neo4j/driver/stress/FailedAuth.java | 2 +- .../neo4j/driver/stress/RxFailingQuery.java | 2 +- .../driver/stress/RxFailingQueryInTx.java | 4 +- .../stress/RxFailingQueryWithRetries.java | 2 +- .../neo4j/driver/stress/RxReadQueryInTx.java | 2 +- .../org/neo4j/driver/testutil/FileTools.java | 189 ------------------ .../neo4j/driver/testutil/FileToolsTest.java | 102 ---------- .../neo4j/driver/types/TypeSystemTest.java | 2 +- examples/pom.xml | 4 - .../neo4j/docs/driver/CustomAuthExample.java | 5 + .../docs/driver/KerberosAuthExample.java | 1 + .../docs/driver/PassBookmarkExample.java | 37 ++-- .../org/neo4j/docs/driver/ExamplesIT.java | 73 +++---- pom.xml | 6 +- testkit-backend/pom.xml | 5 - .../backend/holder/AbstractResultHolder.java | 5 - .../backend/MessageDeserializerTest.java | 27 +-- .../backend/MessageSerializerTest.java | 6 +- testkit-tests/pom.xml | 2 +- 146 files changed, 266 insertions(+), 520 deletions(-) delete mode 100644 driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6ebbe8d85..c5ffc5c343 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,7 @@ If you want to contribute a pull request, we have a little bit of process you'll - Take a moment to read and sign our [CLA](http://neo4j.com/developer/cla) We can't guarantee that we'll accept pull requests and may ask you to make some changes before they go in. -Occasionally, we might also have logistical, commercial, or legal reasons why we can't accept your work but we'll try to find an alternative way for you to contribute in that case. +Occasionally, we might also have logistical, commercial, or legal reasons why we can't accept your work, but we'll try to find an alternative way for you to contribute in that case. Remember that many community members have become regular contributors and some are now even Neo employees! diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 132983394c..0488a7087d 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -15,7 +15,7 @@ To help us understand your issue, please specify important details, primarily: - Neo4j version: Community/Enterprise X.Y.Z - Neo4j Mode: Single instance/HA cluster with X members/Casual cluster with X core Y read-replica -- Driver version: X lanaguage driver X.Y.Z (If you use some other library that wraps around this driver, you might want to raise an issue there first) +- Driver version: X language driver X.Y.Z (If you use some other library that wraps around this driver, you might want to raise an issue there first) - Operating system: (for example Windows 10/Ubuntu 16.10 on AWS) - **Steps to reproduce** - Expected behavior @@ -23,7 +23,7 @@ To help us understand your issue, please specify important details, primarily: Additionally, include (as appropriate) log-files, stacktraces, and other debug output. Always check the server logs to see if there is any stacktrace related to the driver error too. -Aslo add any solutions you've tried to solve the problem yourself. +Also, add any solutions you've tried to solve the problem yourself. ## Example bug report @@ -35,7 +35,7 @@ I got connection reset by peer errors. **Operating System:** Ubuntu 16.10 on AWS ### Steps to reproduce -1. Start Neo4j on a AWS instance +1. Start Neo4j on an AWS instance 2. Run a query with the driver 3. Put the driver idle for 2h 4. Run another query diff --git a/README.md b/README.md index 2d3c57f29a..69e977f899 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ There are 2 ways of running Testkit tests: ##### Using the testkit-tests module -The `testkit-tests` module will automatically checkout Testkit and run it during Maven build. +The `testkit-tests` module will automatically check out Testkit and run it during Maven build. Prerequisites: - Docker @@ -189,7 +189,7 @@ TEST_DOCKER_RMI=true \ python3 main.py --tests TESTKIT_TESTS UNIT_TESTS --configs 4.3-enterprise ```` -On Windows or in the abscence of a Bash-compatible environment, the required steps are probably different. +On Windows or in the absence of a Bash-compatible environment, the required steps are probably different. A simple `mvn clean install` will require admin rights on Windows, because our integration tests require admin privileges to install and start a service. If all of this fails and you only want to try out a local development version of the driver, you could skip all tests like this: diff --git a/driver/pom.xml b/driver/pom.xml index a2f5020f47..8db1e09c55 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -69,7 +69,7 @@ org.hamcrest - hamcrest-junit + hamcrest org.mockito diff --git a/driver/src/main/java/org/neo4j/driver/Config.java b/driver/src/main/java/org/neo4j/driver/Config.java index 84ef4c0ee3..0bfeb0501a 100644 --- a/driver/src/main/java/org/neo4j/driver/Config.java +++ b/driver/src/main/java/org/neo4j/driver/Config.java @@ -390,6 +390,7 @@ public ConfigBuilder withLogging(Logging logging) { * * @return this builder */ + @SuppressWarnings("deprecation") public ConfigBuilder withLeakedSessionsLogging() { this.logLeakedSessions = true; return this; diff --git a/driver/src/main/java/org/neo4j/driver/Driver.java b/driver/src/main/java/org/neo4j/driver/Driver.java index b5f4d409dd..1d477969f0 100644 --- a/driver/src/main/java/org/neo4j/driver/Driver.java +++ b/driver/src/main/java/org/neo4j/driver/Driver.java @@ -377,6 +377,7 @@ default AsyncSession asyncSession(SessionConfig sessionConfig) { */ @Experimental @Deprecated + @SuppressWarnings("SameReturnValue") TypeSystem defaultTypeSystem(); /** diff --git a/driver/src/main/java/org/neo4j/driver/Logging.java b/driver/src/main/java/org/neo4j/driver/Logging.java index 177c5b8d25..eba1e59478 100644 --- a/driver/src/main/java/org/neo4j/driver/Logging.java +++ b/driver/src/main/java/org/neo4j/driver/Logging.java @@ -143,6 +143,7 @@ static Logging console(Level level) { * * @return new logging implementation. */ + @SuppressWarnings("SameReturnValue") static Logging none() { return DEV_NULL_LOGGING; } diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/AuthTokenManagerExecutionException.java b/driver/src/main/java/org/neo4j/driver/exceptions/AuthTokenManagerExecutionException.java index 00b9fec7ab..7e5207954b 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/AuthTokenManagerExecutionException.java +++ b/driver/src/main/java/org/neo4j/driver/exceptions/AuthTokenManagerExecutionException.java @@ -29,7 +29,7 @@ * diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalPath.java b/driver/src/main/java/org/neo4j/driver/internal/InternalPath.java index 49776f73ec..6678bb2d53 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/InternalPath.java +++ b/driver/src/main/java/org/neo4j/driver/internal/InternalPath.java @@ -89,7 +89,7 @@ public InternalPath(List alternatingNodeAndRel) { // even index - this should be a node try { lastNode = (Node) entity; - if (nodes.isEmpty() || isEndpoint(lastNode, lastRelationship)) { + if (nodes.isEmpty() || (lastRelationship != null && isEndpoint(lastNode, lastRelationship))) { nodes.add(lastNode); } else { throw new IllegalArgumentException("Node argument " + index diff --git a/driver/src/main/java/org/neo4j/driver/internal/async/connection/NettyDomainNameResolverGroup.java b/driver/src/main/java/org/neo4j/driver/internal/async/connection/NettyDomainNameResolverGroup.java index fda568e229..d387f762ac 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/async/connection/NettyDomainNameResolverGroup.java +++ b/driver/src/main/java/org/neo4j/driver/internal/async/connection/NettyDomainNameResolverGroup.java @@ -32,6 +32,7 @@ public NettyDomainNameResolverGroup(DomainNameResolver domainNameResolver) { } @Override + @SuppressWarnings("resource") protected AddressResolver newResolver(EventExecutor executor) { return new NettyDomainNameResolver(executor, domainNameResolver).asAddressResolver(); } diff --git a/driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java b/driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java index 7ea548ce76..6a0394d060 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java +++ b/driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java @@ -310,7 +310,7 @@ private CompletionStage lookupOnRouter( }); } - @SuppressWarnings("ThrowableNotThrown") + @SuppressWarnings({"ThrowableNotThrown", "SameReturnValue"}) private ClusterComposition handleRoutingProcedureError( Throwable error, RoutingTable routingTable, BoltServerAddress routerAddress, Throwable baseError) { if (mustAbortDiscovery(error)) { diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogging.java b/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogging.java index ec18e82a57..25845253a9 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogging.java +++ b/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogging.java @@ -43,6 +43,7 @@ public Logger getLog(String name) { // Reference: https://docs.oracle.com/en/java/javase/17/docs/specs/serialization/input.html#the-readresolve-method // andJoshua Bloch, Effective Java 3rd edition @Serial + @SuppressWarnings("SameReturnValue") private Object readResolve() { return DEV_NULL_LOGGING; } diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java index b34a65ee13..1f71e87759 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java +++ b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java @@ -516,6 +516,7 @@ public String unpackString() throws IOException { * @return null * @throws IOException if the unpacked value was not null */ + @SuppressWarnings("SameReturnValue") public Object unpackNull() throws IOException { final var markerByte = in.readByte(); if (markerByte != NULL) { diff --git a/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java b/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java index ddd39c8be8..eabca2b381 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java +++ b/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java @@ -186,7 +186,9 @@ private Retry exponentialBackoffRetryRx() { if (canRetryOn(error)) { var currentTime = clock.millis(); + @SuppressWarnings("DataFlowIssue") long startTime = contextView.getOrDefault("startTime", currentTime); + @SuppressWarnings("DataFlowIssue") long nextDelayMs = contextView.getOrDefault("nextDelayMs", initialRetryDelayMs); var elapsedTime = currentTime - startTime; @@ -213,6 +215,7 @@ private Retry exponentialBackoffRetryRx() { } addSuppressed(throwable, errors); + //noinspection DataFlowIssue return Mono.error(throwable); }))); } diff --git a/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveResult.java b/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveResult.java index 1cb78ad552..e23aeab853 100644 --- a/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveResult.java +++ b/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveResult.java @@ -51,21 +51,21 @@ public interface ReactiveResult { * Returns a cold unicast publisher of records. *

* When the record publisher is {@linkplain Publisher#subscribe(Subscriber) subscribed}, the query is executed and the result is streamed back as a record - * stream followed by a result summary. This record publisher publishes all records in the result and signals the completion. However before completion or + * stream followed by a result summary. This record publisher publishes all records in the result and signals the completion. However, before completion or * error reporting if any, a cleanup of result resources such as network connection will be carried out automatically. *

- * Therefore the {@link Subscriber} of this record publisher shall wait for the termination signal (complete or error) to ensure that the resources used by + * Therefore, the {@link Subscriber} of this record publisher shall wait for the termination signal (complete or error) to ensure that the resources used by * this result are released correctly. Then the session is ready to be used to run more queries. *

* Cancelling of the record streaming will immediately terminate the propagation of new records. But it will not cancel query execution on the server. When * the execution is finished, the {@link Subscriber} will be notified with a termination signal (complete or error). *

- * The record publishing event by default runs in an Network IO thread, as a result no blocking operation is allowed in this thread. Otherwise network IO + * The record publishing event by default runs in a Network IO thread, as a result no blocking operation is allowed in this thread. Otherwise, network IO * might be blocked by application logic. *

* This publisher can only be subscribed by one {@link Subscriber} once. *

- * If this publisher is subscribed after {@link #keys()}, then the publish of records is carried out after the arrival of keys. If this publisher is + * If this publisher is subscribed after {@link #keys()}, then the publishing of records is carried out after the arrival of keys. If this publisher is * subscribed after {@link #consume()}, then a {@link ResultConsumedException} will be thrown. * * @return a cold unicast publisher of records. diff --git a/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveSession.java b/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveSession.java index ce761a08e0..6783cf6af0 100644 --- a/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveSession.java +++ b/driver/src/main/java/org/neo4j/driver/reactivestreams/ReactiveSession.java @@ -44,7 +44,7 @@ public interface ReactiveSession extends BaseSession, ReactiveQueryRunner { * Begin a new unmanaged {@linkplain ReactiveTransaction transaction}. At most one transaction may exist in a session at any point in time. To * maintain multiple concurrent transactions, use multiple concurrent sessions. *

- * It by default is executed in a Network IO thread, as a result no blocking operation is allowed in this thread. + * It is by default is executed in a Network IO thread, as a result no blocking operation is allowed in this thread. * * @return a new {@link ReactiveTransaction} */ @@ -56,7 +56,7 @@ default Publisher beginTransaction() { * Begin a new unmanaged {@linkplain ReactiveTransaction transaction} with the specified {@link TransactionConfig configuration}. At most one * transaction may exist in a session at any point in time. To maintain multiple concurrent transactions, use multiple concurrent sessions. *

- * It by default is executed in a Network IO thread, as a result no blocking operation is allowed in this thread. + * It is by default is executed in a Network IO thread, as a result no blocking operation is allowed in this thread. * * @param config configuration for the new transaction. * @return a new {@link ReactiveTransaction} diff --git a/driver/src/main/java/org/neo4j/driver/summary/Plan.java b/driver/src/main/java/org/neo4j/driver/summary/Plan.java index fb42948df0..2fd3c3a4e8 100644 --- a/driver/src/main/java/org/neo4j/driver/summary/Plan.java +++ b/driver/src/main/java/org/neo4j/driver/summary/Plan.java @@ -28,7 +28,7 @@ * This can be extremely helpful in understanding what a query is doing, and how to optimize it. For more * details, see the Neo4j Manual. *

- * The plan for the query is a tree of plans - each sub-tree containing zero or more child plans. The query + * The plan for the query is a tree of plans - each subtree containing zero or more child plans. The query * starts with the root plan. Each sub-plan is of a specific {@link #operatorType() operator type}, which describes * what that part of the plan does - for instance, perform an index lookup or filter results. The Neo4j Manual contains * a reference of the available operator types, and these may differ across Neo4j versions. diff --git a/driver/src/main/java/org/neo4j/driver/summary/SummaryCounters.java b/driver/src/main/java/org/neo4j/driver/summary/SummaryCounters.java index be1f055f53..31dd3aeca0 100644 --- a/driver/src/main/java/org/neo4j/driver/summary/SummaryCounters.java +++ b/driver/src/main/java/org/neo4j/driver/summary/SummaryCounters.java @@ -27,7 +27,7 @@ @Immutable public interface SummaryCounters { /** - * Whether there were any updates at all, eg. any of the counters are greater than 0. + * Whether there were any updates at all, e.g. any of the counters are greater than 0. * @return true if the query made any updates */ boolean containsUpdates(); diff --git a/driver/src/main/java/org/neo4j/driver/types/MapAccessor.java b/driver/src/main/java/org/neo4j/driver/types/MapAccessor.java index ba4fa54e7a..366dc53659 100644 --- a/driver/src/main/java/org/neo4j/driver/types/MapAccessor.java +++ b/driver/src/main/java/org/neo4j/driver/types/MapAccessor.java @@ -28,7 +28,7 @@ /** * Access the keys, properties and values of an underlying unordered map by key *

- * This provides only read methods. Subclasses may chose to provide additional methods + * This provides only read methods. Subclasses may choose to provide additional methods * for changing the underlying map. * @since 1.0 */ @@ -96,7 +96,7 @@ public interface MapAccessor { * as {@link Values#ofBoolean()}, {@link Values#ofList(Function)}. * @param the type of map values * @see Values for a long list of built-in conversion functions - * @return the value as a map from string keys to values of type T obtained from mapping he original map values, if possible + * @return the value as a map from string keys to values of type T obtained from mapping the original map values, if possible */ Map asMap(Function mapFunction); } diff --git a/driver/src/main/java/org/neo4j/driver/types/MapAccessorWithDefaultValue.java b/driver/src/main/java/org/neo4j/driver/types/MapAccessorWithDefaultValue.java index c402bcac46..194a0ce85a 100644 --- a/driver/src/main/java/org/neo4j/driver/types/MapAccessorWithDefaultValue.java +++ b/driver/src/main/java/org/neo4j/driver/types/MapAccessorWithDefaultValue.java @@ -24,7 +24,7 @@ import org.neo4j.driver.Value; /** - * Provides methods to access the value of an underlying unordered map by key. When calling the methods, a user need to provides a default value, which will be + * Provides methods to access the value of an underlying unordered map by key. When calling the methods, a user need to provide a default value, which will be * given back if no match found by the key provided. The default value also servers the purpose of specifying the return type of the value found in map by key. * If the type of the value found A differs from the type of the default value B, a cast from A to B would happen automatically. Note: Error might arise if the * cast from A to B is not possible. diff --git a/driver/src/main/java/org/neo4j/driver/types/Point.java b/driver/src/main/java/org/neo4j/driver/types/Point.java index 1aa6039361..bfe2a5a733 100644 --- a/driver/src/main/java/org/neo4j/driver/types/Point.java +++ b/driver/src/main/java/org/neo4j/driver/types/Point.java @@ -55,5 +55,6 @@ public interface Point { * * @return the {@code z} coordinate value or {@link Double#NaN} if not applicable. */ + @SuppressWarnings("SameReturnValue") double z(); } diff --git a/driver/src/main/java/org/neo4j/driver/types/Relationship.java b/driver/src/main/java/org/neo4j/driver/types/Relationship.java index 625cecfb01..a28b1d2475 100644 --- a/driver/src/main/java/org/neo4j/driver/types/Relationship.java +++ b/driver/src/main/java/org/neo4j/driver/types/Relationship.java @@ -24,7 +24,7 @@ */ public interface Relationship extends Entity { /** - * Id of the node where this relationship starts. + * The id of the node where this relationship starts. *

* Please note that depending on server configuration numeric id might not be available and accessing it will result in {@link IllegalStateException}. * @@ -36,14 +36,14 @@ public interface Relationship extends Entity { long startNodeId(); /** - * Id of the node where this relationship starts. + * The id of the node where this relationship starts. * * @return the node id */ String startNodeElementId(); /** - * Id of the node where this relationship ends. + * The id of the node where this relationship ends. *

* Please note that depending on server configuration numeric id might not be available and accessing it will result in {@link IllegalStateException}. * @@ -55,7 +55,7 @@ public interface Relationship extends Entity { long endNodeId(); /** - * Id of the node where this relationship ends. + * The id of the node where this relationship ends. * * @return the node id */ diff --git a/driver/src/main/java/org/neo4j/driver/types/Type.java b/driver/src/main/java/org/neo4j/driver/types/Type.java index 1ad9b742b7..f9383ab6dd 100644 --- a/driver/src/main/java/org/neo4j/driver/types/Type.java +++ b/driver/src/main/java/org/neo4j/driver/types/Type.java @@ -22,7 +22,7 @@ import org.neo4j.driver.util.Immutable; /** - * The type of a {@link Value} as defined by the Cypher language + * The type of {@link Value} as defined by the Cypher language * @since 1.0 */ @Immutable diff --git a/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java b/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java index 16099f188e..4285e02092 100644 --- a/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java +++ b/driver/src/main/java/org/neo4j/driver/types/TypeSystem.java @@ -33,6 +33,7 @@ public interface TypeSystem { * * @return instance of type system */ + @SuppressWarnings("SameReturnValue") static TypeSystem getDefault() { return TYPE_SYSTEM; } diff --git a/driver/src/test/java/org/neo4j/driver/AuthTokensTest.java b/driver/src/test/java/org/neo4j/driver/AuthTokensTest.java index cabd65886e..cce8d0feb4 100644 --- a/driver/src/test/java/org/neo4j/driver/AuthTokensTest.java +++ b/driver/src/test/java/org/neo4j/driver/AuthTokensTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver; import static java.util.Arrays.asList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.AuthTokens.basic; diff --git a/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java b/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java index 0c2d41046b..c92cccb468 100644 --- a/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java +++ b/driver/src/test/java/org/neo4j/driver/GraphDatabaseTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/ParametersTest.java b/driver/src/test/java/org/neo4j/driver/ParametersTest.java index c54ca20cdf..02f3cd3c6e 100644 --- a/driver/src/test/java/org/neo4j/driver/ParametersTest.java +++ b/driver/src/test/java/org/neo4j/driver/ParametersTest.java @@ -20,8 +20,8 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/driver/src/test/java/org/neo4j/driver/QueryConfigTest.java b/driver/src/test/java/org/neo4j/driver/QueryConfigTest.java index 1518c49b43..7691fae806 100644 --- a/driver/src/test/java/org/neo4j/driver/QueryConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/QueryConfigTest.java @@ -56,6 +56,7 @@ void shouldUpdateRouting(RoutingControl routing) { } @Test + @SuppressWarnings("WriteOnlyObject") void shouldNotAllowNullRouting() { assertThrows(NullPointerException.class, () -> QueryConfig.builder().withRouting(null)); } diff --git a/driver/src/test/java/org/neo4j/driver/QueryTest.java b/driver/src/test/java/org/neo4j/driver/QueryTest.java index 2dbaf6893c..896eab74ee 100644 --- a/driver/src/test/java/org/neo4j/driver/QueryTest.java +++ b/driver/src/test/java/org/neo4j/driver/QueryTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Values.parameters; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java b/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java index 95a30ee25c..1c9a89d3c4 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ChannelConnectorImplIT.java @@ -19,9 +19,9 @@ package org.neo4j.driver.integration; import static java.util.concurrent.CompletableFuture.runAsync; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java index 41cd3dca4a..11a4c5dbd9 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java @@ -19,8 +19,8 @@ package org.neo4j.driver.integration; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java b/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java index 96980912b1..88157d122f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/CredentialsIT.java @@ -19,9 +19,9 @@ package org.neo4j.driver.integration; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.AuthTokens.basic; import static org.neo4j.driver.AuthTokens.custom; diff --git a/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java b/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java index b3d74ebf51..2926eb4212 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/DirectDriverIT.java @@ -18,9 +18,9 @@ */ package org.neo4j.driver.integration; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.directDriverWithAddress; diff --git a/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java b/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java index be296c4867..07bbbb2dbe 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/EncryptionIT.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Config.TrustStrategy.trustAllCertificates; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java index e6f904f94c..fa3d843fa9 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java @@ -22,11 +22,11 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; 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 d11cd531b3..a81e7ee773 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/QueryIT.java @@ -21,6 +21,7 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.testutil.TestUtil.assertNoCircularReferences; @@ -156,6 +157,7 @@ void shouldRunSimpleQuery() { name = result2.next().get("a.name"); } + assertNotNull(name); assertThat(name.asString(), equalTo("Adam")); } diff --git a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java b/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java index b8fa6e1b2d..6785fefd1b 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java @@ -22,7 +22,7 @@ import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java b/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java index 96a9285b30..639ce8bdcc 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/RoutingDriverIT.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.integration; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.neo4j.driver.SessionConfig.forDatabase; import static org.neo4j.driver.internal.util.Matchers.clusterDriver; 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 fe87d10fd8..bc266c5e1d 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java @@ -23,11 +23,11 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; 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 98e7525499..5211032fb7 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionMixIT.java @@ -19,8 +19,8 @@ package org.neo4j.driver.integration; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java index c32c6701cd..3d659207b6 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java @@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java index 16bb748f48..e3185837da 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java @@ -18,11 +18,11 @@ */ package org.neo4j.driver.integration; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java index 28573ff1d7..87f112c130 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java @@ -21,8 +21,8 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java index 4e5aa9e0bf..80c8341494 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/UnmanagedTransactionIT.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.integration; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; 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 26fe878b3f..8ca570c526 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 @@ -21,11 +21,11 @@ import static java.util.Collections.emptyIterator; import static java.util.Collections.emptyMap; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -174,6 +174,7 @@ void shouldAllowNestedQueries() { var queriesExecuted = runNestedQueries(cursor); var futures = await(queriesExecuted); + assertNotNull(futures); var futureResults = awaitAll(futures); assertEquals(7, futureResults.size()); 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 73e81063af..361ffe9850 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 @@ -19,11 +19,11 @@ package org.neo4j.driver.integration.async; import static java.util.Collections.emptyMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveTransactionIT.java index 9e1ff03c1e..6950ba5da6 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveTransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/reactive/ReactiveTransactionIT.java @@ -19,6 +19,7 @@ package org.neo4j.driver.integration.reactive; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.List; @@ -46,6 +47,7 @@ void shouldPreventPullAfterTransactionTermination() { // Given var session = neo4j.driver().session(ReactiveSession.class); var tx = Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var streamSize = Config.defaultConfig().fetchSize() + 1; var result0 = Mono.fromDirect(tx.run("UNWIND range(1, $limit) AS x RETURN x", Map.of("limit", streamSize))) .block(); @@ -58,6 +60,8 @@ void shouldPreventPullAfterTransactionTermination() { assertEquals(terminationException.code(), "Neo.ClientError.Statement.SyntaxError"); // Then + assertNotNull(result0); + assertNotNull(result1); for (var result : List.of(result0, result1)) { var exception = assertThrows( ClientException.class, () -> Flux.from(result.records()).blockFirst()); @@ -72,6 +76,7 @@ void shouldPreventDiscardAfterTransactionTermination() { // Given var session = neo4j.driver().session(ReactiveSession.class); var tx = Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var streamSize = Config.defaultConfig().fetchSize() + 1; var result0 = Mono.fromDirect(tx.run("UNWIND range(1, $limit) AS x RETURN x", Map.of("limit", streamSize))) .block(); @@ -84,6 +89,8 @@ void shouldPreventDiscardAfterTransactionTermination() { assertEquals(terminationException.code(), "Neo.ClientError.Statement.SyntaxError"); // Then + assertNotNull(result0); + assertNotNull(result1); for (var result : List.of(result0, result1)) { var exception = assertThrows(ClientException.class, () -> Mono.fromDirect(result.consume()) .block()); @@ -98,6 +105,7 @@ void shouldPreventRunAfterTransactionTermination() { // Given var session = neo4j.driver().session(ReactiveSession.class); var tx = Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var terminationException = assertThrows( ClientException.class, () -> Mono.fromDirect(tx.run("invalid")).block()); assertEquals(terminationException.code(), "Neo.ClientError.Statement.SyntaxError"); @@ -118,6 +126,7 @@ void shouldPreventPullAfterDriverTransactionTermination() { var session = neo4j.driver().session(ReactiveSession.class); var tx = (InternalReactiveTransaction) Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var streamSize = Config.defaultConfig().fetchSize() + 1; var result0 = Mono.fromDirect(tx.run("UNWIND range(1, $limit) AS x RETURN x", Map.of("limit", streamSize))) .block(); @@ -128,6 +137,8 @@ void shouldPreventPullAfterDriverTransactionTermination() { Mono.fromDirect(tx.terminate()).block(); // Then + assertNotNull(result0); + assertNotNull(result1); for (var result : List.of(result0, result1)) { assertThrows(TransactionTerminatedException.class, () -> Flux.from(result.records()) .blockFirst()); @@ -142,6 +153,7 @@ void shouldPreventDiscardAfterDriverTransactionTermination() { var session = neo4j.driver().session(ReactiveSession.class); var tx = (InternalReactiveTransaction) Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var streamSize = Config.defaultConfig().fetchSize() + 1; var result0 = Mono.fromDirect(tx.run("UNWIND range(1, $limit) AS x RETURN x", Map.of("limit", streamSize))) .block(); @@ -152,6 +164,8 @@ void shouldPreventDiscardAfterDriverTransactionTermination() { Mono.fromDirect(tx.terminate()).block(); // Then + assertNotNull(result0); + assertNotNull(result1); for (var result : List.of(result0, result1)) { assertThrows(TransactionTerminatedException.class, () -> Mono.fromDirect(result.consume()) .block()); @@ -166,6 +180,7 @@ void shouldPreventRunAfterDriverTransactionTermination() { var session = neo4j.driver().session(ReactiveSession.class); var tx = (InternalReactiveTransaction) Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var streamSize = Config.defaultConfig().fetchSize() + 1; Mono.fromDirect(tx.run("UNWIND range(1, $limit) AS x RETURN x", Map.of("limit", streamSize))) .block(); @@ -187,6 +202,7 @@ void shouldTerminateTransactionAndHandleFailureResponseOrPreventFurtherPulls() { var session = neo4j.driver().session(ReactiveSession.class); var tx = (InternalReactiveTransaction) Mono.fromDirect(session.beginTransaction()).block(); + assertNotNull(tx); var streamSize = Config.defaultConfig().fetchSize() + 1; var result = Mono.fromDirect(tx.run("UNWIND range(1, $limit) AS x RETURN x", Map.of("limit", streamSize))) .block(); @@ -195,6 +211,7 @@ void shouldTerminateTransactionAndHandleFailureResponseOrPreventFurtherPulls() { Mono.fromDirect(tx.terminate()).block(); // Then + assertNotNull(result); assertThrows(TransactionTerminatedException.class, () -> Flux.from(result.records()) .blockLast()); Mono.fromDirect(tx.close()).block(); 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 221e77d750..2da2d6d328 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 @@ -158,7 +158,7 @@ void shouldHandleNestedQueriesInTheSameTransaction() { }, RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(nodeIds).expectNextCount(size).verifyComplete(); } 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 f21d959e0a..6ddc8d3187 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 @@ -22,9 +22,9 @@ import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; 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 e45c0eb9f4..86a88d3697 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 @@ -20,12 +20,12 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -115,7 +115,7 @@ void shouldBePossibleToRunSingleQueryAndCommit() { .map(record -> record.get(0).asNode().get("id").asInt()), RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(ids).expectNext(42).verifyComplete(); assertEquals(1, countNodes(42)); @@ -334,7 +334,7 @@ void shouldAllowRollbackAfterFailedCommit() { tx -> Flux.from(tx.run("WRONG").records()), RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(records) .verifyErrorSatisfies(error -> assertThat(error.getMessage(), containsString("Invalid input"))); @@ -481,7 +481,7 @@ void shouldFailForEachWhenActionFails() { }), RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(records) .expectErrorSatisfies(error -> assertEquals(e, error)) @@ -527,7 +527,7 @@ void shouldFailWhenListTransformationFunctionFails() { tx -> Flux.from(tx.run("RETURN 'Hi!'").records()).handle((record, sink) -> sink.error(e)), RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(records) .expectErrorSatisfies(error -> assertEquals(e, error)) @@ -659,7 +659,7 @@ void shouldUpdateSessionBookmarkAfterCommit() { tx -> tx.run("CREATE (:MyNode)").records(), RxTransaction::commit, (tx, error) -> tx.rollback(), - null)); + RxTransaction::close)); var bookmarkAfter = session.lastBookmark(); @@ -787,7 +787,7 @@ private void testForEach(String query, int expectedSeenRecords) { }, RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(summary).expectNextCount(1).verifyComplete(); // we indeed get a summary. } @@ -800,7 +800,7 @@ private void testList(String query, List expectedList) { tx -> Flux.from(tx.run(query).records()).collectList(), RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(records.single()) .consumeNextWith(allRecords -> { @@ -819,7 +819,7 @@ private void testConsume(String query) { tx -> tx.run(query).consume(), RxTransaction::commit, (tx, error) -> tx.rollback(), - null); + RxTransaction::close); StepVerifier.create(summary.single()) .consumeNextWith(Assertions::assertNotNull) diff --git a/driver/src/test/java/org/neo4j/driver/internal/DatabaseNameUtilTest.java b/driver/src/test/java/org/neo4j/driver/internal/DatabaseNameUtilTest.java index 3e75b4cf9d..3504e24c07 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/DatabaseNameUtilTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/DatabaseNameUtilTest.java @@ -29,6 +29,7 @@ class DatabaseNameUtilTest { @Test + @SuppressWarnings("EqualsWithItself") void shouldDatabaseNameBeEqual() { assertEquals(defaultDatabase(), defaultDatabase()); assertEquals(defaultDatabase(), database(null)); diff --git a/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java b/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java index dc314b4518..b19c41e098 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver.internal; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.inOrder; diff --git a/driver/src/test/java/org/neo4j/driver/internal/DriverFactoryTest.java b/driver/src/test/java/org/neo4j/driver/internal/DriverFactoryTest.java index bca583f539..66548d9536 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/DriverFactoryTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/DriverFactoryTest.java @@ -19,10 +19,10 @@ package org.neo4j.driver.internal; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/ExtractTest.java b/driver/src/test/java/org/neo4j/driver/internal/ExtractTest.java index e1ef37fa2d..5ebcebaa90 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ExtractTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/ExtractTest.java @@ -23,10 +23,10 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalIsoDurationTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalIsoDurationTest.java index bf8ae558c1..23b84e43f7 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalIsoDurationTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalIsoDurationTest.java @@ -24,8 +24,8 @@ import static java.time.temporal.ChronoUnit.SECONDS; import static java.time.temporal.ChronoUnit.YEARS; import static java.util.Arrays.asList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalMapAccessorWithDefaultValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalMapAccessorWithDefaultValueTest.java index be8d2294d8..02cbf715c2 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalMapAccessorWithDefaultValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalMapAccessorWithDefaultValueTest.java @@ -20,7 +20,7 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.driver.Values.ofInteger; import static org.neo4j.driver.Values.value; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalNodeTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalNodeTest.java index fe36d784f6..dccb6989f1 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalNodeTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalNodeTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.Values.NULL; import static org.neo4j.driver.Values.value; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalPairTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalPairTest.java index 293c3b9b4c..b434bf1e20 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalPairTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalPairTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.driver.Values.value; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalPathTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalPathTest.java index 367dee34d5..5b3d106aac 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalPathTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalPathTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Arrays; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java index 1e3b3d5d19..9f9ace2482 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java @@ -19,9 +19,9 @@ package org.neo4j.driver.internal; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalRelationshipTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalRelationshipTest.java index fc66c274b7..5214217696 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalRelationshipTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalRelationshipTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.Values.NULL; import static org.neo4j.driver.Values.value; diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalResultTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalResultTest.java index af4b2def98..52cea39bcf 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/InternalResultTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/InternalResultTest.java @@ -22,8 +22,8 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/SessionFactoryImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/SessionFactoryImplTest.java index def9144ca6..5c7ffe2765 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SessionFactoryImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SessionFactoryImplTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.neo4j.driver.SessionConfig.builder; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; diff --git a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java index 3f1f5de5ea..ef3f8c0852 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java @@ -20,9 +20,9 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -121,6 +121,7 @@ void shouldComplainAboutStrangeTypes() { } @Test + @SuppressWarnings("EqualsWithItself") void equalityRules() { assertEquals(value(1), value(1)); assertEquals(value(Long.MAX_VALUE), value(Long.MAX_VALUE)); @@ -247,7 +248,6 @@ void shouldMapString() { assertThat(val.asList(ofObject()), contains("hello", "world")); } - @SuppressWarnings("unchecked") @Test void shouldMapMapOfString() { // Given diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java index 41818fca46..5fce5a43bf 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/AsyncResultCursorImplTest.java @@ -23,8 +23,8 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; 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 18ca17d6cf..b1e60e2c9a 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 @@ -23,7 +23,7 @@ import static java.util.concurrent.CompletableFuture.completedFuture; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java index e5dedfc782..27160c8668 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSessionTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver.internal.async; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java index 6ac8dab00d..3e8969f818 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver.internal.async; import static java.util.Collections.emptyMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java index 10e94b4df1..f2dd5889e5 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java @@ -22,7 +22,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelErrorHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelErrorHandlerTest.java index bdcbbcca5a..7b194600e9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelErrorHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelErrorHandlerTest.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.internal.async.connection; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setMessageDispatcher; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelPipelineBuilderImplTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelPipelineBuilderImplTest.java index ee33096c58..69ebb8d284 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelPipelineBuilderImplTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/ChannelPipelineBuilderImplTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.async.connection; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/EventLoopGroupFactoryTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/EventLoopGroupFactoryTest.java index 2e32f8a786..68e944e5d9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/EventLoopGroupFactoryTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/EventLoopGroupFactoryTest.java @@ -19,9 +19,9 @@ package org.neo4j.driver.internal.async.connection; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java index a14eabcaf9..9985beee75 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/HandshakeHandlerTest.java @@ -19,9 +19,9 @@ package org.neo4j.driver.internal.async.connection; import static io.netty.buffer.Unpooled.copyInt; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java index 31b1f1deed..8c3f957cd3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/NettyChannelInitializerTest.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.internal.async.connection; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/connection/RoutingConnectionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/connection/RoutingConnectionTest.java index 82c3fa049a..da25b508fd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/connection/RoutingConnectionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/connection/RoutingConnectionTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.async.connection; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageHandlerTest.java index 0a763172af..d0f7701214 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageHandlerTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.async.inbound; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java b/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java index 3a28722e13..05bd8f0e01 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImplIT.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.internal.async.pool; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java index a81e9d185a..ef72971956 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthCheckerTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver.internal.async.pool; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/ClusterCompositionTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/ClusterCompositionTest.java index 6b54a92839..31d431b619 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/ClusterCompositionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/ClusterCompositionTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver.internal.cluster; import static java.util.Arrays.asList; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/IdentityResolverTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/IdentityResolverTest.java index 61fa8cae37..0e27b5b796 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/IdentityResolverTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/IdentityResolverTest.java @@ -18,9 +18,9 @@ */ package org.neo4j.driver.internal.cluster; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.neo4j.driver.internal.cluster.IdentityResolver.IDENTITY_RESOLVER; 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 a92abb4ca9..8d6e4b9b62 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 @@ -20,9 +20,9 @@ import static java.util.Collections.singletonList; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; 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 70fa4ebb82..e543f99d55 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 @@ -20,8 +20,8 @@ import static java.util.Collections.singletonList; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java index 8fba3d23d0..4da5f89f12 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java @@ -21,11 +21,11 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptySet; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java index 40b061135e..db13f0e83a 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoutingTableAndConnectionPoolTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.cluster.loadbalancing; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/RoutingResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/RoutingResponseHandlerTest.java index e549c3df1a..451d41d6a7 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/RoutingResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/handlers/RoutingResponseHandlerTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.handlers; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/driver/src/test/java/org/neo4j/driver/internal/logging/Slf4jLoggingTest.java b/driver/src/test/java/org/neo4j/driver/internal/logging/Slf4jLoggingTest.java index 64a8252044..8c49487e06 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/logging/Slf4jLoggingTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/logging/Slf4jLoggingTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.logging; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java index 1f0a69750b..ad766d5514 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java @@ -21,10 +21,10 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -119,6 +119,7 @@ void afterEach() { channel.finishAndReleaseAll(); } + @SuppressWarnings("SameReturnValue") protected BoltProtocol createProtocol() { return BoltProtocolV3.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java index aefd1dc04e..f06f9bc5d1 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -387,6 +387,7 @@ void shouldNotSupportDatabaseNameForAutoCommitTransactions() { Logging.none())); } + @SuppressWarnings("SameReturnValue") private BoltProtocol createProtocol() { return BoltProtocolV4.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java index f1e5894cf4..f9e551602d 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -111,6 +111,7 @@ public final class BoltProtocolV41Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") private BoltProtocol createProtocol() { return BoltProtocolV41.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java index d23becca0d..61f39542f2 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -111,6 +111,7 @@ public final class BoltProtocolV42Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") private BoltProtocol createProtocol() { return BoltProtocolV42.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java index 0be8bbad0e..4cb408aeb7 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -110,6 +110,7 @@ public final class BoltProtocolV43Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") private BoltProtocol createProtocol() { return BoltProtocolV43.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java index 86f581d289..e8b3a9bf36 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/BoltProtocolV44Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -110,6 +110,7 @@ public class BoltProtocolV44Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") protected BoltProtocol createProtocol() { return BoltProtocolV44.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java index e952133ddc..db5ee525e9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v5/BoltProtocolV5Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -110,6 +110,7 @@ public class BoltProtocolV5Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") protected BoltProtocol createProtocol() { return BoltProtocolV5.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v51/BoltProtocolV51Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v51/BoltProtocolV51Test.java index 6abb530e15..bfbcc7a738 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v51/BoltProtocolV51Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v51/BoltProtocolV51Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -108,6 +108,7 @@ public class BoltProtocolV51Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") protected BoltProtocol createProtocol() { return BoltProtocolV51.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v52/BoltProtocolV52Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v52/BoltProtocolV52Test.java index a286e4ef4a..dc8b79da10 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v52/BoltProtocolV52Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v52/BoltProtocolV52Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -109,6 +109,7 @@ public class BoltProtocolV52Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") protected BoltProtocol createProtocol() { return BoltProtocolV52.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v53/BoltProtocolV53Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v53/BoltProtocolV53Test.java index 855c204824..a7395a6101 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v53/BoltProtocolV53Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v53/BoltProtocolV53Test.java @@ -21,9 +21,9 @@ import static java.time.Duration.ofSeconds; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -110,6 +110,7 @@ public class BoltProtocolV53Test { .withMetadata(singletonMap("key", value(42))) .build(); + @SuppressWarnings("SameReturnValue") protected BoltProtocol createProtocol() { return BoltProtocolV53.INSTANCE; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/net/BoltServerAddressTest.java b/driver/src/test/java/org/neo4j/driver/internal/net/BoltServerAddressTest.java index 70bda78794..3011909311 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/net/BoltServerAddressTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/net/BoltServerAddressTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.net; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java index b0602a4281..d75e205d0b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java @@ -20,6 +20,7 @@ import static java.lang.Long.MAX_VALUE; import static java.util.concurrent.CompletableFuture.completedFuture; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.contains; @@ -28,7 +29,6 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/summary/InternalPlanTest.java b/driver/src/test/java/org/neo4j/driver/internal/summary/InternalPlanTest.java index bcb1f79bc6..3d907542da 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/summary/InternalPlanTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/summary/InternalPlanTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.summary; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.neo4j.driver.Values.ofValue; import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.Values.value; 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 bc0275d02d..b435f8ea9f 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 @@ -18,10 +18,10 @@ */ package org.neo4j.driver.internal.util; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/ErrorUtilTest.java b/driver/src/test/java/org/neo4j/driver/internal/util/ErrorUtilTest.java index 73413dfe55..c95343b0de 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/ErrorUtilTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/ErrorUtilTest.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.internal.util; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java b/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java index f8d45904a1..cd574b6331 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/FuturesTest.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.internal.util; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; 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 5121cd0376..20c86bd1ce 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 @@ -23,7 +23,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java index 023491d77b..0df036ec80 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.internal.value.BooleanValue.FALSE; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/BytesValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/BytesValueTest.java index 6cd9cda5ba..1e69e44683 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/BytesValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/BytesValueTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java index 953f1ab606..123a2e7ef8 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java index 4d223c841d..1ca80ab0b8 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java index d35b494865..8d2d795b97 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/ListValueTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.value; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.driver.Values.value; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java index 105d566d8d..6c6b03b138 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/MapValueTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.value; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.Values.value; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java index 7858e6ca74..d980043216 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.value; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.internal.util.ValueFactory.emptyNodeValue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java index 80365915ba..47c5393cb4 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/PathValueTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.value; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.internal.util.ValueFactory.filledPathValue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java index 84bbdc17a2..392dc0c211 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java @@ -19,7 +19,7 @@ package org.neo4j.driver.internal.value; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.neo4j.driver.internal.util.ValueFactory.emptyRelationshipValue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java index eede3976ef..0c211ce6d0 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.junit.MatcherAssert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import org.junit.jupiter.api.Test; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/UnsupportedDateTimeValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/UnsupportedDateTimeValueTest.java index a9addaca16..9f678451b5 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/UnsupportedDateTimeValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/UnsupportedDateTimeValueTest.java @@ -78,6 +78,7 @@ static List throwingDateTimeAccessMethods() { } @Test + @SuppressWarnings("EqualsWithItself") void shouldEqualToItself() { // GIVEN var value = new UnsupportedDateTimeValue(exception); 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 754c58b0f6..822a189132 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java @@ -24,9 +24,9 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQuery.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQuery.java index b465060c5b..66f6e65ad5 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQuery.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryInTx.java index 80d3b49dc6..c314c40fcc 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryInTx.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; 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 197a3e5e7c..cff10da081 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncFailingQueryWithRetries.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQuery.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQuery.java index 992d74b693..b6e46cc180 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQuery.java @@ -18,9 +18,9 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryInTx.java index bb57b1ad1b..f01c4addb0 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryInTx.java @@ -18,9 +18,9 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; 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 4ed8ec41d8..0b3b01b2ad 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/AsyncWrongQueryWithRetries.java @@ -18,9 +18,9 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQuery.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQuery.java index c9a356283f..ee0623144c 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQuery.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryInTx.java index fada3b25f4..7c2022d763 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryInTx.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; 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 239410c73c..c1317c9190 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingFailingQueryWithRetries.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQuery.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQuery.java index f34eaa2748..aef2d7c72c 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQuery.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.syntaxError; diff --git a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryInTx.java b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryInTx.java index a9730f8919..3fd11d626b 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryInTx.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.syntaxError; 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 52a1dbcda4..343293b44f 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/BlockingWrongQueryWithRetries.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.internal.util.Matchers.syntaxError; diff --git a/driver/src/test/java/org/neo4j/driver/stress/FailedAuth.java b/driver/src/test/java/org/neo4j/driver/stress/FailedAuth.java index 942c389554..ed29d43ae9 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/FailedAuth.java +++ b/driver/src/test/java/org/neo4j/driver/stress/FailedAuth.java @@ -18,8 +18,8 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.neo4j.driver.AuthTokens.basic; 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 0097a40dfd..63d2d1276e 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQuery.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQuery.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; import java.util.concurrent.CompletableFuture; 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 5dcc935a96..ef8dad5ff1 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryInTx.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; import java.util.concurrent.CompletableFuture; @@ -47,7 +47,7 @@ public CompletionStage execute(C context) { tx -> tx.run("UNWIND [10, 5, 0] AS x RETURN 10 / x").records(), RxTransaction::commit, (tx, error) -> tx.rollback(), - null) + RxTransaction::close) .subscribe( record -> assertThat( record.get(0).asInt(), either(equalTo(1)).or(equalTo(2))), 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 6c91879219..ea2dd20cc1 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryWithRetries.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxFailingQueryWithRetries.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.stress; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.neo4j.driver.internal.util.Matchers.arithmeticError; import java.util.concurrent.CompletableFuture; 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 3244b714f0..bf79edad7a 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryInTx.java +++ b/driver/src/test/java/org/neo4j/driver/stress/RxReadQueryInTx.java @@ -43,7 +43,7 @@ public CompletionStage execute(C context) { this::processAndGetSummary, RxTransaction::commit, (tx, error) -> tx.rollback(), - null) + RxTransaction::close) .subscribe( summary -> { context.readCompleted(); diff --git a/driver/src/test/java/org/neo4j/driver/testutil/FileTools.java b/driver/src/test/java/org/neo4j/driver/testutil/FileTools.java index 0724f08574..d7712499c8 100644 --- a/driver/src/test/java/org/neo4j/driver/testutil/FileTools.java +++ b/driver/src/test/java/org/neo4j/driver/testutil/FileTools.java @@ -21,200 +21,11 @@ import static java.io.File.createTempFile; import java.io.File; -import java.io.FileFilter; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.nio.file.Files; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Scanner; -import java.util.Set; public class FileTools { - private static final int WINDOWS_RETRY_COUNT = 5; - - public static void deleteRecursively(File file) { - if (file.isDirectory()) { - var files = file.listFiles(); - if (files != null) { - for (var sub : files) { - deleteRecursively(sub); - } - } - } - - //noinspection ResultOfMethodCallIgnored - file.delete(); - } - public static File tempFile(String prefix, String suffix) throws Throwable { var file = createTempFile(prefix, suffix); file.deleteOnExit(); return file; } - - public static File tempFile(String prefix) throws Throwable { - return tempFile(prefix, ".tmp"); - } - - public static boolean deleteFile(File file) { - if (!file.exists()) { - return true; - } - var count = 0; - boolean deleted; - do { - deleted = file.delete(); - if (!deleted) { - count++; - waitAndThenTriggerGC(); - } - } while (!deleted && count <= WINDOWS_RETRY_COUNT); - return deleted; - } - - public static void moveFile(File toMove, File target) throws IOException { - if (!toMove.exists()) { - throw new FileNotFoundException("Source file[" + toMove.getAbsolutePath() + "] not found"); - } - if (target.exists()) { - throw new IOException("Target file[" + target.getAbsolutePath() + "] already exists"); - } - - if (toMove.renameTo(target)) { - return; - } - - if (toMove.isDirectory()) { - Files.createDirectories(target.toPath()); - copyRecursively(toMove, target, null); - deleteRecursively(toMove); - } else { - copyFile(toMove, target); - deleteFile(toMove); - } - } - - public static void copyRecursively(File fromDirectory, File toDirectory, FileFilter filter) throws IOException { - for (var fromFile : fromDirectory.listFiles(filter)) { - var toFile = new File(toDirectory, fromFile.getName()); - if (fromFile.isDirectory()) { - Files.createDirectories(toFile.toPath()); - copyRecursively(fromFile, toFile, filter); - } else { - copyFile(fromFile, toFile); - } - } - } - - public static void copyFile(File srcFile, File dstFile) throws IOException { - var parentFile = dstFile.getParentFile(); - if (parentFile != null) { - //noinspection ResultOfMethodCallIgnored - parentFile.mkdirs(); - } - try (var input = new FileInputStream(srcFile); - var output = new FileOutputStream(dstFile)) { - var bufferSize = 1024; - var buffer = new byte[bufferSize]; - int bytesRead; - while ((bytesRead = input.read(buffer)) != -1) { - output.write(buffer, 0, bytesRead); - } - } catch (IOException e) { - // Because the message from this cause may not mention which file it's about - throw new IOException( - "Could not copy '" + srcFile.getCanonicalPath() + "' to '" + dstFile.getCanonicalPath() + "'", e); - } - } - - /* - * See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4715154. - */ - @SuppressWarnings("ResultOfMethodCallIgnored") - private static void waitAndThenTriggerGC() { - try { - Thread.sleep(500); - } catch (InterruptedException ee) { - Thread.interrupted(); - } // ok - System.gc(); - } - - public static void updateProperty(File propFile, String key, String value) throws IOException { - Map propertiesMap = new HashMap<>(1); - propertiesMap.put(key, value); - updateProperties(propFile, propertiesMap, Collections.emptySet()); - } - - public static void updateProperties(File propFile, Map propertiesMap, Set excludes) - throws IOException { - var in = new Scanner(propFile); - - Set updatedProperties = new HashSet<>(propertiesMap.size()); - var newPropFile = File.createTempFile(propFile.getName(), null); - - try { - var outStream = new FileOutputStream(newPropFile); - var out = new PrintWriter(outStream); - - while (in.hasNextLine()) { - var line = in.nextLine(); - if (!line.trim().startsWith("#")) { - var tokens = line.split("="); - if (tokens.length == 2) { - var name = tokens[0].trim(); - if (excludes.contains(name)) { - continue; - } - - Object value = propertiesMap.get(name); - if (value != null && !updatedProperties.contains(name)) { - // found property and set it to the new value - printlnProperty(out, name, value); - updatedProperties.add(name); - } else { - // not the property that we are looking for, print it as original - out.println(line); - } - } else { - // not the property that we are looking for, print it as original - out.println(line); - } - } else { - // comments, print as original - out.println(line); - } - } - - for (var entry : propertiesMap.entrySet()) { - var name = entry.getKey(); - Object value = entry.getValue(); - if (value != null && !updatedProperties.contains(name)) { - // add this as a new prop - printlnProperty(out, name, value); - } - } - - in.close(); - out.flush(); - out.close(); - deleteFile(propFile); - moveFile(newPropFile, propFile); - } catch (IOException | RuntimeException e) { - newPropFile.deleteOnExit(); - throw e; - } - } - - private static void printlnProperty(PrintWriter out, String name, Object value) { - out.print(name); - out.print('='); - out.println(value); - } } diff --git a/driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java b/driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java deleted file mode 100644 index 5bb81e8154..0000000000 --- a/driver/src/test/java/org/neo4j/driver/testutil/FileToolsTest.java +++ /dev/null @@ -1,102 +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.testutil; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.junit.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Scanner; -import org.junit.jupiter.api.Test; - -class FileToolsTest { - @Test - void shouldBeAbleToCreateTemporaryFile() throws Throwable { - // Given - var file = FileTools.tempFile("test"); - - // Then - try { - assertThat(file.exists(), equalTo(true)); - } finally { - assertThat(FileTools.deleteFile(file), equalTo(true)); - } - } - - @Test - void shouldAddPropertyAtBottom() throws IOException { - // Given - var propertyFile = createPropertyFile(); - - // When - FileTools.updateProperty(propertyFile, "cat.name", "mimi"); - - // Then - try (var in = new Scanner(propertyFile)) { - assertEquals("#Wow wow", in.nextLine()); - assertEquals("Meow meow", in.nextLine()); - assertEquals("color=black", in.nextLine()); - assertEquals("cat.age=3", in.nextLine()); - assertEquals("cat.name=mimi", in.nextLine()); - - assertFalse(in.hasNextLine()); - } finally { - assertThat(FileTools.deleteFile(propertyFile), equalTo(true)); - } - } - - @Test - void shouldResetPropertyAtTheSameLine() throws IOException { - // Given - var propertyFile = createPropertyFile(); - - // When - FileTools.updateProperty(propertyFile, "color", "white"); - - // Then - try (var in = new Scanner(propertyFile)) { - assertEquals("#Wow wow", in.nextLine()); - assertEquals("Meow meow", in.nextLine()); - assertEquals("color=white", in.nextLine()); - assertEquals("cat.age=3", in.nextLine()); - - assertFalse(in.hasNextLine()); - } finally { - assertThat(FileTools.deleteFile(propertyFile), equalTo(true)); - } - } - - private File createPropertyFile() throws FileNotFoundException { - var propFile = new File("Cat"); - var out = new PrintWriter(propFile); - - out.println("#Wow wow"); - out.println("Meow meow"); - out.println("color=black"); - out.println("cat.age=3"); - - out.close(); - return propFile; - } -} diff --git a/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java b/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java index 3d25958620..d365f64180 100644 --- a/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java +++ b/driver/src/test/java/org/neo4j/driver/types/TypeSystemTest.java @@ -19,8 +19,8 @@ package org.neo4j.driver.types; import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.neo4j.driver.Values.value; import static org.neo4j.driver.internal.types.InternalTypeSystem.TYPE_SYSTEM; diff --git a/examples/pom.xml b/examples/pom.xml index 61f5b647e6..967af8dec3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -44,10 +44,6 @@ test-jar test - - org.hamcrest - hamcrest-junit - org.mockito mockito-core diff --git a/examples/src/main/java/org/neo4j/docs/driver/CustomAuthExample.java b/examples/src/main/java/org/neo4j/docs/driver/CustomAuthExample.java index 83cfc5d6f4..9ded1ecdf7 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/CustomAuthExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/CustomAuthExample.java @@ -41,6 +41,11 @@ public CustomAuthExample( } // end::custom-auth[] + public boolean canConnect() { + var result = driver.session().run("RETURN 1"); + return result.single().get(0).asInt() == 1; + } + @Override public void close() throws RuntimeException { driver.close(); diff --git a/examples/src/main/java/org/neo4j/docs/driver/KerberosAuthExample.java b/examples/src/main/java/org/neo4j/docs/driver/KerberosAuthExample.java index 825d054f04..1732239711 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/KerberosAuthExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/KerberosAuthExample.java @@ -24,6 +24,7 @@ import org.neo4j.driver.GraphDatabase; // end::kerberos-auth-import[] +@SuppressWarnings("unused") public class KerberosAuthExample implements AutoCloseable { private final Driver driver; diff --git a/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java b/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java index 6d4e6870d9..2726d96263 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java @@ -22,7 +22,6 @@ import org.neo4j.driver.AccessMode; import org.neo4j.driver.Bookmark; -import org.neo4j.driver.Result; import org.neo4j.driver.TransactionContext; import java.util.ArrayList; @@ -40,37 +39,36 @@ public PassBookmarkExample(String uri, String user, String password) { // tag::pass-bookmarks[] // Create a company node - private Result addCompany(TransactionContext tx, String name) { - return tx.run("CREATE (:Company {name: $name})", parameters("name", name)); + private void addCompany(TransactionContext tx, String name) { + tx.run("CREATE (:Company {name: $name})", parameters("name", name)); } // Create a person node - private Result addPerson(TransactionContext tx, String name) { - return tx.run("CREATE (:Person {name: $name})", parameters("name", name)); + private void addPerson(TransactionContext tx, String name) { + tx.run("CREATE (:Person {name: $name})", parameters("name", name)); } // Create an employment relationship to a pre-existing company node. // This relies on the person first having been created. - private Result employ(TransactionContext tx, String person, String company) { - return tx.run("MATCH (person:Person {name: $person_name}) MATCH (company:Company {name: $company_name}) CREATE (person)-[:WORKS_FOR]->(company)", + private void employ(TransactionContext tx, String person, String company) { + tx.run("MATCH (person:Person {name: $person_name}) MATCH (company:Company {name: $company_name}) CREATE (person)-[:WORKS_FOR]->(company)", parameters("person_name", person, "company_name", company)); } // Create a friendship between two people. @SuppressWarnings("SameParameterValue") - private Result makeFriends(TransactionContext tx, String person1, String person2) { - return tx.run("MATCH (a:Person {name: $person_1}) MATCH (b:Person {name: $person_2}) MERGE (a)-[:KNOWS]->(b)", + private void makeFriends(TransactionContext tx, String person1, String person2) { + tx.run("MATCH (a:Person {name: $person_1}) MATCH (b:Person {name: $person_2}) MERGE (a)-[:KNOWS]->(b)", parameters("person_1", person1, "person_2", person2)); } // Match and display all friendships. - private Result printFriends(TransactionContext tx) { + private void printFriends(TransactionContext tx) { var result = tx.run("MATCH (a)-[:KNOWS]->(b) RETURN a.name, b.name"); while (result.hasNext()) { var record = result.next(); System.out.printf("%s knows %s%n", record.get("a.name").asString(), record.get("b.name").toString()); } - return result; } public void addEmployAndMakeFriends() { @@ -80,10 +78,9 @@ public void addEmployAndMakeFriends() { // Create the first person and employment relationship. try (var session1 = driver.session(builder().withDefaultAccessMode(AccessMode.WRITE).build())) { - session1.executeWrite(tx -> addCompany(tx, "Wayne Enterprises").consume()); - session1.executeWrite(tx -> addPerson(tx, "Alice").consume()); - session1.executeWrite( - tx -> employ(tx, "Alice", "Wayne Enterprises").consume()); + session1.executeWriteWithoutResult(tx -> addCompany(tx, "Wayne Enterprises")); + session1.executeWriteWithoutResult(tx -> addPerson(tx, "Alice")); + session1.executeWriteWithoutResult(tx -> employ(tx, "Alice", "Wayne Enterprises")); savedBookmarks = new ArrayList<>(session1.lastBookmarks()); } @@ -91,9 +88,9 @@ public void addEmployAndMakeFriends() { // Create the second person and employment relationship. try (var session2 = driver.session(builder().withDefaultAccessMode(AccessMode.WRITE).build())) { - session2.executeWrite(tx -> addCompany(tx, "LexCorp").consume()); - session2.executeWrite(tx -> addPerson(tx, "Bob").consume()); - session2.executeWrite(tx -> employ(tx, "Bob", "LexCorp").consume()); + session2.executeWriteWithoutResult(tx -> addCompany(tx, "LexCorp")); + session2.executeWriteWithoutResult(tx -> addPerson(tx, "Bob")); + session2.executeWriteWithoutResult(tx -> employ(tx, "Bob", "LexCorp")); savedBookmarks.addAll(session2.lastBookmarks()); } @@ -103,9 +100,9 @@ public void addEmployAndMakeFriends() { .withDefaultAccessMode(AccessMode.WRITE) .withBookmarks(savedBookmarks) .build())) { - session3.executeWrite(tx -> makeFriends(tx, "Alice", "Bob").consume()); + session3.executeWriteWithoutResult(tx -> makeFriends(tx, "Alice", "Bob")); - session3.executeWrite(this::printFriends); + session3.executeWriteWithoutResult(this::printFriends); } } // end::pass-bookmarks[] diff --git a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java index ab91b277e4..97eb191f2e 100644 --- a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java +++ b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java @@ -32,17 +32,13 @@ import org.neo4j.driver.testutil.TestUtil; import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Set; import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.internal.util.Neo4jEdition.ENTERPRISE; @@ -116,7 +112,7 @@ void testShouldRunAutocommitTransactionExample() { example.addPerson("Alice"); // Then - assertThat(personCount("Alice"), greaterThan(0)); + assertTrue(personCount("Alice") > 0); } } @@ -147,7 +143,7 @@ void testShouldAsyncRunResultConsumeExample() { var names = await(example.getPeople()); // Then - assertThat(names, equalTo(asList("Alice", "Bob"))); + assertEquals(asList("Alice", "Bob"), names); } } @@ -164,8 +160,8 @@ void testShouldAsyncRunMultipleTransactionExample() { // Then var employeeCount = readInt("MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'Acme' RETURN count(emp)"); - assertThat(employeeCount, equalTo(2)); - assertThat(nodesCreated, equalTo(1)); + assertEquals(2, employeeCount); + assertEquals(1, nodesCreated); } } @@ -187,13 +183,22 @@ void testShouldRunBasicAuthExample() { } } + @Test + void testShouldRunCustomAuthExample() { + // Given + try (var example = new CustomAuthExample(uri, USER, neo4j.adminPassword(), null, "basic", Map.of())) { + // Then + assertTrue(example.canConnect()); + } + } + @Test void testShouldRunConfigConnectionTimeoutExample() { // Given try (var example = new ConfigConnectionTimeoutExample(uri, USER, neo4j.adminPassword())) { // Then - assertThat(example, instanceOf(ConfigConnectionTimeoutExample.class)); + assertNotNull(example); } } @@ -202,7 +207,7 @@ void testShouldRunConfigMaxRetryTimeExample() { // Given try (var example = new ConfigMaxRetryTimeExample(uri, USER, neo4j.adminPassword())) { // Then - assertThat(example, instanceOf(ConfigMaxRetryTimeExample.class)); + assertNotNull(example); } } @@ -211,7 +216,7 @@ void testShouldRunConfigTrustExample() { // Given try (var example = new ConfigTrustExample(uri, USER, neo4j.adminPassword())) { // Then - assertThat(example, instanceOf(ConfigTrustExample.class)); + assertNotNull(example); } } @@ -220,7 +225,7 @@ void testShouldRunConfigUnencryptedExample() { // Given try (var example = new ConfigUnencryptedExample(uri, USER, neo4j.adminPassword())) { // Then - assertThat(example, instanceOf(ConfigUnencryptedExample.class)); + assertNotNull(example); } } @@ -229,7 +234,7 @@ void testShouldRunDriverLifecycleExample() { // Given try (var example = new DriverLifecycleExample(uri, USER, neo4j.adminPassword())) { // Then - assertThat(example, instanceOf(DriverLifecycleExample.class)); + assertNotNull(example); } } @@ -245,8 +250,8 @@ void testShouldRunHelloWorld() { } // Then - assertThat(stdIO.stdout().size(), equalTo(1)); - assertThat(stdIO.stdout().get(0), containsString("hello, world")); + assertEquals(1, stdIO.stdout().size()); + assertTrue(stdIO.stdout().get(0).contains("hello, world")); } } @@ -258,7 +263,7 @@ void testShouldRunReadWriteTransactionExample() { var nodeID = example.addPerson("Alice"); // Then - assertThat(nodeID, greaterThanOrEqualTo(0L)); + assertTrue(nodeID >= 0L); } } @@ -272,7 +277,7 @@ void testShouldRunResultConsumeExample() { var names = example.getPeople(); // Then - assertThat(names, equalTo(asList("Alice", "Bob"))); + assertEquals(List.of("Alice", "Bob"), names); } } @@ -288,7 +293,7 @@ void testShouldRunResultRetainExample() { // Then var employeeCount = readInt("MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'Acme' RETURN count(emp)"); - assertThat(employeeCount, equalTo(2)); + assertEquals(2, employeeCount); } } @@ -300,7 +305,7 @@ void testShouldRunTransactionFunctionExample() { example.addPerson("Alice"); // Then - assertThat(personCount("Alice"), greaterThan(0)); + assertTrue(personCount("Alice") > 0); } } @@ -313,7 +318,7 @@ void testShouldConfigureTransactionTimeoutExample() { example.addPerson("Alice"); // Then - assertThat(personCount("Alice"), greaterThan(0)); + assertTrue(personCount("Alice") > 0); } } @@ -326,7 +331,7 @@ void testShouldConfigureTransactionMetadataExample() { example.addPerson("Alice"); // Then - assertThat(personCount("Alice"), greaterThan(0)); + assertTrue(personCount("Alice") > 0); } } @@ -361,22 +366,22 @@ void testPassBookmarksExample() { example.addEmployAndMakeFriends(); // Then - assertThat(companyCount("Wayne Enterprises"), is(1)); - assertThat(companyCount("LexCorp"), is(1)); - assertThat(personCount("Alice"), is(1)); - assertThat(personCount("Bob"), is(1)); + assertEquals(1, companyCount("Wayne Enterprises")); + assertEquals(1, companyCount("LexCorp")); + assertEquals(1, personCount("Alice")); + assertEquals(1, personCount("Bob")); var employeeCountOfWayne = readInt( "MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'Wayne Enterprises' RETURN count(emp)"); - assertThat(employeeCountOfWayne, is(1)); + assertEquals(1, employeeCountOfWayne); var employeeCountOfLexCorp = readInt( "MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'LexCorp' RETURN count(emp)"); - assertThat(employeeCountOfLexCorp, is(1)); + assertEquals(1, employeeCountOfLexCorp); var friendCount = readInt("MATCH (a:Person {name: 'Alice'})-[:KNOWS]->(b:Person {name: 'Bob'}) RETURN count(a)"); - assertThat(friendCount, is(1)); + assertEquals(1, friendCount); } } @@ -415,7 +420,7 @@ void testShouldRunRxTransactionFunctionExampleReactor() { // print all 'Product' nodes to fake stdout try (stdIOCapture) { final var summaryList = await(example.printAllProducts()); - assertThat(summaryList.size(), equalTo(1)); + assertEquals(1, summaryList.size()); var summary = summaryList.get(0); assertEquals(QueryType.READ_ONLY, summary.queryType()); } @@ -436,7 +441,7 @@ void testShouldRunRxResultConsumeExampleReactor() { var names = await(example.getPeople()); // Then - assertThat(names, equalTo(asList("Alice", "Bob"))); + assertEquals(List.of("Alice", "Bob"), names); } } @@ -453,7 +458,7 @@ void testUseAnotherDatabaseExample() { // Then var greetingCount = readInt("examples", "MATCH (a:Greeting) RETURN count(a)", Values.parameters()); - assertThat(greetingCount, is(1)); + assertEquals(1, greetingCount); } } } diff --git a/pom.xml b/pom.xml index 6484188ca8..3c3e959565 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 2022.0.9 1.7.36 - 2.0.0.0 + 2.2 5.4.0 5.10.0 1.0.4 @@ -136,8 +136,8 @@ org.hamcrest - hamcrest-junit - ${hamcrest-junit.version} + hamcrest + ${hamcrest.version} test diff --git a/testkit-backend/pom.xml b/testkit-backend/pom.xml index bdd57fbe97..0b3de4ecf2 100644 --- a/testkit-backend/pom.xml +++ b/testkit-backend/pom.xml @@ -45,11 +45,6 @@ - - org.hamcrest - hamcrest-junit - test - org.junit.jupiter junit-jupiter diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/holder/AbstractResultHolder.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/holder/AbstractResultHolder.java index 848d17752c..5bf88d063f 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/holder/AbstractResultHolder.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/holder/AbstractResultHolder.java @@ -18,7 +18,6 @@ */ package neo4j.org.testkit.backend.holder; -import java.util.Optional; import lombok.Getter; public abstract class AbstractResultHolder, T3> { @@ -44,9 +43,5 @@ public T1 getSessionHolder() { return transactionHolder != null ? getSessionHolder(transactionHolder) : sessionHolder; } - public Optional getTransactionHolder() { - return Optional.ofNullable(transactionHolder); - } - protected abstract T1 getSessionHolder(T2 transactionHolder); } diff --git a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java index 9c15c295b1..996656bf1c 100644 --- a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java +++ b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java @@ -18,9 +18,8 @@ */ package neo4j.org.testkit.backend; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -42,12 +41,14 @@ void testDeserializeNewDriver() throws JsonProcessingException { + "\"credentials\": \"pass\", \"realm\": \"\", \"ticket\": \"\"}}, \"userAgent\": null}}", TestkitRequest.class); - assertThat(message, instanceOf(NewDriver.class)); + assertTrue(message instanceof NewDriver); var newDriver = (NewDriver) message; - assertThat(newDriver.getData().getUri(), equalTo("bolt://localhost:7687")); - assertThat(newDriver.getData().getAuthorizationToken().getTokens().getScheme(), equalTo("basic")); - assertThat(newDriver.getData().getAuthorizationToken().getTokens().getPrincipal(), equalTo("neo4j")); + assertEquals("bolt://localhost:7687", newDriver.getData().getUri()); + assertEquals( + "basic", newDriver.getData().getAuthorizationToken().getTokens().getScheme()); + assertEquals( + "neo4j", newDriver.getData().getAuthorizationToken().getTokens().getPrincipal()); } @Test @@ -57,11 +58,11 @@ void testDeserializerNewSession() throws JsonProcessingException { + "\"data\": {\"driverId\": \"0\", \"accessMode\": \"w\", \"bookmarks\": null, \"database\": null, \"fetchSize\": null}}", TestkitRequest.class); - assertThat(message, instanceOf(NewSession.class)); + assertTrue(message instanceof NewSession); var sessionRequest = (NewSession) message; - assertThat(sessionRequest.getData().getDriverId(), equalTo("0")); - assertThat(sessionRequest.getData().getAccessMode(), equalTo("w")); + assertEquals("0", sessionRequest.getData().getDriverId()); + assertEquals("w", sessionRequest.getData().getAccessMode()); } @Test @@ -71,10 +72,10 @@ void testDeserializerNewSessionRun() throws JsonProcessingException { + "\"params\": {\"x\": {\"name\": \"CypherBool\", \"data\": {\"value\": true}}}, \"txMeta\": null, \"timeout\": null}}", TestkitRequest.class); - assertThat(message, instanceOf(SessionRun.class)); + assertTrue(message instanceof SessionRun); var sessionRun = (SessionRun) message; - assertThat(sessionRun.getData().getSessionId(), equalTo("1")); - assertThat(sessionRun.getData().getCypher(), equalTo("RETURN $x as y")); + assertEquals("1", sessionRun.getData().getSessionId()); + assertEquals("RETURN $x as y", sessionRun.getData().getCypher()); } } diff --git a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java index 2492b98c77..1be3e7943d 100644 --- a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java +++ b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java @@ -18,8 +18,7 @@ */ package neo4j.org.testkit.backend; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -38,7 +37,6 @@ void shouldSerializerNewDriverResponse() throws JsonProcessingException { var expectedOutput = "{\"name\":\"Driver\",\"data\":{\"id\":\"1\"}}"; var serializedResponse = mapper.writeValueAsString(response); - - assertThat(serializedResponse, equalTo(expectedOutput)); + assertEquals(expectedOutput, serializedResponse); } } diff --git a/testkit-tests/pom.xml b/testkit-tests/pom.xml index e925e08e01..e526068086 100644 --- a/testkit-tests/pom.xml +++ b/testkit-tests/pom.xml @@ -29,7 +29,7 @@ %a-r %a-rs - + 0.40.2 true