Skip to content

Commit ae29b49

Browse files
lutovichlutovich
committed
Better class names and packages
Commit removes `Async` prefix from couple class names and moves some interfaces and classes to more suitable packages.
1 parent a8170e4 commit ae29b49

File tree

58 files changed

+327
-320
lines changed

Some content is hidden

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

58 files changed

+327
-320
lines changed

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

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

2121
import java.util.concurrent.CompletionStage;
2222

23-
import org.neo4j.driver.internal.async.AsyncConnection;
2423
import org.neo4j.driver.internal.async.BoltServerAddress;
25-
import org.neo4j.driver.internal.async.pool.AsyncConnectionPool;
24+
import org.neo4j.driver.internal.spi.Connection;
25+
import org.neo4j.driver.internal.spi.ConnectionPool;
2626
import org.neo4j.driver.internal.spi.ConnectionProvider;
2727
import org.neo4j.driver.v1.AccessMode;
2828

@@ -35,24 +35,24 @@
3535
public class DirectConnectionProvider implements ConnectionProvider
3636
{
3737
private final BoltServerAddress address;
38-
private final AsyncConnectionPool connectionPool;
38+
private final ConnectionPool connectionPool;
3939

40-
DirectConnectionProvider( BoltServerAddress address, AsyncConnectionPool connectionPool )
40+
DirectConnectionProvider( BoltServerAddress address, ConnectionPool connectionPool )
4141
{
4242
this.address = address;
4343
this.connectionPool = connectionPool;
4444
}
4545

4646
@Override
47-
public CompletionStage<AsyncConnection> acquireConnection( AccessMode mode )
47+
public CompletionStage<Connection> acquireConnection( AccessMode mode )
4848
{
4949
return connectionPool.acquire( address );
5050
}
5151

5252
@Override
5353
public CompletionStage<Void> verifyConnectivity()
5454
{
55-
return acquireConnection( READ ).thenCompose( AsyncConnection::forceRelease );
55+
return acquireConnection( READ ).thenCompose( Connection::forceRelease );
5656
}
5757

5858
@Override

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@
2525
import java.net.URI;
2626
import java.security.GeneralSecurityException;
2727

28-
import org.neo4j.driver.internal.async.AsyncConnector;
29-
import org.neo4j.driver.internal.async.AsyncConnectorImpl;
3028
import org.neo4j.driver.internal.async.BoltServerAddress;
3129
import org.neo4j.driver.internal.async.BootstrapFactory;
32-
import org.neo4j.driver.internal.async.Futures;
33-
import org.neo4j.driver.internal.async.pool.AsyncConnectionPool;
34-
import org.neo4j.driver.internal.async.pool.AsyncConnectionPoolImpl;
30+
import org.neo4j.driver.internal.async.ChannelConnector;
31+
import org.neo4j.driver.internal.async.ChannelConnectorImpl;
32+
import org.neo4j.driver.internal.async.pool.ConnectionPoolImpl;
3533
import org.neo4j.driver.internal.async.pool.PoolSettings;
3634
import org.neo4j.driver.internal.cluster.RoutingContext;
3735
import org.neo4j.driver.internal.cluster.RoutingSettings;
@@ -43,8 +41,10 @@
4341
import org.neo4j.driver.internal.retry.RetryLogic;
4442
import org.neo4j.driver.internal.retry.RetrySettings;
4543
import org.neo4j.driver.internal.security.SecurityPlan;
44+
import org.neo4j.driver.internal.spi.ConnectionPool;
4645
import org.neo4j.driver.internal.spi.ConnectionProvider;
4746
import org.neo4j.driver.internal.util.Clock;
47+
import org.neo4j.driver.internal.util.Futures;
4848
import org.neo4j.driver.v1.AuthToken;
4949
import org.neo4j.driver.v1.AuthTokens;
5050
import org.neo4j.driver.v1.Config;
@@ -74,7 +74,7 @@ public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings r
7474
EventExecutorGroup eventExecutorGroup = bootstrap.config().group();
7575
RetryLogic retryLogic = createRetryLogic( retrySettings, eventExecutorGroup, config.logging() );
7676

77-
AsyncConnectionPool connectionPool = createConnectionPool( authToken, securityPlan, bootstrap, config );
77+
ConnectionPool connectionPool = createConnectionPool( authToken, securityPlan, bootstrap, config );
7878

7979
try
8080
{
@@ -98,27 +98,27 @@ public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings r
9898
}
9999
}
100100

