Skip to content

Commit 4e8e35c

Browse files
injectivesinjectives
committed
Remove unused declarations
This also enables the `MetricsIT.driverMetricsUpdatedWithDriverUse` test.
1 parent 027cb90 commit 4e8e35c

File tree

59 files changed

+132
-934
lines changed

Some content is hidden

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

59 files changed

+132
-934
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/NoOpBookmarkManager.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,4 @@ public void updateBookmarks(Set<Bookmark> previousBookmarks, Set<Bookmark> newBo
4646
public Set<Bookmark> getBookmarks() {
4747
return EMPTY;
4848
}
49-
50-
private Set<Bookmark> getAllBookmarks() {
51-
return EMPTY;
52-
}
5349
}

‎driver/src/main/java/org/neo4j/driver/internal/async/NetworkSession.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
package org.neo4j.driver.internal.async;
2020

2121
import static java.util.concurrent.CompletableFuture.completedFuture;
22-
import static org.neo4j.driver.internal.async.ConnectionContext.PENDING_DATABASE_NAME_EXCEPTION_SUPPLIER;
2322
import static org.neo4j.driver.internal.util.Futures.completedWithNull;
2423

2524
import java.util.Collections;
2625
import java.util.HashSet;
2726
import java.util.Objects;
28-
import java.util.Optional;
2927
import java.util.Set;
3028
import java.util.concurrent.CompletableFuture;
3129
import java.util.concurrent.CompletionException;
@@ -58,11 +56,6 @@
5856
import org.neo4j.driver.internal.util.Futures;
5957

6058
public class NetworkSession {
61-
/**
62-
* Fallback database name used by the driver when session has no database name configured and database discovery is unavailable.
63-
*/
64-
String FALLBACK_DATABASE_NAME = "";
65-
6659
private final ConnectionProvider connectionProvider;
6760
private final NetworkSessionConnectionContext connectionContext;
6861
private final AccessMode mode;
@@ -393,12 +386,6 @@ private void assertDatabaseNameFutureIsDone() {
393386
}
394387
}
395388

396-
private Optional<String> getDatabaseNameNow() {
397-
return Futures.joinNowOrElseThrow(
398-
connectionContext.databaseNameFuture(), PENDING_DATABASE_NAME_EXCEPTION_SUPPLIER)
399-
.databaseName();
400-
}
401-
402389
/**
403390
* The {@link NetworkSessionConnectionContext#mode} can be mutable for a session connection context
404391
*/

‎driver/src/main/java/org/neo4j/driver/internal/async/connection/AuthorizationStateListener.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,12 @@
1818
*/
1919
package org.neo4j.driver.internal.async.connection;
2020

21-
import io.netty.channel.Channel;
22-
import org.neo4j.driver.exceptions.AuthorizationExpiredException;
23-
2421
/**
2522
* Listener for authorization info state maintained on the server side.
2623
*/
2724
public interface AuthorizationStateListener {
2825
/**
2926
* Notifies the listener that the credentials stored on the server side have expired.
30-
*
31-
* @param e the {@link AuthorizationExpiredException} exception.
32-
* @param channel the channel that received the error.
3327
*/
34-
void onExpired(AuthorizationExpiredException e, Channel channel);
28+
void onExpired();
3529
}

‎driver/src/main/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public void handleFailureMessage(String code, String message) {
120120
}
121121

