Cleanup some in o.e.transport (#49901) (#49971)

Cleaning up some obvious compile warnings and dead code.

server/src/main/java/org/elasticsearch/transport/InboundHandler.java

@@ -73,8 +73,9 @@ public class InboundHandler {
         requestHandlers = MapBuilder.newMapBuilder(requestHandlers).put(reg.getAction(), reg).immutableMap();
     }
 
-    final RequestHandlerRegistry<? extends TransportRequest> getRequestHandler(String action) {
+    @SuppressWarnings("unchecked")
-        return requestHandlers.get(action);
+    final <T extends TransportRequest> RequestHandlerRegistry<T> getRequestHandler(String action) {
+        return (RequestHandlerRegistry<T>) requestHandlers.get(action);
     }
 
     final Transport.ResponseHandlers getResponseHandlers() {
@@ -149,7 +150,7 @@ public class InboundHandler {
         }
     }
 
-    private void handleRequest(TcpChannel channel, InboundMessage.Request message, int messageLengthBytes) {
+    private <T extends TransportRequest> void handleRequest(TcpChannel channel, InboundMessage.Request message, int messageLengthBytes) {
         final Set<String> features = message.getFeatures();
         final String action = message.getActionName();
         final long requestId = message.getRequestId();
@@ -161,7 +162,7 @@ public class InboundHandler {
             if (message.isHandshake()) {
                 handshaker.handleHandshake(version, features, channel, requestId, stream);
             } else {
-                final RequestHandlerRegistry reg = getRequestHandler(action);
+                final RequestHandlerRegistry<T> reg = getRequestHandler(action);
                 if (reg == null) {
                     throw new ActionNotFoundTransportException(action);
                 }
@@ -173,7 +174,7 @@ public class InboundHandler {
                 }
                 transportChannel = new TcpTransportChannel(outboundHandler, channel, action, requestId, version, features,
                     circuitBreakerService, messageLengthBytes, message.isCompress());
-                final TransportRequest request = reg.newRequest(stream);
+                final T request = reg.newRequest(stream);
                 request.remoteAddress(new TransportAddress(channel.getRemoteAddress()));
                 // in case we throw an exception, i.e. when the limit is hit, we don't want to verify
                 final int nextByte = stream.read();
@@ -182,7 +183,7 @@ public class InboundHandler {
                     throw new IllegalStateException("Message not fully read (request) for requestId [" + requestId + "], action [" + action
                         + "], available [" + stream.available() + "]; resetting");
                 }
-                threadPool.executor(reg.getExecutor()).execute(new RequestHandler(reg, request, transportChannel));
+                threadPool.executor(reg.getExecutor()).execute(new RequestHandler<>(reg, request, transportChannel));
             }
         } catch (Exception e) {
             // the circuit breaker tripped
@@ -247,18 +248,17 @@ public class InboundHandler {
         });
     }
 
-    private static class RequestHandler extends AbstractRunnable {
+    private static class RequestHandler<T extends TransportRequest> extends AbstractRunnable {
-        private final RequestHandlerRegistry reg;
+        private final RequestHandlerRegistry<T> reg;
-        private final TransportRequest request;
+        private final T request;
         private final TransportChannel transportChannel;
 
-        RequestHandler(RequestHandlerRegistry<?> reg, TransportRequest request, TransportChannel transportChannel) {
+        RequestHandler(RequestHandlerRegistry<T> reg, T request, TransportChannel transportChannel) {
             this.reg = reg;
             this.request = request;
             this.transportChannel = transportChannel;
         }
 
-        @SuppressWarnings({"unchecked"})
         @Override
         protected void doRun() throws Exception {
             reg.processMessageReceived(request, transportChannel);

server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java

@@ -65,8 +65,6 @@ public final class RemoteClusterService extends RemoteClusterAware implements Cl
 
     private static final Logger logger = LogManager.getLogger(RemoteClusterService.class);
 
-    private static final ActionListener<Void> noopListener = ActionListener.wrap((x) -> {}, (x) -> {});
-
     static {
         // remove search.remote.* settings in 8.0.0
         assert Version.CURRENT.major < 8;

server/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java

@@ -53,10 +53,6 @@ public class TransportRequestOptions {
         return new Builder();
     }
 
-    public static Builder builder(TransportRequestOptions options) {
-        return new Builder().withTimeout(options.timeout).withType(options.type());
-    }
-
     public static class Builder {
         private TimeValue timeout;
         private Type type = Type.REG;