Skip to content

Commit 784230e

Browse files
committed
Bolt refactoring
1 parent 379b93e commit 784230e

File tree

100 files changed

+2745
-5644
lines changed

Some content is hidden

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

100 files changed

+2745
-5644
lines changed

driver/src/main/java/org/neo4j/driver/exceptions/ConnectionReadTimeoutException.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class ConnectionReadTimeoutException extends ServiceUnavailableException
3939
* @deprecated superseded by the {@link ConnectionReadTimeoutException#INSTANCE} value
4040
*/
4141
@Deprecated
42+
@SuppressWarnings("DeprecatedIsStillUsed")
4243
public ConnectionReadTimeoutException(String message) {
4344
super(message);
4445
}

driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public final Driver newInstance(
7272
return newInstance(uri, authTokenManager, clientCertificateManager, config, (SecurityPlan) null, null);
7373
}
7474

75-
@SuppressWarnings("deprecation")
7675
public final Driver newInstance(
7776
URI uri,
7877
AuthTokenManager authTokenManager,

driver/src/main/java/org/neo4j/driver/internal/InternalServerAddress.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public record InternalServerAddress(String host, int port) implements ServerAddr
2828
requireValidPort(port);
2929
}
3030

31-
private static int requireValidPort(int port) {
31+
private static void requireValidPort(int port) {
3232
if (port >= 0 && port <= 65_535) {
33-
return port;
33+
return;
3434
}
3535
throw new IllegalArgumentException("Illegal port: " + port);
3636
}
@@ -64,6 +64,7 @@ private static RuntimeException invalidAddressFormat(String address) {
6464
return new IllegalArgumentException("Invalid address format `" + address + "`");
6565
}
6666

67+
@SuppressWarnings("DuplicatedCode")
6768
private static URI uriFrom(String address) {
6869
String scheme;
6970
String hostPort;

driver/src/main/java/org/neo4j/driver/internal/SessionFactoryImpl.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,6 @@ public CompletionStage<Boolean> supportsSessionAuth() {
161161
.thenCompose(tuple -> connectionProvider.supportsSessionAuth(tuple.securityPlan(), tuple.authToken()));
162162
}
163163

164-
/**
165-
* Get the underlying connection provider.
166-
* <p>
167-
* <b>This method is only for testing</b>
168-
*
169-
* @return the connection provider used by this factory.
170-
*/
171-
// public ConnectionProvider getConnectionProvider() {
172-
// return connectionProvider;
173-
// }
174164
private NetworkSession createSession(
175165
SecurityPlanManager securityPlanManager,
176166
BoltConnectionProvider connectionProvider,

driver/src/main/java/org/neo4j/driver/internal/async/BoltConnectionWithAuthTokenManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ public void onTelemetrySummary(TelemetrySummary summary) {
233233
handler.onTelemetrySummary(summary);
234234
}
235235

236+
@Override
237+
public void onIgnored() {
238+
handler.onIgnored();
239+
}
240+
236241
@Override
237242
public void onComplete() {
238243
handler.onComplete();

driver/src/main/java/org/neo4j/driver/internal/async/ConnectionContext.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,14 @@
1818

1919
import java.util.Set;
2020
import java.util.concurrent.CompletableFuture;
21-
import org.neo4j.driver.AccessMode;
2221
import org.neo4j.driver.AuthToken;
2322
import org.neo4j.driver.Bookmark;
2423
import org.neo4j.driver.internal.bolt.api.DatabaseName;
2524

26-
/**
27-
* Describes what kind of connection to return by {@link ConnectionProvider}
28-
*/
2925
public interface ConnectionContext {
3026

3127
CompletableFuture<DatabaseName> databaseNameFuture();
3228

33-
AccessMode mode();
34-
3529
Set<Bookmark> rediscoveryBookmarks();
3630

3731
String impersonatedUser();

driver/src/main/java/org/neo4j/driver/internal/async/ImmutableConnectionContext.java

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

driver/src/main/java/org/neo4j/driver/internal/async/LeakLoggingNetworkSession.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.neo4j.driver.internal.bolt.api.DatabaseName;
3333
import org.neo4j.driver.internal.retry.RetryLogic;
3434
import org.neo4j.driver.internal.security.SecurityPlanManager;
35+
import org.neo4j.driver.internal.util.Futures;
3536

3637
public class LeakLoggingNetworkSession extends NetworkSession {
3738
private final String stackTrace;
@@ -79,16 +80,15 @@ protected void finalize() throws Throwable {
7980
}
8081

8182
private void logLeakIfNeeded() {
82-
// var isOpen = Futures.blockingGet(currentConnectionIsOpen());
83-
// if (isOpen) {
84-
// log.error(
85-
// "Neo4j Session object leaked, please ensure that your application "
86-
// + "fully consumes results in Sessions or explicitly calls `close` on Sessions
87-
// before disposing of the objects.\n"
88-
// + "Session was create at:\n"
89-
// + stackTrace,
90-
// null);
91-
// }
83+
var isOpen = Futures.blockingGet(currentConnectionIsOpen());
84+
if (isOpen) {
85+
log.error(
86+
"Neo4j Session object leaked, please ensure that your application "
87+
+ "fully consumes results in Sessions or explicitly calls `close` on Sessions before disposing of the objects.\n"
88+
+ "Session was create at:\n"
89+
+ stackTrace,
90+
null);
91+
}
9292
}
9393

9494
private static String captureStackTrace() {

0 commit comments

Comments
 (0)