Addressing Comments

Signed-off-by: Ajay Kumar Movva <[email protected]>
opensearch-project · Oct 20, 2023 · b8c2c63 · b8c2c63
1 parent 01316da
commit b8c2c63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/server/src/main/java/org/opensearch/common/network/NetworkModule.java b/server/src/main/java/org/opensearch/common/network/NetworkModule.java
@@ -150,11 +150,11 @@ public NetworkModule(
         HttpServerTransport.Dispatcher dispatcher,
         ClusterSettings clusterSettings,
         Tracer tracer,
-        List<TransportInterceptor> coreTransportInterceptors
+        List<TransportInterceptor> transportInterceptors
     ) {
         this.settings = settings;
-        if (coreTransportInterceptors != null) {
-            coreTransportInterceptors.forEach(this::registerTransportInterceptor);
+        if (transportInterceptors != null) {
+            transportInterceptors.forEach(this::registerTransportInterceptor);
         }
         for (NetworkPlugin plugin : plugins) {
             Map<String, Supplier<HttpServerTransport>> httpTransportFactory = plugin.getHttpTransports(
@@ -184,11 +184,11 @@ public NetworkModule(
             for (Map.Entry<String, Supplier<Transport>> entry : transportFactory.entrySet()) {
                 registerTransport(entry.getKey(), entry.getValue());
             }
-            List<TransportInterceptor> transportInterceptors = plugin.getTransportInterceptors(
+            List<TransportInterceptor> pluginTransportInterceptors = plugin.getTransportInterceptors(
                 namedWriteableRegistry,
                 threadPool.getThreadContext()
             );
-            for (TransportInterceptor interceptor : transportInterceptors) {
+            for (TransportInterceptor interceptor : pluginTransportInterceptors) {
                 registerTransportInterceptor(interceptor);
             }
         }

diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
@@ -893,7 +893,6 @@ protected Node(
 
             final RestController restController = actionModule.getRestController();
 
-            List<TransportInterceptor> coreTransportInterceptors = new ArrayList<>();
             final AdmissionControlService admissionControlService = new AdmissionControlService(
                 settings,
                 clusterService.getClusterSettings(),
@@ -904,7 +903,7 @@ protected Node(
                 admissionControlService
             );
 
-            coreTransportInterceptors.add(admissionControlTransportInterceptor);
+            List<TransportInterceptor> transportInterceptors = List.of(admissionControlTransportInterceptor);
             final NetworkModule networkModule = new NetworkModule(
                 settings,
                 pluginsService.filterPlugins(NetworkPlugin.class),
@@ -918,7 +917,7 @@ protected Node(
                 restController,
                 clusterService.getClusterSettings(),
                 tracer,
-                coreTransportInterceptors
+                transportInterceptors
             );
 
             Collection<UnaryOperator<Map<String, IndexTemplateMetadata>>> indexTemplateMetadataUpgraders = pluginsService.filterPlugins(