Transport: Remove parsing of port ranges

docs/reference/modules/discovery/zen.asciidoc

@@ -56,8 +56,7 @@ as gossip routers. It provides the following settings with the
 |=======================================================================
 |Setting |Description
 |`hosts` |Either an array setting or a comma delimited setting. Each
-value is either in the form of `host:port`, or in the form of
-`host[port1-port2]`.
+value is in the form of `host:port`.
 |=======================================================================
 
 The unicast discovery uses the

src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java

@@ -62,8 +62,6 @@ public class UnicastZenPing extends AbstractLifecycleComponent<ZenPing> implemen
 
     public static final String ACTION_NAME = "internal:discovery/zen/unicast";
 
-    public static final int LIMIT_PORTS_COUNT = 1;
-
     private final ThreadPool threadPool;
     private final TransportService transportService;
     private final ClusterName clusterName;
@@ -111,11 +109,8 @@ public UnicastZenPing(Settings settings, ThreadPool threadPool, TransportService
         int idCounter = 0;
         for (String host : hosts) {
             try {
-                TransportAddress[] addresses = transportService.addressesFromString(host);
-                // we only limit to 1 addresses, makes no sense to ping 100 ports
-                for (int i = 0; (i < addresses.length && i < LIMIT_PORTS_COUNT); i++) {
-                    configuredTargetNodes.add(new DiscoveryNode("#zen_unicast_" + (++idCounter) + "#", addresses[i], version.minimumCompatibilityVersion()));
-                }
+                TransportAddress address = transportService.addressFromString(host);
+                configuredTargetNodes.add(new DiscoveryNode("#zen_unicast_" + (++idCounter) + "#", address, version.minimumCompatibilityVersion()));
             } catch (Exception e) {
                 throw new ElasticsearchIllegalArgumentException("Failed to resolve address for [" + host + "]", e);
             }

src/main/java/org/elasticsearch/transport/Transport.java

@@ -45,7 +45,7 @@ public static class TransportSettings {
     /**
      * Returns an address from its string representation.
      */
-    TransportAddress[] addressesFromString(String address) throws Exception;
+    TransportAddress addressFromString(String address) throws Exception;
 
     /**
      * Is the address type supported.

src/main/java/org/elasticsearch/transport/TransportService.java

@@ -225,8 +225,8 @@ private long newRequestId() {
         return requestIds.getAndIncrement();
     }
 
-    public TransportAddress[] addressesFromString(String address) throws Exception {
-        return transport.addressesFromString(address);
+    public TransportAddress addressFromString(String address) throws Exception {
+        return transport.addressFromString(address);
     }
 
     public void registerHandler(String action, TransportRequestHandler handler) {

src/main/java/org/elasticsearch/transport/local/LocalTransport.java

@@ -79,8 +79,8 @@ public LocalTransport(Settings settings, ThreadPool threadPool, Version version)
     }
 
     @Override
-    public TransportAddress[] addressesFromString(String address) {
-        return new TransportAddress[]{new LocalTransportAddress(address)};
+    public TransportAddress addressFromString(String address) {
+        return new LocalTransportAddress(address);
     }
 
     @Override

src/main/java/org/elasticsearch/transport/netty/NettyTransport.java

@@ -427,34 +427,12 @@ protected void doClose() throws ElasticsearchException {
     }
 
     @Override
-    public TransportAddress[] addressesFromString(String address) throws Exception {
-        int index = address.indexOf('[');
-        if (index != -1) {
-            String host = address.substring(0, index);
-            Set<String> ports = Strings.commaDelimitedListToSet(address.substring(index + 1, address.indexOf(']')));
-            List<TransportAddress> addresses = Lists.newArrayList();
-            for (String port : ports) {
-                int[] iPorts = new PortsRange(port).ports();
-                for (int iPort : iPorts) {
-                    addresses.add(new InetSocketTransportAddress(host, iPort));
-                }
-            }
-            return addresses.toArray(new TransportAddress[addresses.size()]);
-        } else {
-            index = address.lastIndexOf(':');
-            if (index == -1) {
-                List<TransportAddress> addresses = Lists.newArrayList();
-                int[] iPorts = new PortsRange(this.port).ports();
-                for (int iPort : iPorts) {
-                    addresses.add(new InetSocketTransportAddress(address, iPort));
-                }
-                return addresses.toArray(new TransportAddress[addresses.size()]);
-            } else {
-                String host = address.substring(0, index);
-                int port = Integer.parseInt(address.substring(index + 1));
-                return new TransportAddress[]{new InetSocketTransportAddress(host, port)};
-            }
+    public TransportAddress addressFromString(String address) throws Exception {
+        int index = address.lastIndexOf(':');
+        if (index == -1) {
+            return new InetSocketTransportAddress(address, Integer.parseInt(this.port));
         }
+        return new InetSocketTransportAddress(address.substring(0, index), Integer.parseInt(address.substring(index + 1)));
     }
 
     @Override

src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java

@@ -126,7 +126,7 @@ public BoundTransportAddress boundAddress() {
     }
 
     @Override
-    public TransportAddress[] addressesFromString(String address) throws Exception {
+    public TransportAddress addressFromString(String address) throws Exception {
         throw new UnsupportedOperationException();
     }
 

src/test/java/org/elasticsearch/test/transport/MockTransportService.java

@@ -332,8 +332,8 @@ public BoundTransportAddress boundAddress() {
         }
 
         @Override
-        public TransportAddress[] addressesFromString(String address) throws Exception {
-            return transport.addressesFromString(address);
+        public TransportAddress addressFromString(String address) throws Exception {
+            return transport.addressFromString(address);
         }
 
         @Override