Skip to content

Commit 80fd687

Browse files
injectivesinjectives
authored
Refactoring (#1474)
1 parent f3984a2 commit 80fd687

File tree

67 files changed

+170
-42
lines changed

Some content is hidden

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

67 files changed

+170
-42
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* @deprecated superseded by {@link TransactionCallback}.
2727
*/
2828
@Deprecated
29+
@SuppressWarnings("DeprecatedIsStillUsed")
2930
public interface TransactionWork<T> {
3031
/**
3132
* Executes all given operations against the same transaction.

‎driver/src/main/java/org/neo4j/driver/async/AsyncTransactionWork.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* @deprecated superseded by {@link AsyncTransactionCallback}.
2828
*/
2929
@Deprecated
30+
@SuppressWarnings("DeprecatedIsStillUsed")
3031
public interface AsyncTransactionWork<T> {
3132
/**
3233
* Executes all given operations against the same transaction.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ private CompletionStage<ClusterComposition> lookupOnRouter(
310310
});
311311
}
312312

313+
@SuppressWarnings("ThrowableNotThrown")
313314
private ClusterComposition handleRoutingProcedureError(
314315
Throwable error, RoutingTable routingTable, BoltServerAddress routerAddress, Throwable baseError) {
315316
if (mustAbortDiscovery(error)) {

‎driver/src/main/java/org/neo4j/driver/internal/handlers/RunResponseHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public void onSuccess(Map<String, Value> metadata) {
6161
}
6262

6363
@Override
64+
@SuppressWarnings("ThrowableNotThrown")
6465
public void onFailure(Throwable error) {
6566
if (tx != null) {
6667
tx.markTerminated(error);

‎driver/src/main/java/org/neo4j/driver/internal/handlers/TransactionPullResponseCompletionListener.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public TransactionPullResponseCompletionListener(UnmanagedTransaction tx) {
3535
public void afterSuccess(Map<String, Value> metadata) {}
3636

3737
@Override
38+
@SuppressWarnings("ThrowableNotThrown")
3839
public void afterFailure(Throwable error) {
3940
// always mark transaction as terminated because every error is "acknowledged" with a RESET message
4041
// so database forgets about the transaction after the first error

‎driver/src/main/java/org/neo4j/driver/internal/messaging/common/CommonValuePacker.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ private void packLocalDateTime(LocalDateTime localDateTime) throws IOException {
173173
packer.pack(nano);
174174
}
175175

176+
@SuppressWarnings("DuplicatedCode")
176177
private void packZonedDateTimeUsingUtcBaseline(ZonedDateTime zonedDateTime) throws IOException {
177178
var instant = zonedDateTime.toInstant();
178179
var epochSecondLocal = instant.getEpochSecond();
@@ -196,6 +197,7 @@ private void packZonedDateTimeUsingUtcBaseline(ZonedDateTime zonedDateTime) thro
196197
}
197198
}
198199

200+
@SuppressWarnings("DuplicatedCode")
199201
private void packZonedDateTime(ZonedDateTime zonedDateTime) throws IOException {
200202
var epochSecondLocal = zonedDateTime.toLocalDateTime().toEpochSecond(UTC);
201203
var nano = zonedDateTime.getNano();

‎driver/src/main/java/org/neo4j/driver/internal/messaging/common/CommonValueUnpacker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ protected Value unpackRelationship() throws IOException {
277277
return new RelationshipValue(adapted);
278278
}
279279

280+
@SuppressWarnings("DuplicatedCode")
280281
protected InternalNode unpackNode() throws IOException {
281282
var urn = unpacker.unpackLong();
282283

@@ -295,7 +296,7 @@ protected InternalNode unpackNode() throws IOException {
295296
return new InternalNode(urn, String.valueOf(urn), labels, props);
296297
}
297298

298-
@SuppressWarnings("deprecation")
299+
@SuppressWarnings({"deprecation", "DuplicatedCode"})
299300
protected Value unpackPath() throws IOException {
300301
// List of unique nodes
301302
var uniqNodes = new Node[(int) unpacker.unpackListHeader()];

‎driver/src/main/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public MessageWriterV4(PackOutput output) {
4848
super(new CommonValuePacker(output, false), buildEncoders());
4949
}
5050

51+
@SuppressWarnings("DuplicatedCode")
5152
private static Map<Byte, MessageEncoder> buildEncoders() {
5253
Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
5354
result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

‎driver/src/main/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public MessageWriterV43(PackOutput output, boolean dateTimeUtcEnabled) {
5656
super(new CommonValuePacker(output, dateTimeUtcEnabled), buildEncoders());
5757
}
5858

59+
@SuppressWarnings("DuplicatedCode")
5960
private static Map<Byte, MessageEncoder> buildEncoders() {
6061
Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
6162
result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

‎driver/src/main/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public MessageWriterV44(PackOutput output, boolean dateTimeUtcEnabled) {
5353
super(new CommonValuePacker(output, dateTimeUtcEnabled), buildEncoders());
5454
}
5555

56+
@SuppressWarnings("DuplicatedCode")
5657
private static Map<Byte, MessageEncoder> buildEncoders() {
5758
Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
5859
result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

‎driver/src/main/java/org/neo4j/driver/internal/messaging/v5/MessageWriterV5.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public MessageWriterV5(PackOutput output) {
5050
super(new CommonValuePacker(output, true), buildEncoders());
5151
}
5252

53+
@SuppressWarnings("DuplicatedCode")
5354
private static Map<Byte, MessageEncoder> buildEncoders() {
5455
Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
5556
result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

‎driver/src/main/java/org/neo4j/driver/internal/messaging/v5/ValueUnpackerV5.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ protected int getRelationshipFields() {
5555
return RELATIONSHIP_FIELDS;
5656
}
5757

58+
@SuppressWarnings("DuplicatedCode")
5859
@Override
5960
protected InternalNode unpackNode() throws IOException {
6061
var urn = unpacker.unpackLong();
@@ -76,6 +77,7 @@ protected InternalNode unpackNode() throws IOException {
7677
return new InternalNode(urn, elementId, labels, props);
7778
}
7879

80+
@SuppressWarnings("DuplicatedCode")
7981
@Override
8082
protected Value unpackPath() throws IOException {
8183
// List of unique nodes

‎driver/src/main/java/org/neo4j/driver/internal/messaging/v51/MessageWriterV51.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public MessageWriterV51(PackOutput output) {
5454
super(new CommonValuePacker(output, true), buildEncoders());
5555
}
5656

57+
@SuppressWarnings("DuplicatedCode")
5758
private static Map<Byte, MessageEncoder> buildEncoders() {
5859
Map<Byte, MessageEncoder> result = Iterables.newHashMapWithSize(9);
5960
result.put(HelloMessage.SIGNATURE, new HelloMessageEncoder());

‎driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ public void packBytesHeader(int size) throws IOException {
346346
}
347347
}
348348

349+
@SuppressWarnings("DuplicatedCode")
349350
private void packStringHeader(int size) throws IOException {
350351
if (size < 0x10) {
351352
out.writeByte((byte) (TINY_STRING | size));
@@ -358,6 +359,7 @@ private void packStringHeader(int size) throws IOException {
358359
}
359360
}
360361

362+
@SuppressWarnings("DuplicatedCode")
361363
public void packListHeader(int size) throws IOException {
362364
if (size < 0x10) {
363365
out.writeByte((byte) (TINY_LIST | size));
@@ -370,6 +372,7 @@ public void packListHeader(int size) throws IOException {
370372
}
371373
}
372374

375+
@SuppressWarnings("DuplicatedCode")
373376
public void packMapHeader(int size) throws IOException {
374377
if (size < 0x10) {
375378
out.writeByte((byte) (TINY_MAP | size));

‎driver/src/main/java/org/neo4j/driver/internal/reactive/AbstractReactiveSession.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Publisher<S> doBeginTransaction(TransactionConfig config) {
6262
return doBeginTransaction(config, null);
6363
}
6464

65+
@SuppressWarnings("DuplicatedCode")
6566
protected Publisher<S> doBeginTransaction(TransactionConfig config, String txType) {
6667
return createSingleItemPublisher(
6768
() -> {
@@ -80,6 +81,7 @@ protected Publisher<S> doBeginTransaction(TransactionConfig config, String txTyp
8081
tx -> Mono.fromDirect(closeTransaction(tx, false)).subscribe());
8182
}
8283

84+
@SuppressWarnings("DuplicatedCode")
8385
private Publisher<S> beginTransaction(AccessMode mode, TransactionConfig config) {
8486
return createSingleItemPublisher(
8587
() -> {
@@ -101,21 +103,24 @@ private Publisher<S> beginTransaction(AccessMode mode, TransactionConfig config)
101103
@SuppressWarnings("deprecation")
102104
protected <T> Publisher<T> runTransaction(
103105
AccessMode mode, Function<S, ? extends Publisher<T>> work, TransactionConfig config) {
104-
work = work.andThen(publisher -> Flux.from(publisher).map(value -> {
106+
work = work.andThen(publisher -> Flux.from(publisher).handle((value, sink) -> {
105107
if (value instanceof ReactiveResult) {
106-
throw new ClientException(String.format(
108+
sink.error(new ClientException(String.format(
107109
"%s is not a valid return value, it should be consumed before producing a return value",
108-
ReactiveResult.class.getName()));
110+
ReactiveResult.class.getName())));
111+
return;
109112
} else if (value instanceof org.neo4j.driver.reactive.ReactiveResult) {
110-
throw new ClientException(String.format(
113+
sink.error(new ClientException(String.format(
111114
"%s is not a valid return value, it should be consumed before producing a return value",
112-
org.neo4j.driver.reactive.ReactiveResult.class.getName()));
115+
org.neo4j.driver.reactive.ReactiveResult.class.getName())));
116+
return;
113117
} else if (value instanceof RxResult) {
114-
throw new ClientException(String.format(
118+
sink.error(new ClientException(String.format(
115119
"%s is not a valid return value, it should be consumed before producing a return value",
116-
RxResult.class.getName()));
120+
RxResult.class.getName())));
121+
return;
117122
}
118-
return value;
123+
sink.next(value);
119124
}));
120125
var repeatableWork = Flux.usingWhen(
121126
beginTransaction(mode, config),

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalReactiveTransaction.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ protected InternalReactiveTransaction(UnmanagedTransaction tx) {
3737
}
3838

3939
@Override
40+
@SuppressWarnings({"ThrowableNotThrown", "DuplicatedCode"})
4041
public Publisher<ReactiveResult> run(Query query) {
4142
CompletionStage<RxResultCursor> cursorStage;
4243
try {

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxResult.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import reactor.core.publisher.Mono;
3737

3838
@Deprecated
39+
@SuppressWarnings("DeprecatedIsStillUsed")
3940
public class InternalRxResult implements RxResult {
4041
private Supplier<CompletionStage<RxResultCursor>> cursorFutureSupplier;
4142
private volatile CompletionStage<RxResultCursor> cursorFuture;

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxSession.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.reactivestreams.Publisher;
3838

3939
@Deprecated
40+
@SuppressWarnings("DeprecatedIsStillUsed")
4041
public class InternalRxSession extends AbstractReactiveSession<RxTransaction> implements RxSession {
4142
public InternalRxSession(NetworkSession session) {
4243
super(session);

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxTransaction.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
import org.reactivestreams.Publisher;
2929

3030
@Deprecated
31+
@SuppressWarnings("DeprecatedIsStillUsed")
3132
public class InternalRxTransaction extends AbstractReactiveTransaction implements RxTransaction {
3233
public InternalRxTransaction(UnmanagedTransaction tx) {
3334
super(tx);
3435
}
3536

3637
@Override
38+
@SuppressWarnings("ThrowableNotThrown")
3739
public RxResult run(Query query) {
3840
return new InternalRxResult(() -> {
3941
var cursorFuture = new CompletableFuture<RxResultCursor>();

‎driver/src/main/java/org/neo4j/driver/internal/reactivestreams/InternalReactiveTransaction.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ protected InternalReactiveTransaction(UnmanagedTransaction tx) {
3636
}
3737

3838
@Override
39+
@SuppressWarnings({"ThrowableNotThrown", "DuplicatedCode"})
3940
public Publisher<ReactiveResult> run(Query query) {
4041
CompletionStage<RxResultCursor> cursorStage;
4142
try {

‎driver/src/main/java/org/neo4j/driver/reactive/RxTransactionWork.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* @deprecated superseded by {@link org.neo4j.driver.reactive.ReactiveTransactionCallback} and {@link org.neo4j.driver.reactivestreams.ReactiveTransactionCallback}
2828
*/
2929
@Deprecated
30+
@SuppressWarnings("DeprecatedIsStillUsed")
3031
public interface RxTransactionWork<T> {
3132
/**
3233
* Executes all given operations against the same transaction.

‎driver/src/main/java/org/neo4j/driver/types/Relationship.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public interface Relationship extends Entity {
3232
* @deprecated superseded by {@link #startNodeElementId()}
3333
*/
3434
@Deprecated
35+
@SuppressWarnings("DeprecatedIsStillUsed")
3536
long startNodeId();
3637

3738
/**
@@ -50,6 +51,7 @@ public interface Relationship extends Entity {
5051
* @deprecated superseded by {@link #endNodeElementId()}
5152
*/
5253
@Deprecated
54+
@SuppressWarnings("DeprecatedIsStillUsed")
5355
long endNodeId();
5456

5557
/**

0 commit comments

Comments
 (0)