Merge branch 'release/1.6.0'

netifi-proteus · Apr 5, 2019 · 3c64a4b · 3c64a4b
2 parents b033fd6 + 7573f2f
commit 3c64a4b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/proteus-client/src/main/java/io/netifi/proteus/DefaultProteusBrokerService.java b/proteus-client/src/main/java/io/netifi/proteus/DefaultProteusBrokerService.java
@@ -145,7 +145,7 @@ public DefaultProteusBrokerService(
     this.addressSelector = addressSelector;
     this.clientTransportFactory = clientTransportFactory;
     this.poolSize = poolSize;
-    this.selectRefresh = poolSize / 2;
+    this.selectRefresh = poolSize == 1 ? 1 : poolSize / 2;
     this.keepalive = keepalive;
     this.tickPeriodSeconds = tickPeriodSeconds;
     this.ackTimeoutSeconds = ackTimeoutSeconds;
@@ -182,7 +182,10 @@ private void useDiscoveryStrategy() {
         discoveryStrategy
             .discoverNodes()
             .flatMapIterable(Function.identity())
-            .map(hostAndPort -> new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPort()))
+            .map(
+                hostAndPort ->
+                    InetSocketAddress.createUnresolved(
+                        hostAndPort.getHost(), hostAndPort.getPort()))
             .collectList()
             .doOnNext(
                 i -> {

diff --git a/proteus-client/src/main/java/io/netifi/proteus/Proteus.java b/proteus-client/src/main/java/io/netifi/proteus/Proteus.java
@@ -707,7 +707,7 @@ public static class Builder {
     private int missedAcks = DefaultBuilderConfig.getMissedAcks();
     private DiscoveryStrategy discoveryStrategy = null;
     private Function<Broker, InetSocketAddress> addressSelector =
-        BrokerAddressSelectors.BIND_ADDRESS; // Default
+        BrokerAddressSelectors.TCP_ADDRESS; // Default
 
     private Function<SocketAddress, ClientTransport> clientTransportFactory = null;
     private int poolSize = Runtime.getRuntime().availableProcessors() * 2;

diff --git a/proteus-client/src/main/java/io/netifi/proteus/rsocket/transport/BrokerAddressSelectors.java b/proteus-client/src/main/java/io/netifi/proteus/rsocket/transport/BrokerAddressSelectors.java
@@ -20,9 +20,6 @@
 import java.util.function.Function;
 
 public class BrokerAddressSelectors {
-
-  public static Function<Broker, InetSocketAddress> BIND_ADDRESS =
-      broker -> InetSocketAddress.createUnresolved(broker.getIpAddress(), broker.getPort());
   public static Function<Broker, InetSocketAddress> TCP_ADDRESS =
       broker -> InetSocketAddress.createUnresolved(broker.getTcpAddress(), broker.getTcpPort());
   public static Function<Broker, InetSocketAddress> WEBSOCKET_ADDRESS =

diff --git a/...rc/test/java/io/netifi/proteus/rsocket/transport/WeightedClientTransportSupplierTest.java b/...rc/test/java/io/netifi/proteus/rsocket/transport/WeightedClientTransportSupplierTest.java
@@ -38,7 +38,7 @@ public void testShouldDecrementActiveCountOnComplete() {
     Broker b = Broker.newBuilder().setTcpAddress("localhost").setTcpPort(8001).build();
     WeightedClientTransportSupplier supplier =
         new WeightedClientTransportSupplier(
-            b, BrokerAddressSelectors.BIND_ADDRESS, address -> transport);
+            b, BrokerAddressSelectors.TCP_ADDRESS, address -> transport);
 
     supplier.select();
     DuplexConnection block = supplier.get().connect().block();