Skip to content

Commit 190ed2c

Browse files
lutovichlutovich
committed
Resturctured load balancers to a separate package
1 parent 4357602 commit 190ed2c

16 files changed

+35
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import java.net.URI;
2323
import java.security.GeneralSecurityException;
2424

25-
import org.neo4j.driver.internal.cluster.LoadBalancer;
2625
import org.neo4j.driver.internal.cluster.RoutingContext;
2726
import org.neo4j.driver.internal.cluster.RoutingSettings;
27+
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
2828
import org.neo4j.driver.internal.net.BoltServerAddress;
2929
import org.neo4j.driver.internal.net.SocketConnector;
3030
import org.neo4j.driver.internal.net.pooling.PoolSettings;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.neo4j.driver.v1.Value;
2727
import org.neo4j.driver.v1.util.Function;
2828

29-
final class ClusterComposition
29+
public final class ClusterComposition
3030
{
3131
private static final long MAX_TTL = Long.MAX_VALUE / 1000L;
3232
private static final Function<Value,BoltServerAddress> OF_BoltServerAddress =
@@ -53,7 +53,7 @@ private ClusterComposition( long expirationTimestamp )
5353
}
5454

5555
/** For testing */
56-
ClusterComposition(
56+
public ClusterComposition(
5757
long expirationTimestamp,
5858
Set<BoltServerAddress> readers,
5959
Set<BoltServerAddress> writers,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535

3636
import static java.lang.String.format;
3737

38-
class RoutingPooledConnection implements PooledConnection
38+
public class RoutingPooledConnection implements PooledConnection
3939
{
4040
private final PooledConnection delegate;
4141
private final RoutingErrorHandler errorHandler;
4242
private final AccessMode accessMode;
4343

44-
RoutingPooledConnection( PooledConnection delegate, RoutingErrorHandler errorHandler, AccessMode accessMode )
44+
public RoutingPooledConnection( PooledConnection delegate, RoutingErrorHandler errorHandler, AccessMode accessMode )
4545
{
4646
this.delegate = delegate;
4747
this.errorHandler = errorHandler;

‎driver/src/main/java/org/neo4j/driver/internal/cluster/LeastConnectedLoadBalancingStrategy.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/LeastConnectedLoadBalancingStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.neo4j.driver.internal.net.BoltServerAddress;
2222
import org.neo4j.driver.internal.spi.ConnectionPool;

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,21 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import java.util.Set;
2222

2323
import org.neo4j.driver.internal.RoutingErrorHandler;
24+
import org.neo4j.driver.internal.cluster.AddressSet;
25+
import org.neo4j.driver.internal.cluster.ClusterComposition;
26+
import org.neo4j.driver.internal.cluster.ClusterCompositionProvider;
27+
import org.neo4j.driver.internal.cluster.ClusterRoutingTable;
28+
import org.neo4j.driver.internal.cluster.DnsResolver;
29+
import org.neo4j.driver.internal.cluster.Rediscovery;
30+
import org.neo4j.driver.internal.cluster.RoutingPooledConnection;
31+
import org.neo4j.driver.internal.cluster.RoutingProcedureClusterCompositionProvider;
32+
import org.neo4j.driver.internal.cluster.RoutingSettings;
33+
import org.neo4j.driver.internal.cluster.RoutingTable;
2434
import org.neo4j.driver.internal.net.BoltServerAddress;
2535
import org.neo4j.driver.internal.spi.ConnectionPool;
2636
import org.neo4j.driver.internal.spi.ConnectionProvider;
@@ -55,7 +65,8 @@ private LoadBalancer( BoltServerAddress initialRouter, RoutingSettings settings,
5565
this( connections, routingTable, createRediscovery( initialRouter, settings, clock, log ), log );
5666
}
5767

58-
LoadBalancer( ConnectionPool connections, RoutingTable routingTable, Rediscovery rediscovery, Logger log )
68+
// Used only in testing
69+
public LoadBalancer( ConnectionPool connections, RoutingTable routingTable, Rediscovery rediscovery, Logger log )
5970
{
6071
this.connections = connections;
6172
this.routingTable = routingTable;

‎driver/src/main/java/org/neo4j/driver/internal/cluster/LoadBalancingStrategy.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancingStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.neo4j.driver.internal.net.BoltServerAddress;
2222

‎driver/src/main/java/org/neo4j/driver/internal/cluster/RoundRobinArrayIndex.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/RoundRobinArrayIndex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import java.util.concurrent.atomic.AtomicInteger;
2222

‎driver/src/main/java/org/neo4j/driver/internal/cluster/RoundRobinLoadBalancingStrategy.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/cluster/loadbalancing/RoundRobinLoadBalancingStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.neo4j.driver.internal.net.BoltServerAddress;
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import java.util.Arrays;
2929
import java.util.List;
3030

31-
import org.neo4j.driver.internal.cluster.LoadBalancer;
3231
import org.neo4j.driver.internal.cluster.RoutingSettings;
32+
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
3333
import org.neo4j.driver.internal.net.BoltServerAddress;
3434
import org.neo4j.driver.internal.retry.RetryLogic;
3535
import org.neo4j.driver.internal.retry.RetrySettings;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import java.util.Collections;
3030
import java.util.Map;
3131

32-
import org.neo4j.driver.internal.cluster.LoadBalancer;
3332
import org.neo4j.driver.internal.cluster.RoutingSettings;
33+
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
3434
import org.neo4j.driver.internal.net.BoltServerAddress;
3535
import org.neo4j.driver.internal.retry.FixedRetryLogic;
3636
import org.neo4j.driver.internal.retry.RetryLogic;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.HashSet;
3131
import java.util.List;
3232

33+
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
3334
import org.neo4j.driver.internal.net.BoltServerAddress;
3435
import org.neo4j.driver.internal.net.pooling.PoolSettings;
3536
import org.neo4j.driver.internal.net.pooling.SocketConnectionPool;

‎driver/src/test/java/org/neo4j/driver/internal/cluster/LeastConnectedLoadBalancingStrategyTest.java renamed to ‎driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LeastConnectedLoadBalancingStrategyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.junit.Before;
2222
import org.junit.Test;

‎driver/src/test/java/org/neo4j/driver/internal/cluster/LoadBalancerTest.java renamed to ‎driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/LoadBalancerTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.junit.Test;
2222
import org.mockito.InOrder;
@@ -32,6 +32,11 @@
3232
import org.neo4j.driver.internal.ExplicitTransaction;
3333
import org.neo4j.driver.internal.NetworkSession;
3434
import org.neo4j.driver.internal.SessionResourcesHandler;
35+
import org.neo4j.driver.internal.cluster.AddressSet;
36+
import org.neo4j.driver.internal.cluster.ClusterComposition;
37+
import org.neo4j.driver.internal.cluster.Rediscovery;
38+
import org.neo4j.driver.internal.cluster.RoutingPooledConnection;
39+
import org.neo4j.driver.internal.cluster.RoutingTable;
3540
import org.neo4j.driver.internal.net.BoltServerAddress;
3641
import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic;
3742
import org.neo4j.driver.internal.retry.RetryLogic;

‎driver/src/test/java/org/neo4j/driver/internal/cluster/RoundRobinArrayIndexTest.java renamed to ‎driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoundRobinArrayIndexTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.junit.Test;
2222

‎driver/src/test/java/org/neo4j/driver/internal/cluster/RoundRobinLoadBalancingStrategyTest.java renamed to ‎driver/src/test/java/org/neo4j/driver/internal/cluster/loadbalancing/RoundRobinLoadBalancingStrategyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.cluster.loadbalancing;
2020

2121
import org.junit.Test;
2222

‎driver/src/test/java/org/neo4j/driver/internal/util/Matchers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.neo4j.driver.internal.SessionFactory;
3030
import org.neo4j.driver.internal.SessionFactoryImpl;
3131
import org.neo4j.driver.internal.cluster.AddressSet;
32-
import org.neo4j.driver.internal.cluster.LoadBalancer;
3332
import org.neo4j.driver.internal.cluster.RoutingTable;
33+
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
3434
import org.neo4j.driver.internal.net.BoltServerAddress;
3535
import org.neo4j.driver.internal.spi.ConnectionProvider;
3636
import org.neo4j.driver.v1.Driver;

0 commit comments

Comments
 (0)