Simplify request handling of registry

Author: nik9000

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequestHandler.java

@@ -25,8 +25,8 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
+
 import org.elasticsearch.common.util.concurrent.ThreadContext;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.http.netty4.pipelining.HttpPipelinedRequest;
 import org.elasticsearch.transport.netty4.Netty4Utils;
 
@@ -37,15 +37,12 @@ class Netty4HttpRequestHandler extends SimpleChannelInboundHandler<Object> {
     private final boolean httpPipeliningEnabled;
     private final boolean detailedErrorsEnabled;
     private final ThreadContext threadContext;
-    private final NamedXContentRegistry xContentRegistry;
 
-    Netty4HttpRequestHandler(Netty4HttpServerTransport serverTransport, boolean detailedErrorsEnabled, ThreadContext threadContext,
-            NamedXContentRegistry xContentRegistry) {
+    Netty4HttpRequestHandler(Netty4HttpServerTransport serverTransport, boolean detailedErrorsEnabled, ThreadContext threadContext) {
         this.serverTransport = serverTransport;
         this.httpPipeliningEnabled = serverTransport.pipelining;
         this.detailedErrorsEnabled = detailedErrorsEnabled;
         this.threadContext = threadContext;
-        this.xContentRegistry = xContentRegistry;
     }
 
     @Override
@@ -69,7 +66,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except
                         request.headers(),
                         request.trailingHeaders());
 
-        final Netty4HttpRequest httpRequest = new Netty4HttpRequest(xContentRegistry, copy, ctx.channel());
+        final Netty4HttpRequest httpRequest = new Netty4HttpRequest(serverTransport.xContentRegistry, copy, ctx.channel());
         serverTransport.dispatchRequest(
             httpRequest,
             new Netty4HttpChannel(serverTransport, httpRequest, pipelinedRequest, detailedErrorsEnabled, threadContext));

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java

@@ -62,6 +62,7 @@
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
+import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.http.BindHttpException;
 import org.elasticsearch.http.HttpInfo;
 import org.elasticsearch.http.HttpServerAdapter;
@@ -194,6 +195,9 @@ public class Netty4HttpServerTransport extends AbstractLifecycleComponent implem
 
     protected final boolean detailedErrorsEnabled;
     protected final ThreadPool threadPool;
+    /**
+     * The registry used to construct parsers so they support {@link XContentParser#namedObject(Class, String, Object)}.
+     */
     protected final NamedXContentRegistry xContentRegistry;
 
     protected final boolean tcpNoDelay;
@@ -538,7 +542,7 @@ protected void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throw
     }
 
     public ChannelHandler configureServerChannelHandler() {
-        return new HttpChannelHandler(this, detailedErrorsEnabled, threadPool.getThreadContext(), xContentRegistry);
+        return new HttpChannelHandler(this, detailedErrorsEnabled, threadPool.getThreadContext());
     }
 
     protected static class HttpChannelHandler extends ChannelInitializer<Channel> {
@@ -549,10 +553,9 @@ protected static class HttpChannelHandler extends ChannelInitializer<Channel> {
         protected HttpChannelHandler(
                 final Netty4HttpServerTransport transport,
                 final boolean detailedErrorsEnabled,
-                final ThreadContext threadContext,
-                final NamedXContentRegistry xContentRegistry) {
+                final ThreadContext threadContext) {
             this.transport = transport;
-            this.requestHandler = new Netty4HttpRequestHandler(transport, detailedErrorsEnabled, threadContext, xContentRegistry);
+            this.requestHandler = new Netty4HttpRequestHandler(transport, detailedErrorsEnabled, threadContext);
         }
 
         @Override

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java

@@ -181,7 +181,7 @@ private class CustomHttpChannelHandler extends Netty4HttpServerTransport.HttpCha
         private final ExecutorService executorService;
 
         CustomHttpChannelHandler(Netty4HttpServerTransport transport, ExecutorService executorService, ThreadContext threadContext) {
-            super(transport, randomBoolean(), threadContext, xContentRegistry());
+            super(transport, randomBoolean(), threadContext);
             this.executorService = executorService;
         }