101-
protected AsyncConnectionPool createConnectionPool( AuthToken authToken, SecurityPlan securityPlan,
101+
protected ConnectionPool createConnectionPool( AuthToken authToken, SecurityPlan securityPlan,
102102
Bootstrap bootstrap, Config config )
103103
{
104104
Clock clock = createClock();
105105
ConnectionSettings settings = new ConnectionSettings( authToken, config.connectionTimeoutMillis() );
106-
AsyncConnector connector = createConnector( settings, securityPlan, config, clock );
106+
ChannelConnector connector = createConnector( settings, securityPlan, config, clock );
107107
PoolSettings poolSettings = new PoolSettings( config.maxIdleConnectionPoolSize(),
108108
config.idleTimeBeforeConnectionTest(), config.maxConnectionLifetimeMillis(),
109109
config.maxConnectionPoolSize(),
110110
config.connectionAcquisitionTimeoutMillis() );
111-
return new AsyncConnectionPoolImpl( connector, bootstrap, poolSettings, config.logging(), clock );
111+
return new ConnectionPoolImpl( connector, bootstrap, poolSettings, config.logging(), clock );
112112
}
113113

114-
protected AsyncConnector createConnector( ConnectionSettings settings, SecurityPlan securityPlan,
114+
protected ChannelConnector createConnector( ConnectionSettings settings, SecurityPlan securityPlan,
115115
Config config, Clock clock )
116116
{
117-
return new AsyncConnectorImpl( settings, securityPlan, config.logging(), clock );
117+
return new ChannelConnectorImpl( settings, securityPlan, config.logging(), clock );
118118
}
119119

120120
private InternalDriver createDriver( URI uri, BoltServerAddress address,
121-
AsyncConnectionPool connectionPool, Config config, RoutingSettings routingSettings,
121+
ConnectionPool connectionPool, Config config, RoutingSettings routingSettings,
122122
EventExecutorGroup eventExecutorGroup, SecurityPlan securityPlan, RetryLogic retryLogic )
123123
{
124124
String scheme = uri.getScheme().toLowerCase();
@@ -141,7 +141,7 @@ private InternalDriver createDriver( URI uri, BoltServerAddress address,
141141
* <b>This method is protected only for testing</b>
142142
*/
143143
protected InternalDriver createDirectDriver( BoltServerAddress address, Config config,
144-
SecurityPlan securityPlan, RetryLogic retryLogic, AsyncConnectionPool connectionPool )
144+
SecurityPlan securityPlan, RetryLogic retryLogic, ConnectionPool connectionPool )
145145
{
146146
ConnectionProvider connectionProvider =
147147
new DirectConnectionProvider( address, connectionPool );
@@ -155,7 +155,7 @@ protected InternalDriver createDirectDriver( BoltServerAddress address, Config c
155155
* <p>
156156
* <b>This method is protected only for testing</b>
157157
*/
158-
protected InternalDriver createRoutingDriver( BoltServerAddress address, AsyncConnectionPool connectionPool,
158+
protected InternalDriver createRoutingDriver( BoltServerAddress address, ConnectionPool connectionPool,
159159
Config config, RoutingSettings routingSettings, SecurityPlan securityPlan, RetryLogic retryLogic,
160160
EventExecutorGroup eventExecutorGroup )
161161
{
@@ -184,7 +184,7 @@ protected InternalDriver createDriver( Config config, SecurityPlan securityPlan,
184184
* <p>
185185
* <b>This method is protected only for testing</b>
186186
*/
187-
protected LoadBalancer createLoadBalancer( BoltServerAddress address, AsyncConnectionPool connectionPool,
187+
protected LoadBalancer createLoadBalancer( BoltServerAddress address, ConnectionPool connectionPool,
188188
EventExecutorGroup eventExecutorGroup, Config config, RoutingSettings routingSettings )
189189
{
190190
LoadBalancingStrategy loadBalancingStrategy = createLoadBalancingStrategy( config, connectionPool );
@@ -193,7 +193,7 @@ protected LoadBalancer createLoadBalancer( BoltServerAddress address, AsyncConne
193193
}
194194

195195
private static LoadBalancingStrategy createLoadBalancingStrategy( Config config,
196-
AsyncConnectionPool connectionPool )
196+
ConnectionPool connectionPool )
197197
{
198198
switch ( config.loadBalancingStrategy() )
199199
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import java.util.concurrent.CompletionStage;
2424
import java.util.function.BiConsumer;
2525

26-
import org.neo4j.driver.internal.async.AsyncConnection;
2726
import org.neo4j.driver.internal.async.QueryRunner;
2827
import org.neo4j.driver.internal.handlers.BeginTxResponseHandler;
2928
import org.neo4j.driver.internal.handlers.CommitTxResponseHandler;
3029
import org.neo4j.driver.internal.handlers.NoOpResponseHandler;
3130
import org.neo4j.driver.internal.handlers.RollbackTxResponseHandler;
31+
import org.neo4j.driver.internal.spi.Connection;
3232
import org.neo4j.driver.internal.types.InternalTypeSystem;
3333
import org.neo4j.driver.v1.Record;
3434
import org.neo4j.driver.v1.Statement;
@@ -42,9 +42,9 @@
4242

4343
import static java.util.Collections.emptyMap;
4444
import static java.util.concurrent.CompletableFuture.completedFuture;
45-
import static org.neo4j.driver.internal.async.Futures.failedFuture;
46-
import static org.neo4j.driver.internal.async.Futures.getBlocking;
4745
import static org.neo4j.driver.internal.util.ErrorUtil.isRecoverable;
46+
import static org.neo4j.driver.internal.util.Futures.failedFuture;
47+
import static org.neo4j.driver.internal.util.Futures.getBlocking;
4848
import static org.neo4j.driver.v1.Values.value;
4949

5050
public class ExplicitTransaction implements Transaction
@@ -77,13 +77,13 @@ private enum State
7777
ROLLED_BACK
7878
}
7979

80-
private final AsyncConnection connection;
80+
private final Connection connection;
8181
private final NetworkSession session;
8282

8383
private volatile Bookmark bookmark = Bookmark.empty();
8484
private volatile State state = State.ACTIVE;
8585

86-
public ExplicitTransaction( AsyncConnection connection, NetworkSession session )
86+
public ExplicitTransaction( Connection connection, NetworkSession session )
8787
{
8888
this.connection = connection;
8989
this.session = session;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.neo4j.driver.v1.Session;
2828

2929
import static java.util.concurrent.CompletableFuture.completedFuture;
30-
import static org.neo4j.driver.internal.async.Futures.getBlocking;
30+
import static org.neo4j.driver.internal.util.Futures.getBlocking;
3131

3232
public class InternalDriver implements Driver
3333
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.neo4j.driver.v1.summary.ResultSummary;
2929
import org.neo4j.driver.v1.util.Function;
3030

31-
import static org.neo4j.driver.internal.async.Futures.getBlocking;
31+
import static org.neo4j.driver.internal.util.Futures.getBlocking;
3232

3333
public class InternalStatementResult implements StatementResult
3434
{

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

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

21-
import org.neo4j.driver.internal.async.Futures;
2221
import org.neo4j.driver.internal.retry.RetryLogic;
2322
import org.neo4j.driver.internal.spi.ConnectionProvider;
23+
import org.neo4j.driver.internal.util.Futures;
2424
import org.neo4j.driver.v1.AccessMode;
2525
import org.neo4j.driver.v1.Logging;
2626

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import java.util.concurrent.CompletionStage;
2525
import java.util.concurrent.atomic.AtomicBoolean;
2626

27-
import org.neo4j.driver.internal.async.AsyncConnection;
28-
import org.neo4j.driver.internal.async.Futures;
2927
import org.neo4j.driver.internal.async.InternalStatementResultCursor;
3028
import org.neo4j.driver.internal.async.QueryRunner;
3129
import org.neo4j.driver.internal.logging.DelegatingLogger;
3230
import org.neo4j.driver.internal.retry.RetryLogic;
31+
import org.neo4j.driver.internal.spi.Connection;
3332
import org.neo4j.driver.internal.spi.ConnectionProvider;
3433
import org.neo4j.driver.internal.types.InternalTypeSystem;
34+
import org.neo4j.driver.internal.util.Futures;
3535
import org.neo4j.driver.v1.AccessMode;
3636
import org.neo4j.driver.v1.Logger;
3737
import org.neo4j.driver.v1.Logging;
@@ -48,8 +48,8 @@
4848
import org.neo4j.driver.v1.types.TypeSystem;
4949

5050
import static java.util.concurrent.CompletableFuture.completedFuture;
51-
import static org.neo4j.driver.internal.async.Futures.failedFuture;
52-
import static org.neo4j.driver.internal.async.Futures.getBlocking;
51+
import static org.neo4j.driver.internal.util.Futures.failedFuture;
52+
import static org.neo4j.driver.internal.util.Futures.getBlocking;
5353
import static org.neo4j.driver.v1.Values.value;
5454

5555
public class NetworkSession implements Session
@@ -63,7 +63,7 @@ public class NetworkSession implements Session
6363

6464
private volatile Bookmark bookmark = Bookmark.empty();
6565
private volatile CompletionStage<ExplicitTransaction> transactionStage = completedFuture( null );
66-
private volatile CompletionStage<AsyncConnection> connectionStage = completedFuture( null );
66+
private volatile CompletionStage<Connection> connectionStage = completedFuture( null );
6767
private volatile CompletionStage<InternalStatementResultCursor> lastResultStage = completedFuture( null );
6868

6969
private final AtomicBoolean open = new AtomicBoolean( true );
@@ -439,10 +439,10 @@ private CompletionStage<ExplicitTransaction> beginTransactionAsync( AccessMode m
439439
return transactionStage;
440440
}
441441

442-
private CompletionStage<AsyncConnection> acquireConnection( AccessMode mode )
442+
private CompletionStage<Connection> acquireConnection( AccessMode mode )
443443
{
444444
// memorize in local so same instance is transformed and used in callbacks
445-
CompletionStage<AsyncConnection> currentAsyncConnectionStage = connectionStage;
445+
CompletionStage<Connection> currentAsyncConnectionStage = connectionStage;
446446

447447
connectionStage = currentAsyncConnectionStage
448448
.exceptionally( error -> null ) // handle previous acquisition failures

‎driver/src/main/java/org/neo4j/driver/internal/async/AsyncConnector.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.netty.bootstrap.Bootstrap;
2222
import io.netty.channel.ChannelFuture;
2323

24-
public interface AsyncConnector
24+
public interface ChannelConnector
2525
{
2626
ChannelFuture connect( BoltServerAddress address, Bootstrap bootstrap );
2727
}

‎driver/src/main/java/org/neo4j/driver/internal/async/AsyncConnectorImpl.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectorImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import static java.util.Objects.requireNonNull;
4040

41-
public class AsyncConnectorImpl implements AsyncConnector
41+
public class ChannelConnectorImpl implements ChannelConnector
4242
{
4343
private final String userAgent;
4444
private final Map<String,Value> authToken;
@@ -47,7 +47,7 @@ public class AsyncConnectorImpl implements AsyncConnector
4747
private final Logging logging;
4848
private final Clock clock;
4949

50-
public AsyncConnectorImpl( ConnectionSettings connectionSettings, SecurityPlan securityPlan, Logging logging,
50+
public ChannelConnectorImpl( ConnectionSettings connectionSettings, SecurityPlan securityPlan, Logging logging,
5151
Clock clock )
5252
{
5353
this.userAgent = connectionSettings.userAgent();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import org.neo4j.driver.internal.handlers.PullAllResponseHandler;
2727
import org.neo4j.driver.internal.handlers.RunResponseHandler;
28+
import org.neo4j.driver.internal.util.Futures;
2829
import org.neo4j.driver.v1.Record;
2930
import org.neo4j.driver.v1.StatementResultCursor;
3031
import org.neo4j.driver.v1.exceptions.NoSuchRecordException;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,18 @@
3232
import org.neo4j.driver.internal.messaging.PullAllMessage;
3333
import org.neo4j.driver.internal.messaging.ResetMessage;
3434
import org.neo4j.driver.internal.messaging.RunMessage;
35+
import org.neo4j.driver.internal.spi.Connection;
3536
import org.neo4j.driver.internal.spi.ResponseHandler;
3637
import org.neo4j.driver.internal.util.Clock;
3738
import org.neo4j.driver.internal.util.ServerVersion;
3839
import org.neo4j.driver.v1.Value;
3940

4041
import static java.util.concurrent.CompletableFuture.completedFuture;
4142
import static org.neo4j.driver.internal.async.ChannelAttributes.messageDispatcher;
42-
import static org.neo4j.driver.internal.async.Futures.asCompletionStage;
43+
import static org.neo4j.driver.internal.util.Futures.asCompletionStage;
4344

4445
// todo: keep state flags to prohibit interaction with released connections
45-
public class NettyConnection implements AsyncConnection
46+
public class NettyConnection implements Connection
4647
{
4748
private final Channel channel;
4849
private final InboundMessageDispatcher messageDispatcher;

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.neo4j.driver.internal.handlers.RunResponseHandler;
2828
import org.neo4j.driver.internal.handlers.SessionPullAllResponseHandler;
2929
import org.neo4j.driver.internal.handlers.TransactionPullAllResponseHandler;
30+
import org.neo4j.driver.internal.spi.Connection;
3031
import org.neo4j.driver.v1.Statement;
3132
import org.neo4j.driver.v1.Value;
3233

@@ -40,33 +41,33 @@ private QueryRunner()
4041
{
4142
}
4243

43-
public static CompletionStage<InternalStatementResultCursor> runAsBlocking( AsyncConnection connection,
44+
public static CompletionStage<InternalStatementResultCursor> runAsBlocking( Connection connection,
4445
Statement statement )
4546
{
4647
return runAsBlocking( connection, statement, null );
4748
}
4849

49-
public static CompletionStage<InternalStatementResultCursor> runAsBlocking( AsyncConnection connection,
50+
public static CompletionStage<InternalStatementResultCursor> runAsBlocking( Connection connection,
5051
Statement statement,
5152
ExplicitTransaction tx )
5253
{
5354
return runAsAsync( connection, statement, tx, false );
5455
}
5556

56-
public static CompletionStage<InternalStatementResultCursor> runAsAsync( AsyncConnection connection,
57+
public static CompletionStage<InternalStatementResultCursor> runAsAsync( Connection connection,
5758
Statement statement )
5859
{
5960
return runAsAsync( connection, statement, null );
6061
}
6162

62-
public static CompletionStage<InternalStatementResultCursor> runAsAsync( AsyncConnection connection,
63+
public static CompletionStage<InternalStatementResultCursor> runAsAsync( Connection connection,
6364
Statement statement,
6465
ExplicitTransaction tx )
6566
{
6667
return runAsAsync( connection, statement, tx, true );
6768
}
6869

69-
private static CompletionStage<InternalStatementResultCursor> runAsAsync( AsyncConnection connection,
70+
private static CompletionStage<InternalStatementResultCursor> runAsAsync( Connection connection,
7071
Statement statement, ExplicitTransaction tx, boolean async )
7172
{
7273
String query = statement.text();
@@ -91,7 +92,7 @@ private static CompletionStage<InternalStatementResultCursor> runAsAsync( AsyncC
9192
}
9293

9394
private static PullAllResponseHandler newPullAllHandler( Statement statement, RunResponseHandler runHandler,
94-
AsyncConnection connection, ExplicitTransaction tx )
95+
Connection connection, ExplicitTransaction tx )
9596
{
9697
if ( tx != null )
9798
{

0 commit comments

Comments
 (0)