Get value from transport constructor

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Oct 5, 2023 · bd96a33 · bd96a33
1 parent 93ca9ab
commit bd96a33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/opensearch/security/http/SecurityNonSslHttpServerTransport.java b/src/main/java/org/opensearch/security/http/SecurityNonSslHttpServerTransport.java
@@ -47,6 +47,7 @@
 public class SecurityNonSslHttpServerTransport extends Netty4HttpServerTransport {
 
     private SecurityRestFilter restFilter;
+    private final NamedXContentRegistry namedXContentRegistry;
 
     public SecurityNonSslHttpServerTransport(
         final Settings settings,
@@ -72,6 +73,7 @@ public SecurityNonSslHttpServerTransport(
             tracer
         );
         this.restFilter = restFilter;
+        this.namedXContentRegistry = namedXContentRegistry;
     }
 
     @Override
@@ -93,7 +95,7 @@ protected void initChannel(Channel ch) throws Exception {
 
     @Override
     protected ChannelInboundHandlerAdapter createHeaderVerifier() {
-        return new Netty4HttpRequestHeaderVerifier(restFilter, xContentRegistry, threadPool, handlingSettings, settings);
+        return new Netty4HttpRequestHeaderVerifier(restFilter, namedXContentRegistry, threadPool, handlingSettings, settings);
     }
 
     @Override

diff --git a/...main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java b/...main/java/org/opensearch/security/ssl/http/netty/SecuritySSLNettyHttpServerTransport.java
@@ -49,6 +49,7 @@ public class SecuritySSLNettyHttpServerTransport extends Netty4HttpServerTranspo
     private final SecurityKeyStore sks;
     private final SslExceptionHandler errorHandler;
     private final SecurityRestFilter restFilter;
+    private final NamedXContentRegistry namedXContentRegistry;
 
     public SecuritySSLNettyHttpServerTransport(
         final Settings settings,
@@ -78,6 +79,7 @@ public SecuritySSLNettyHttpServerTransport(
         this.sks = sks;
         this.errorHandler = errorHandler;
         this.restFilter = restFilter;
+        this.namedXContentRegistry = namedXContentRegistry;
     }
 
     @Override
@@ -157,7 +159,7 @@ protected void configurePipeline(Channel ch) {
 
     @Override
     protected ChannelInboundHandlerAdapter createHeaderVerifier() {
-        return new Netty4HttpRequestHeaderVerifier(restFilter, xContentRegistry, threadPool, handlingSettings, settings);
+        return new Netty4HttpRequestHeaderVerifier(restFilter, namedXContentRegistry, threadPool, handlingSettings, settings);
     }
 
     @Override