Remove LocalTransport in favor of MockTcpTransport

core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java

@@ -83,7 +83,7 @@ public boolean match(DiscoveryNode node) {
                 // We check both the host_ip or the publish_ip
                 String publishAddress = null;
                 if (node.getAddress() instanceof TransportAddress) {
-                    publishAddress = NetworkAddress.format(((TransportAddress) node.getAddress()).address().getAddress());
+                    publishAddress = NetworkAddress.format(node.getAddress().address().getAddress());
                 }
 
                 boolean match = matchByIP(values, node.getHostAddress(), publishAddress);
@@ -117,7 +117,7 @@ public boolean match(DiscoveryNode node) {
                 // We check explicitly only the publish_ip
                 String address = null;
                 if (node.getAddress() instanceof TransportAddress) {
-                    address = NetworkAddress.format(((TransportAddress) node.getAddress()).address().getAddress());
+                    address = NetworkAddress.format(node.getAddress().address().getAddress());
                 }
 
                 boolean match = matchByIP(values, address, null);

core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java

@@ -88,8 +88,7 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     public boolean sameHost(TransportAddress other) {
-        return other instanceof TransportAddress &&
-                address.getAddress().equals(((TransportAddress) other).address.getAddress());
+        return address.getAddress().equals(other.address.getAddress());
     }
 
     public boolean isLoopbackOrLinkLocalAddress() {

core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java

@@ -108,11 +108,7 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
                 table.addCell(info == null ? null : info.getProcess().getId());
                 table.addCell(node.getHostName());
                 table.addCell(node.getHostAddress());
-                if (node.getAddress() instanceof TransportAddress) {
-                    table.addCell(((TransportAddress) node.getAddress()).address().getPort());
-                } else {
-                    table.addCell("-");
-                }
+                table.addCell(node.getAddress().address().getPort());
                 table.addCell(attrEntry.getKey());
                 table.addCell(attrEntry.getValue());
                 table.endRow();

core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java

@@ -235,19 +235,11 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
             table.addCell(fullId ? node.getId() : Strings.substring(node.getId(), 0, 4));
             table.addCell(info == null ? null : info.getProcess().getId());
             table.addCell(node.getHostAddress());
-            if (node.getAddress() instanceof TransportAddress) {
-                table.addCell(((TransportAddress) node.getAddress()).address().getPort());
-            } else {
-                table.addCell("-");
-            }
+            table.addCell(node.getAddress().address().getPort());
             final HttpInfo httpInfo = info == null ? null : info.getHttp();
             if (httpInfo != null) {
                 TransportAddress transportAddress = httpInfo.getAddress().publishAddress();
-                if (transportAddress instanceof TransportAddress) {
-                    table.addCell(NetworkAddress.format(((TransportAddress)transportAddress).address()));
-                } else {
-                    table.addCell(transportAddress.toString());
-                }
+                table.addCell(NetworkAddress.format(transportAddress.address()));
             } else {
                 table.addCell("-");
             }

core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java

@@ -144,11 +144,7 @@ private void buildRow(Table table, boolean fullId, boolean detailed, DiscoveryNo
         // Node information. Note that the node may be null because it has left the cluster between when we got this response and now.
         table.addCell(fullId ? nodeId : Strings.substring(nodeId, 0, 4));
         table.addCell(node == null ? "-" : node.getHostAddress());
-        if (node != null && node.getAddress() instanceof TransportAddress) {
-            table.addCell(((TransportAddress) node.getAddress()).address().getPort());
-        } else {
-            table.addCell("-");
-        }
+        table.addCell(node.getAddress().address().getPort());
         table.addCell(node == null ? "-" : node.getName());
         table.addCell(node == null ? "-" : node.getVersion().toString());
 

core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java

@@ -195,11 +195,7 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
                 table.addCell(info == null ? null : info.getProcess().getId());
                 table.addCell(node.getHostName());
                 table.addCell(node.getHostAddress());
-                if (node.getAddress() instanceof TransportAddress) {
-                    table.addCell(((TransportAddress) node.getAddress()).address().getPort());
-                } else {
-                    table.addCell("-");
-                }
+                table.addCell(node.getAddress().address().getPort());
                 final ThreadPoolStats.Stats poolStats = entry.getValue();
                 final ThreadPool.Info poolInfo = poolThreadInfo.get(entry.getKey());
 

modules/transport-netty3/src/main/java/org/elasticsearch/transport/netty3/Netty3Transport.java

@@ -332,7 +332,7 @@ public long serverOpen() {
     }
 
     protected NodeChannels connectToChannelsLight(DiscoveryNode node) {
-        InetSocketAddress address = ((TransportAddress) node.getAddress()).address();
+        InetSocketAddress address = node.getAddress().address();
         ChannelFuture connect = clientBootstrap.connect(address);
         connect.awaitUninterruptibly((long) (connectTimeout.millis() * 1.5));
         if (!connect.isSuccess()) {
@@ -352,7 +352,7 @@ protected NodeChannels connectToChannels(DiscoveryNode node) throws IOException
             int numConnections = connectionsPerNodeBulk + connectionsPerNodePing + connectionsPerNodeRecovery + connectionsPerNodeReg
                 + connectionsPerNodeState;
             ArrayList<ChannelFuture> connections = new ArrayList<>();
-            InetSocketAddress address = ((TransportAddress) node.getAddress()).address();
+            InetSocketAddress address = node.getAddress().address();
             for (int i = 0; i < numConnections; i++) {
                 connections.add(clientBootstrap.connect(address));
             }

modules/transport-netty3/src/test/java/org/elasticsearch/transport/netty3/Netty3TransportMultiPortIntegrationIT.java

@@ -96,13 +96,13 @@ public void testThatInfosAreExposed() throws Exception {
             // bound addresses
             for (TransportAddress transportAddress : boundTransportAddress.boundAddresses()) {
                 assertThat(transportAddress, instanceOf(TransportAddress.class));
-                assertThat(((TransportAddress) transportAddress).address().getPort(),
+                assertThat(transportAddress.address().getPort(),
                     is(allOf(greaterThanOrEqualTo(randomPort), lessThanOrEqualTo(randomPort + 10))));
             }
 
             // publish address
             assertThat(boundTransportAddress.publishAddress(), instanceOf(TransportAddress.class));
-            TransportAddress publishAddress = (TransportAddress) boundTransportAddress.publishAddress();
+            TransportAddress publishAddress = boundTransportAddress.publishAddress();
             assertThat(NetworkAddress.format(publishAddress.address().getAddress()), is("127.0.0.7"));
             assertThat(publishAddress.address().getPort(), is(4321));
         }

modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java

@@ -333,7 +333,7 @@ public long serverOpen() {
     }
 
     protected NodeChannels connectToChannelsLight(DiscoveryNode node) {
-        InetSocketAddress address = ((TransportAddress) node.getAddress()).address();
+        InetSocketAddress address = node.getAddress().address();
         ChannelFuture connect = bootstrap.connect(address);
         connect.awaitUninterruptibly((long) (connectTimeout.millis() * 1.5));
         if (!connect.isSuccess()) {
@@ -364,7 +364,7 @@ protected NodeChannels connectToChannels(DiscoveryNode node) {
                     connectionsPerNodeState +
                     connectionsPerNodeRecovery;
             final ArrayList<ChannelFuture> connections = new ArrayList<>(numConnections);
-            final InetSocketAddress address = ((TransportAddress) node.getAddress()).address();
+            final InetSocketAddress address = node.getAddress().address();
             for (int i = 0; i < numConnections; i++) {
                 connections.add(bootstrap.connect(address));
             }

modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java

@@ -96,13 +96,13 @@ public void testThatInfosAreExposed() throws Exception {
             // bound addresses
             for (TransportAddress transportAddress : boundTransportAddress.boundAddresses()) {
                 assertThat(transportAddress, instanceOf(TransportAddress.class));
-                assertThat(((TransportAddress) transportAddress).address().getPort(),
+                assertThat(transportAddress.address().getPort(),
                     is(allOf(greaterThanOrEqualTo(randomPort), lessThanOrEqualTo(randomPort + 10))));
             }
 
             // publish address
             assertThat(boundTransportAddress.publishAddress(), instanceOf(TransportAddress.class));
-            TransportAddress publishAddress = (TransportAddress) boundTransportAddress.publishAddress();
+            TransportAddress publishAddress = boundTransportAddress.publishAddress();
             assertThat(NetworkAddress.format(publishAddress.address().getAddress()), is("127.0.0.7"));
             assertThat(publishAddress.address().getPort(), is(4321));
         }

test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java

@@ -97,7 +97,7 @@ public ExternalTestCluster(Path tempDir, Settings additionalSettings, Collection
             int masterAndDataNodes = 0;
             for (int i = 0; i < nodeInfos.getNodes().size(); i++) {
                 NodeInfo nodeInfo = nodeInfos.getNodes().get(i);
-                httpAddresses[i] = ((TransportAddress) nodeInfo.getHttp().address().publishAddress()).address();
+                httpAddresses[i] = nodeInfo.getHttp().address().publishAddress().address();
                 if (DiscoveryNode.isDataNode(nodeInfo.getSettings())) {
                     dataNodes++;
                     masterAndDataNodes++;

test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java

@@ -1190,7 +1190,7 @@ public synchronized int size() {
     public InetSocketAddress[] httpAddresses() {
         List<InetSocketAddress> addresses = new ArrayList<>();
         for (HttpServerTransport httpServerTransport : getInstances(HttpServerTransport.class)) {
-            addresses.add(((TransportAddress) httpServerTransport.boundAddress().publishAddress()).address());
+            addresses.add(httpServerTransport.boundAddress().publishAddress().address());
         }
         return addresses.toArray(new InetSocketAddress[addresses.size()]);
     }