122122
var currentError = this.currentError;
123-
if (currentError instanceof AuthorizationExpiredException authorizationExpiredException) {
124-
authorizationStateListener(channel).onExpired(authorizationExpiredException, channel);
123+
if (currentError instanceof AuthorizationExpiredException) {
124+
authorizationStateListener(channel).onExpired();
125125
} else if (currentError instanceof TokenExpiredException tokenExpiredException) {
126126
var authContext = authContext(channel);
127127
var authTokenProvider = authContext.getAuthTokenManager();

‎driver/src/main/java/org/neo4j/driver/internal/async/pool/ConnectionPoolImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,7 @@ public int inUseConnections(ServerAddress address) {
174174
return nettyChannelTracker.inUseChannelCount(address);
175175
}
176176

177-
@Override
178-
public int idleConnections(ServerAddress address) {
177+
private int idleConnections(ServerAddress address) {
179178
return nettyChannelTracker.idleChannelCount(address);
180179
}
181180

‎driver/src/main/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthChecker.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import java.util.concurrent.atomic.AtomicLong;
3434
import org.neo4j.driver.Logger;
3535
import org.neo4j.driver.Logging;
36-
import org.neo4j.driver.exceptions.AuthorizationExpiredException;
3736
import org.neo4j.driver.internal.async.connection.AuthorizationStateListener;
3837
import org.neo4j.driver.internal.handlers.PingResponseHandler;
3938
import org.neo4j.driver.internal.messaging.request.ResetMessage;
@@ -124,7 +123,7 @@ private boolean isAuthExpiredByFailure(Channel channel) {
124123
}
125124

126125
@Override
127-
public void onExpired(AuthorizationExpiredException e, Channel channel) {
126+
public void onExpired() {
128127
var now = clock.millis();
129128
minAuthTimestamp.getAndUpdate(prev -> Math.max(prev, now));
130129
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ public class RoutingSettings {
2626
private final RoutingContext routingContext;
2727
private final long routingTablePurgeDelayMs;
2828

29-
public RoutingSettings(long routingTablePurgeDelayMs) {
30-
this(routingTablePurgeDelayMs, RoutingContext.EMPTY);
31-
}
32-
3329
public RoutingSettings(long routingTablePurgeDelayMs, RoutingContext routingContext) {
3430
this.routingContext = routingContext;
3531
this.routingTablePurgeDelayMs = routingTablePurgeDelayMs;

‎driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,6 @@ private static RoutingTableRegistry createRoutingTables(
264264
connectionPool, rediscovery, clock, logging, settings.routingTablePurgeDelayMs());
265265
}
266266

267-
private static RuntimeException unknownMode(AccessMode mode) {
268-
return new IllegalArgumentException("Mode '" + mode + "' is not supported");
269-
}
270-
271267
/**
272268
* <b>This method is only for testing</b>
273269
*/

‎driver/src/main/java/org/neo4j/driver/internal/handlers/pulln/BasicPullResponseHandler.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void onFailure(Throwable error) {
128128
ResultSummary summary;
129129
synchronized (this) {
130130
assertRecordAndSummaryConsumerInstalled();
131-
state.onFailure(this, error);
131+
state.onFailure(this);
132132
completionListener.afterFailure(error);
133133
summary = extractResultSummary(emptyMap());
134134
recordConsumer = this.recordConsumer;
@@ -149,7 +149,7 @@ public void onRecord(Value[] fields) {
149149
Record record = null;
150150
synchronized (this) {
151151
assertRecordAndSummaryConsumerInstalled();
152-
state.onRecord(this, fields);
152+
state.onRecord(this);
153153
newState = state;
154154
if (newState == State.STREAMING_STATE) {
155155
record = new InternalRecord(runResponseHandler.queryKeys(), fields);
@@ -294,12 +294,12 @@ void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata) {
294294
}
295295

296296
@Override
297-
void onFailure(BasicPullResponseHandler context, Throwable error) {
297+
void onFailure(BasicPullResponseHandler context) {
298298
context.state(FAILURE_STATE);
299299
}
300300

301301
@Override
302-
void onRecord(BasicPullResponseHandler context, Value[] fields) {
302+
void onRecord(BasicPullResponseHandler context) {
303303
context.state(READY_STATE);
304304
}
305305

@@ -326,12 +326,12 @@ void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata) {
326326
}
327327

328328
@Override
329-
void onFailure(BasicPullResponseHandler context, Throwable error) {
329+
void onFailure(BasicPullResponseHandler context) {
330330
context.state(FAILURE_STATE);
331331
}
332332

333333
@Override
334-
void onRecord(BasicPullResponseHandler context, Value[] fields) {
334+
void onRecord(BasicPullResponseHandler context) {
335335
context.state(STREAMING_STATE);
336336
}
337337

@@ -360,12 +360,12 @@ void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata) {
360360
}
361361

362362
@Override
363-
void onFailure(BasicPullResponseHandler context, Throwable error) {
363+
void onFailure(BasicPullResponseHandler context) {
364364
context.state(FAILURE_STATE);
365365
}
366366

367367
@Override
368-
void onRecord(BasicPullResponseHandler context, Value[] fields) {
368+
void onRecord(BasicPullResponseHandler context) {
369369
context.state(CANCELLED_STATE);
370370
}
371371

@@ -388,12 +388,12 @@ void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata) {
388388
}
389389

390390
@Override
391-
void onFailure(BasicPullResponseHandler context, Throwable error) {
391+
void onFailure(BasicPullResponseHandler context) {
392392
context.state(FAILURE_STATE);
393393
}
394394

395395
@Override
396-
void onRecord(BasicPullResponseHandler context, Value[] fields) {
396+
void onRecord(BasicPullResponseHandler context) {
397397
context.state(SUCCEEDED_STATE);
398398
}
399399

@@ -416,12 +416,12 @@ void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata) {
416416
}
417417

418418
@Override
419-
void onFailure(BasicPullResponseHandler context, Throwable error) {
419+
void onFailure(BasicPullResponseHandler context) {
420420
context.state(FAILURE_STATE);
421421
}
422422

423423
@Override
424-
void onRecord(BasicPullResponseHandler context, Value[] fields) {
424+
void onRecord(BasicPullResponseHandler context) {
425425
context.state(FAILURE_STATE);
426426
}
427427

@@ -440,9 +440,9 @@ Runnable cancel(BasicPullResponseHandler context) {
440440

441441
abstract void onSuccess(BasicPullResponseHandler context, Map<String, Value> metadata);
442442

443-
abstract void onFailure(BasicPullResponseHandler context, Throwable error);
443+
abstract void onFailure(BasicPullResponseHandler context);
444444

445-
abstract void onRecord(BasicPullResponseHandler context, Value[] fields);
445+
abstract void onRecord(BasicPullResponseHandler context);
446446

447447
abstract Runnable request(BasicPullResponseHandler context, long n);
448448

‎driver/src/main/java/org/neo4j/driver/internal/metrics/DevNullListenerEvent.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,4 @@ enum DevNullListenerEvent implements ListenerEvent<Long> {
2323

2424
@Override
2525
public void start() {}
26-
27-
@Override
28-
public Long getSample() {
29-
return 0L;
30-
}
3126
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/InternalConnectionPoolMetrics.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.neo4j.driver.net.ServerAddress;
2929

3030
final class InternalConnectionPoolMetrics implements ConnectionPoolMetrics, ConnectionPoolMetricsListener {
31-
private final ServerAddress address;
3231
private final IntSupplier inUseSupplier;
3332
private final IntSupplier idleSupplier;
3433

@@ -58,7 +57,6 @@ final class InternalConnectionPoolMetrics implements ConnectionPoolMetrics, Conn
5857
Objects.requireNonNull(idleSupplier);
5958

6059
this.id = poolId;
61-
this.address = address;
6260
this.inUseSupplier = inUseSupplier;
6361
this.idleSupplier = idleSupplier;
6462
}
@@ -217,9 +215,4 @@ public String toString() {
217215
totalInUseTime(),
218216
totalInUseCount());
219217
}
220-
221-
// This method is for testing purposes only
222-
public ServerAddress getAddress() {
223-
return address;
224-
}
225218
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/ListenerEvent.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,4 @@
2020

2121
public interface ListenerEvent<T> {
2222
void start();
23-
24-
T getSample();
2523
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/MicrometerTimerListenerEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public void start() {
3434
this.sample = Timer.start(this.meterRegistry);
3535
}
3636

37-
@Override
3837
public Timer.Sample getSample() {
3938
return this.sample;
4039
}

‎driver/src/main/java/org/neo4j/driver/internal/metrics/TimeRecorderListenerEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public void start() {
3333
startTime = clock.millis();
3434
}
3535

36-
@Override
3736
public Long getSample() {
3837
return clock.millis() - startTime;
3938
}

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)