Skip to content

Commit ed8bbf6

Browse files
injectivesinjectives
committed
Refactoring
1 parent aee893b commit ed8bbf6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+63
-104
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ As a policy, patch versions will not be released except on rare occasions. Bug f
1515

1616
## Supported Driver Series
1717

18-
| Driver Series | Supported Java Runtime versions | Status | Changelog |
19-
| --- | --- | --- | --- |
20-
| 5.x | 17 | Primary development branch. | [link](https://github.com/neo4j/neo4j-java-driver/wiki/5.x-changelog) |
21-
| 4.4 | 8, 11 | Maintenance. | [link](https://github.com/neo4j/neo4j-java-driver/wiki/4.4-changelog) |
18+
| Driver Series | Supported Java Runtime versions | Status | Changelog |
19+
|---------------|---------------------------------|-----------------------------|-----------------------------------------------------------------------|
20+
| 5.x | 17 | Primary development branch. | [link](https://github.com/neo4j/neo4j-java-driver/wiki/5.x-changelog) |
21+
| 4.4 | 8, 11 | Maintenance. | [link](https://github.com/neo4j/neo4j-java-driver/wiki/4.4-changelog) |
2222

2323
## Server Compatibility
2424

‎build/javadoc/overview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2-
<HTML>
2+
<HTML lang="en">
33
<HEAD>
44
<TITLE>API Overview</TITLE>
55
</HEAD>

‎driver/src/main/java/org/neo4j/driver/Config.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,8 @@ public ConfigBuilder withRoutingTablePurgeDelay(long delay, TimeUnit unit) {
574574
* By default, the value is set to {@code 1000}.
575575
* Use {@code -1} to disables back pressure and config client to pull all records at once after each run.
576576
* <p>
577-
* This config only applies to run result obtained via {@link Session} and {@link org.neo4j.driver.async.AsyncSession}.
578-
* As with {@link org.neo4j.driver.reactive.RxSession}, the batch size is provided via
579-
* {@link org.reactivestreams.Subscription#request(long)} instead.
577+
* This config only applies to run results obtained via {@link Session} and {@link org.neo4j.driver.async.AsyncSession}.
578+
* As with the reactive sessions the batch size is managed by the subscription requests instead.
580579
*
581580
* @param size the default record fetch size when pulling records in batches using Bolt V4.
582581
* @return this builder

‎driver/src/main/java/org/neo4j/driver/Driver.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ default Session session(SessionConfig sessionConfig) {
139139
* @throws IllegalArgumentException for unsupported session types
140140
* @since 5.2
141141
*/
142+
@SuppressWarnings("deprecation")
142143
default <T extends BaseSession> T session(Class<T> sessionClass) {
143144
return session(sessionClass, SessionConfig.defaultConfig());
144145
}
@@ -176,6 +177,7 @@ default <T extends BaseSession> T session(Class<T> sessionClass) {
176177
* @since 5.8
177178
*/
178179
@Preview(name = "AuthToken rotation and session auth support")
180+
@SuppressWarnings("deprecation")
179181
default <T extends BaseSession> T session(Class<T> sessionClass, AuthToken sessionAuthToken) {
180182
return session(sessionClass, SessionConfig.defaultConfig(), sessionAuthToken);
181183
}
@@ -208,6 +210,7 @@ default <T extends BaseSession> T session(Class<T> sessionClass, AuthToken sessi
208210
* @throws IllegalArgumentException for unsupported session types
209211
* @since 5.2
210212
*/
213+
@SuppressWarnings("deprecation")
211214
default <T extends BaseSession> T session(Class<T> sessionClass, SessionConfig sessionConfig) {
212215
return session(sessionClass, sessionConfig, null);
213216
}
@@ -247,6 +250,7 @@ default <T extends BaseSession> T session(Class<T> sessionClass, SessionConfig s
247250
* @since 5.8
248251
*/
249252
@Preview(name = "AuthToken rotation and session auth support")
253+
@SuppressWarnings("deprecation")
250254
<T extends BaseSession> T session(Class<T> sessionClass, SessionConfig sessionConfig, AuthToken sessionAuthToken);
251255

252256
/**

‎driver/src/main/java/org/neo4j/driver/SessionConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import org.neo4j.driver.async.AsyncSession;
3131
import org.neo4j.driver.exceptions.UnsupportedFeatureException;
3232
import org.neo4j.driver.reactive.ReactiveSession;
33-
import org.neo4j.driver.reactive.RxSession;
34-
import org.reactivestreams.Subscription;
3533

3634
/**
3735
* The session configurations used to configure a session.
@@ -339,7 +337,8 @@ public Builder withDatabase(String database) {
339337
* Use {@code -1} to disables back pressure and config client to pull all records at once after each run.
340338
* <p>
341339
* This config only applies to run result obtained via {@link Session} and {@link AsyncSession}.
342-
* As with {@link RxSession}, the batch size is provided via {@link Subscription#request(long)} instead.
340+
* As with the reactive sessions the batch size is managed by the subscription requests instead.
341+
*
343342
* @param size the default record fetch size when pulling records in batches using Bolt V4.
344343
* @return this builder
345344
*/

‎driver/src/main/java/org/neo4j/driver/TransactionConfig.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.Map;
3131
import java.util.Objects;
3232
import org.neo4j.driver.async.AsyncSession;
33-
import org.neo4j.driver.async.AsyncTransactionWork;
3433
import org.neo4j.driver.internal.util.Extract;
3534

3635
/**
@@ -41,9 +40,8 @@
4140
* <ul>
4241
* <li>queries executed in auto-commit transactions - using various overloads of {@link Session#run(String, TransactionConfig)} and
4342
* {@link AsyncSession#runAsync(String, TransactionConfig)}</li>
44-
* <li>transactions started by transaction functions - using {@link Session#readTransaction(TransactionWork, TransactionConfig)},
45-
* {@link Session#writeTransaction(TransactionWork, TransactionConfig)}, {@link AsyncSession#readTransactionAsync(AsyncTransactionWork, TransactionConfig)} and
46-
* {@link AsyncSession#writeTransactionAsync(AsyncTransactionWork, TransactionConfig)}</li>
43+
* <li>transactions started by transaction functions - using {@link Session#executeWrite(TransactionCallback, TransactionConfig)},
44+
* {@link Session#executeRead(TransactionCallback, TransactionConfig)} and the other similar variants</li>
4745
* <li>unmanaged transactions - using {@link Session#beginTransaction(TransactionConfig)} and {@link AsyncSession#beginTransactionAsync(TransactionConfig)}</li>
4846
* </ul>
4947
* <p>

‎driver/src/main/java/org/neo4j/driver/Values.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ public static Value value(Object value) {
224224
* @return the array of values
225225
*/
226226
public static Value[] values(final Object... input) {
227-
var values = Arrays.stream(input).map(Values::value).toArray(Value[]::new);
228-
return values;
227+
return Arrays.stream(input).map(Values::value).toArray(Value[]::new);
229228
}
230229

231230
/**

‎driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,9 @@ private CompletionStage<ConnectionContextAndHandler> ensureDatabaseNameIsComplet
165165
public Set<BoltServerAddress> allServers() {
166166
// obviously we just had a snapshot of all servers in all routing tables
167167
// after we read it, the set could already be changed.
168-
var servers = routingTableHandlers.values().stream()
168+
return routingTableHandlers.values().stream()
169169
.flatMap(tableHandler -> tableHandler.servers().stream())
170170
.collect(Collectors.toSet());
171-
return servers;
172171
}
173172

174173
@Override

‎driver/src/test/java/org/neo4j/driver/integration/QueryIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void shouldRunParameterizedWithResult() {
141141
assertThat(result.size(), equalTo(3));
142142
}
143143

144-
@SuppressWarnings({"QueryWithEmptyBody", "ConstantConditions"})
144+
@SuppressWarnings({"QueryWithEmptyBody"})
145145
@Test
146146
void shouldRunSimpleQuery() {
147147
// When I run a simple write query
@@ -166,7 +166,6 @@ void shouldFailForIllegalQueries() {
166166
}
167167

168168
@Test
169-
@SuppressWarnings("deprecation")
170169
void shouldBeAbleToLogSemanticWrongExceptions() {
171170
try {
172171
// When I run a query with the old syntax

‎driver/src/test/java/org/neo4j/driver/integration/SessionBoltV3IT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ void beforeAll() {
7373
}
7474

7575
@Test
76-
@SuppressWarnings("resource")
7776
void shouldSetTransactionMetadata() {
7877
Map<String, Object> metadata = new HashMap<>();
7978
metadata.put("a", "hello world");

‎driver/src/test/java/org/neo4j/driver/integration/SessionIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import java.util.HashSet;
5555
import java.util.List;
5656
import java.util.NoSuchElementException;
57-
import java.util.Set;
5857
import java.util.concurrent.Callable;
5958
import java.util.concurrent.CountDownLatch;
6059
import java.util.concurrent.ExecutionException;
@@ -1257,10 +1256,9 @@ private void testExecuteReadTx(AccessMode sessionMode) {
12571256
driver.session(builder().withDefaultAccessMode(sessionMode).build())) {
12581257
var names = session.readTransaction(tx -> {
12591258
var records = tx.run("MATCH (p:Person) RETURN p.name AS name").list();
1260-
Set<String> names1 = records.stream()
1259+
return records.stream()
12611260
.map(record -> record.get("name").asString())
12621261
.collect(Collectors.toCollection(() -> new HashSet<>(records.size())));
1263-
return names1;
12641262
});
12651263

12661264
assertThat(names, containsInAnyOrder("Tony Stark", "Steve Rogers"));

‎driver/src/test/java/org/neo4j/driver/integration/SessionResetIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static org.hamcrest.CoreMatchers.instanceOf;
2929
import static org.hamcrest.CoreMatchers.startsWith;
3030
import static org.hamcrest.junit.MatcherAssert.assertThat;
31-
import static org.junit.Assert.assertNotNull;
3231
import static org.junit.jupiter.api.Assertions.assertEquals;
32+
import static org.junit.jupiter.api.Assertions.assertNotNull;
3333
import static org.junit.jupiter.api.Assertions.assertThrows;
3434
import static org.junit.jupiter.api.Assertions.fail;
3535
import static org.neo4j.driver.Values.parameters;

‎driver/src/test/java/org/neo4j/driver/integration/TransactionBoltV3IT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ void beforeAll() {
6060
}
6161

6262
@Test
63-
@SuppressWarnings("resource")
6463
void shouldSetTransactionMetadata() {
6564
Map<String, Object> metadata = new HashMap<>();
6665
metadata.put("key1", "value1");

‎driver/src/test/java/org/neo4j/driver/integration/UnsupportedBoltV3IT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class UnsupportedBoltV3IT {
4848
.build();
4949

5050
@Test
51-
@SuppressWarnings("resource")
5251
void shouldNotSupportAutoCommitQueriesWithTransactionConfig() {
5352
assertTxConfigNotSupported(() -> driver.session().run("RETURN 42", txConfig));
5453
}

‎driver/src/test/java/org/neo4j/driver/internal/InternalBookmarkTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static java.util.Collections.singletonList;
2525
import static org.hamcrest.CoreMatchers.equalTo;
2626
import static org.hamcrest.CoreMatchers.hasItems;
27-
import static org.junit.Assert.assertThat;
27+
import static org.hamcrest.MatcherAssert.assertThat;
2828
import static org.junit.jupiter.api.Assertions.assertEquals;
2929
import static org.junit.jupiter.api.Assertions.assertFalse;
3030
import static org.junit.jupiter.api.Assertions.assertIterableEquals;

‎driver/src/test/java/org/neo4j/driver/internal/InternalMapAccessorWithDefaultValueTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ private Record createRecord() {
319319
new RelationshipValue(rel),
320320
Values.value(0.1F)
321321
};
322-
Record record = new InternalRecord(keys, values);
323-
return record;
322+
return new InternalRecord(keys, values);
324323
}
325324
}

‎driver/src/test/java/org/neo4j/driver/internal/InternalPathTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static org.junit.jupiter.api.Assertions.assertThrows;
2424

2525
import java.util.Arrays;
26-
import org.hamcrest.MatcherAssert;
2726
import org.junit.jupiter.api.Test;
2827
import org.neo4j.driver.internal.util.Iterables;
2928
import org.neo4j.driver.types.Node;
@@ -70,7 +69,7 @@ void shouldBeAbleToIterateOverPathAsSegments() {
7069
var segments = Iterables.asList(path);
7170

7271
// Then
73-
MatcherAssert.assertThat(
72+
assertThat(
7473
segments,
7574
equalTo(Arrays.asList(
7675
(Path.Segment) new InternalPath.SelfContainedSegment(

‎driver/src/test/java/org/neo4j/driver/internal/InternalResultTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,9 @@ private Result createResult(int numberOfRecords) {
372372
}
373373

374374
private List<Value> values(Record record) {
375-
List<Value> result = record.fields().stream()
375+
return record.fields().stream()
376376
.map(Pair::value)
377377
.collect(Collectors.toCollection(
378378
() -> new ArrayList<>(record.keys().size())));
379-
return result;
380379
}
381380
}

‎driver/src/test/java/org/neo4j/driver/internal/InternalTransactionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static java.util.Collections.singletonList;
2222
import static java.util.Collections.singletonMap;
2323
import static java.util.concurrent.CompletableFuture.completedFuture;
24-
import static org.junit.Assert.assertFalse;
24+
import static org.junit.jupiter.api.Assertions.assertFalse;
2525
import static org.junit.jupiter.api.Assertions.assertThrows;
2626
import static org.mockito.ArgumentMatchers.any;
2727
import static org.mockito.Mockito.mock;

‎driver/src/test/java/org/neo4j/driver/internal/SchemeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
package org.neo4j.driver.internal;
2020

21-
import static org.junit.Assert.assertFalse;
22-
import static org.junit.Assert.assertTrue;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
2322
import static org.junit.jupiter.api.Assertions.assertThrows;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
2424

2525
import org.junit.jupiter.params.ParameterizedTest;
2626
import org.junit.jupiter.params.provider.NullSource;

‎driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncSessionTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import static java.util.concurrent.CompletableFuture.completedFuture;
2424
import static org.hamcrest.CoreMatchers.equalTo;
2525
import static org.hamcrest.CoreMatchers.instanceOf;
26-
import static org.junit.Assert.assertFalse;
27-
import static org.junit.Assert.assertNotNull;
28-
import static org.junit.Assert.assertThat;
26+
import static org.hamcrest.junit.MatcherAssert.assertThat;
2927
import static org.junit.jupiter.api.Assertions.assertEquals;
28+
import static org.junit.jupiter.api.Assertions.assertFalse;
29+
import static org.junit.jupiter.api.Assertions.assertNotNull;
3030
import static org.junit.jupiter.api.Assertions.assertThrows;
3131
import static org.mockito.ArgumentMatchers.any;
3232
import static org.mockito.BDDMockito.given;
@@ -60,7 +60,6 @@
6060
import java.util.function.Function;
6161
import java.util.function.Supplier;
6262
import java.util.stream.Stream;
63-
import org.hamcrest.junit.MatcherAssert;
6463
import org.junit.jupiter.api.BeforeEach;
6564
import org.junit.jupiter.api.Test;
6665
import org.junit.jupiter.params.ParameterizedTest;
@@ -318,7 +317,7 @@ private void testTxIsRetriedUntilFailureWhenFunctionThrows(AccessMode mode) {
318317

319318
var e = assertThrows(Exception.class, () -> executeTransaction(asyncSession, mode, work));
320319

321-
MatcherAssert.assertThat(e, instanceOf(SessionExpiredException.class));
320+
assertThat(e, instanceOf(SessionExpiredException.class));
322321
assertEquals("Oh!", e.getMessage());
323322
verifyInvocationCount(work, failures);
324323
verifyCommitTx(connection, never());
@@ -338,7 +337,7 @@ private void testTxIsRetriedUntilFailureWhenCommitFails(AccessMode mode) {
338337

339338
var e = assertThrows(Exception.class, () -> executeTransaction(asyncSession, mode, work));
340339

341-
MatcherAssert.assertThat(e, instanceOf(ServiceUnavailableException.class));
340+
assertThat(e, instanceOf(ServiceUnavailableException.class));
342341
verifyInvocationCount(work, failures);
343342
verifyCommitTx(connection, times(failures));
344343
}

‎driver/src/test/java/org/neo4j/driver/internal/async/InternalAsyncTransactionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import static java.util.Collections.singletonList;
2222
import static java.util.Collections.singletonMap;
2323
import static java.util.concurrent.CompletableFuture.completedFuture;
24-
import static org.junit.Assert.assertFalse;
2524
import static org.junit.jupiter.api.Assertions.assertEquals;
25+
import static org.junit.jupiter.api.Assertions.assertFalse;
2626
import static org.junit.jupiter.api.Assertions.assertThrows;
2727
import static org.mockito.ArgumentMatchers.any;
2828
import static org.mockito.BDDMockito.given;

‎driver/src/test/java/org/neo4j/driver/internal/async/NetworkSessionTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ void releasesOpenConnectionUsedForRunWhenSessionIsClosed() {
194194
inOrder.verify(connection, atLeastOnce()).release();
195195
}
196196

197-
@SuppressWarnings("deprecation")
198197
@Test
199198
void resetDoesNothingWhenNoTransactionAndNoConnection() {
200199
await(session.resetAsync());

‎driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static java.util.concurrent.CompletableFuture.completedFuture;
2424
import static org.hamcrest.CoreMatchers.containsString;
2525
import static org.hamcrest.CoreMatchers.equalTo;
26-
import static org.junit.Assert.assertThat;
26+
import static org.hamcrest.MatcherAssert.assertThat;
2727
import static org.junit.jupiter.api.Assertions.assertEquals;
2828
import static org.junit.jupiter.api.Assertions.assertNotNull;
2929
import static org.junit.jupiter.api.Assertions.assertThrows;

‎driver/src/test/java/org/neo4j/driver/internal/cursor/AsyncResultCursorOnlyFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import static org.hamcrest.CoreMatchers.containsString;
2222
import static org.hamcrest.CoreMatchers.instanceOf;
23-
import static org.junit.Assert.assertThat;
23+
import static org.hamcrest.MatcherAssert.assertThat;
2424
import static org.junit.jupiter.api.Assertions.assertSame;
2525
import static org.junit.jupiter.api.Assertions.assertThrows;
2626
import static org.mockito.ArgumentMatchers.any;

‎driver/src/test/java/org/neo4j/driver/internal/cursor/ResultCursorFactoryImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.neo4j.driver.internal.cursor;
2020

2121
import static org.hamcrest.CoreMatchers.instanceOf;
22-
import static org.junit.Assert.assertThat;
22+
import static org.hamcrest.MatcherAssert.assertThat;
2323
import static org.junit.jupiter.api.Assertions.assertSame;
2424
import static org.junit.jupiter.api.Assertions.assertThrows;
2525
import static org.mockito.ArgumentMatchers.any;

‎driver/src/test/java/org/neo4j/driver/internal/cursor/RxResultCursorImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
package org.neo4j.driver.internal.cursor;
2020

2121
import static java.util.Arrays.asList;
22-
import static junit.framework.TestCase.assertTrue;
2322
import static org.junit.jupiter.api.Assertions.assertEquals;
2423
import static org.junit.jupiter.api.Assertions.assertFalse;
2524
import static org.junit.jupiter.api.Assertions.assertNull;
2625
import static org.junit.jupiter.api.Assertions.assertSame;
2726
import static org.junit.jupiter.api.Assertions.assertThrows;
27+
import static org.junit.jupiter.api.Assertions.assertTrue;
2828
import static org.mockito.ArgumentMatchers.any;
2929
import static org.mockito.Mockito.mock;
3030
import static org.mockito.Mockito.times;

‎driver/src/test/java/org/neo4j/driver/internal/handlers/RunResponseHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static java.util.Collections.emptyMap;
2424
import static java.util.Collections.singletonMap;
2525
import static org.hamcrest.CoreMatchers.equalTo;
26-
import static org.junit.Assert.assertThat;
26+
import static org.hamcrest.MatcherAssert.assertThat;
2727
import static org.junit.jupiter.api.Assertions.assertEquals;
2828
import static org.junit.jupiter.api.Assertions.assertFalse;
2929
import static org.junit.jupiter.api.Assertions.assertNull;

‎driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandlerTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.neo4j.driver.internal.handlers.pulln;
2020

2121
import static org.hamcrest.CoreMatchers.equalTo;
22-
import static org.junit.Assert.assertThat;
22+
import static org.hamcrest.MatcherAssert.assertThat;
2323
import static org.mockito.ArgumentMatchers.any;
2424
import static org.mockito.ArgumentMatchers.eq;
2525
import static org.mockito.Mockito.mock;

‎driver/src/test/java/org/neo4j/driver/internal/handlers/pulln/SessionPullResponseCompletionListenerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.neo4j.driver.internal.handlers.pulln;
2020

2121
import static org.hamcrest.CoreMatchers.equalTo;
22-
import static org.junit.Assert.assertThat;
22+
import static org.hamcrest.MatcherAssert.assertThat;
2323
import static org.mockito.ArgumentMatchers.any;
2424
import static org.mockito.ArgumentMatchers.eq;
2525
import static org.mockito.Mockito.mock;

0 commit comments

Comments
 (0)