[Rename] modules/transport-netty4 (#225)

This commit refactors the transport-netty4 module as part of the Elasticsearch to OpenSearch renaming.

Signed-off-by: Rabi Panda <[email protected]>

client/transport/src/main/java/org/elasticsearch/transport/client/PreBuiltTransportClient.java

@@ -31,7 +31,7 @@
 import org.opensearch.percolator.PercolatorPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.opensearch.script.mustache.MustachePlugin;
-import org.elasticsearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4Plugin;
 
 import java.util.Arrays;
 import java.util.Collection;

client/transport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java

@@ -28,7 +28,7 @@
 import org.opensearch.percolator.PercolatorPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.opensearch.script.mustache.MustachePlugin;
-import org.elasticsearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4Plugin;
 import org.junit.Test;
 
 import java.util.Arrays;

modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java

@@ -52,7 +52,7 @@
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4Plugin;
 import org.elasticsearch.watcher.ResourceWatcherService;
 import org.junit.Before;
 

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java

@@ -36,7 +36,7 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4Plugin;
 import org.junit.After;
 
 import java.util.ArrayList;

modules/transport-netty4/build.gradle

@@ -18,14 +18,14 @@
  */
 
 
-import org.elasticsearch.gradle.info.BuildParams
-import org.elasticsearch.gradle.test.RestIntegTestTask
-import org.elasticsearch.gradle.test.rest.JavaRestTestPlugin
-import org.elasticsearch.gradle.test.InternalClusterTestPlugin
+import org.opensearch.gradle.info.BuildParams
+import org.opensearch.gradle.test.RestIntegTestTask
+import org.opensearch.gradle.test.rest.JavaRestTestPlugin
+import org.opensearch.gradle.test.InternalClusterTestPlugin
 
-apply plugin: 'elasticsearch.yaml-rest-test'
-apply plugin: 'elasticsearch.java-rest-test'
-apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'opensearch.yaml-rest-test'
+apply plugin: 'opensearch.java-rest-test'
+apply plugin: 'opensearch.internal-cluster-test'
 
 /*
  TODOs:
@@ -35,7 +35,7 @@ apply plugin: 'elasticsearch.internal-cluster-test'
  */
 esplugin {
   description 'Netty 4 based transport implementation'
-  classname 'org.elasticsearch.transport.Netty4Plugin'
+  classname 'org.opensearch.transport.Netty4Plugin'
   hasClientJar = true
 }
 

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/ESNetty4IntegTestCase.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java

@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch;
+package org.opensearch;
 
 import org.elasticsearch.common.network.NetworkModule;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.transport.Netty4Plugin;
-import org.elasticsearch.transport.netty4.Netty4Transport;
+import org.opensearch.transport.Netty4Plugin;
+import org.opensearch.transport.netty4.Netty4Transport;
 
 import java.util.Collection;
 import java.util.Collections;
 
-public abstract class ESNetty4IntegTestCase extends ESIntegTestCase {
+public abstract class OpenSearchNetty4IntegTestCase extends ESIntegTestCase {
 
     @Override
     protected boolean ignoreExternalCluster() {

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4HttpRequestSizeLimitIT.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.ReferenceCounted;
-import org.elasticsearch.ESNetty4IntegTestCase;
+import org.opensearch.OpenSearchNetty4IntegTestCase;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
@@ -48,7 +48,7 @@
  * a single node "cluster". We also force test infrastructure to use the node client instead of the transport client for the same reason.
  */
 @ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numClientNodes = 0, numDataNodes = 1, transportClientRatio = 0)
-public class Netty4HttpRequestSizeLimitIT extends ESNetty4IntegTestCase {
+public class Netty4HttpRequestSizeLimitIT extends OpenSearchNetty4IntegTestCase {
 
     private static final ByteSizeValue LIMIT = new ByteSizeValue(2, ByteSizeUnit.KB);
 

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4PipeliningIT.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.util.ReferenceCounted;
-import org.elasticsearch.ESNetty4IntegTestCase;
+import org.opensearch.OpenSearchNetty4IntegTestCase;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.http.HttpServerTransport;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -34,7 +34,7 @@
 import static org.hamcrest.Matchers.is;
 
 @ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numDataNodes = 1)
-public class Netty4PipeliningIT extends ESNetty4IntegTestCase {
+public class Netty4PipeliningIT extends OpenSearchNetty4IntegTestCase {
 
     @Override
     protected boolean addMockHttpTransport() {

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.discovery;
+package org.opensearch.rest.discovery;
 
 import org.apache.http.HttpHost;
-import org.elasticsearch.ESNetty4IntegTestCase;
+import org.opensearch.OpenSearchNetty4IntegTestCase;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Node;
@@ -48,7 +48,7 @@
 // proper transport implementation, and they cannot be REST tests today since they need to restart nodes. When #35599 and friends land we
 // should be able to move these tests to run against a proper cluster instead. TODO do this.
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0, autoManageMasterNodes = false)
-public class Zen2RestApiIT extends ESNetty4IntegTestCase {
+public class Zen2RestApiIT extends OpenSearchNetty4IntegTestCase {
 
     @Override
     protected boolean addMockHttpTransport() {

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.transport.netty4;
+package org.opensearch.transport.netty4;
 
-import org.elasticsearch.ESNetty4IntegTestCase;
+import org.opensearch.OpenSearchNetty4IntegTestCase;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@@ -34,7 +34,7 @@
 import org.elasticsearch.test.ESIntegTestCase.Scope;
 import org.elasticsearch.test.junit.annotations.Network;
 import org.elasticsearch.transport.MockTransportClient;
-import org.elasticsearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4Plugin;
 import org.elasticsearch.transport.TransportInfo;
 
 import java.net.InetAddress;
@@ -51,7 +51,7 @@
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 
 @ClusterScope(scope = Scope.SUITE, supportsDedicatedMasters = false, numDataNodes = 1, numClientNodes = 0)
-public class Netty4TransportMultiPortIntegrationIT extends ESNetty4IntegTestCase {
+public class Netty4TransportMultiPortIntegrationIT extends OpenSearchNetty4IntegTestCase {
 
     private static int randomPort = -1;
     private static String randomPortRange;

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/transport/netty4/Netty4TransportPublishAddressIT.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.transport.netty4;
+package org.opensearch.transport.netty4;
 
-import org.elasticsearch.ESNetty4IntegTestCase;
+import org.opensearch.OpenSearchNetty4IntegTestCase;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.elasticsearch.common.network.NetworkModule;
@@ -28,7 +28,7 @@
 import org.elasticsearch.common.transport.BoundTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.transport.Netty4Plugin;
+import org.opensearch.transport.Netty4Plugin;
 import org.elasticsearch.transport.TransportInfo;
 
 import java.net.Inet4Address;
@@ -38,11 +38,11 @@
 import static org.hamcrest.Matchers.instanceOf;
 
 /**
- * Checks that Elasticsearch produces a sane publish_address when it binds to
+ * Checks that OpenSearch produces a sane publish_address when it binds to
  * different ports on ipv4 and ipv6.
  */
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
-public class Netty4TransportPublishAddressIT extends ESNetty4IntegTestCase {
+public class Netty4TransportPublishAddressIT extends OpenSearchNetty4IntegTestCase {
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
         return Settings.builder()

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/transport/netty4/ESLoggingHandlerIT.java → modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.transport.netty4;
+package org.opensearch.transport.netty4;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
-import org.elasticsearch.ESNetty4IntegTestCase;
+import org.opensearch.OpenSearchNetty4IntegTestCase;
 import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequest;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.test.ESIntegTestCase;
@@ -34,29 +34,29 @@
 import java.io.IOException;
 
 @ESIntegTestCase.ClusterScope(numDataNodes = 2, scope = ESIntegTestCase.Scope.TEST)
-public class ESLoggingHandlerIT extends ESNetty4IntegTestCase {
+public class OpenSearchLoggingHandlerIT extends OpenSearchNetty4IntegTestCase {
 
     private MockLogAppender appender;
 
     public void setUp() throws Exception {
         super.setUp();
         appender = new MockLogAppender();
-        Loggers.addAppender(LogManager.getLogger(ESLoggingHandler.class), appender);
+        Loggers.addAppender(LogManager.getLogger(OpenSearchLoggingHandler.class), appender);
         Loggers.addAppender(LogManager.getLogger(TransportLogger.class), appender);
         Loggers.addAppender(LogManager.getLogger(TcpTransport.class), appender);
         appender.start();
     }
 
     public void tearDown() throws Exception {
-        Loggers.removeAppender(LogManager.getLogger(ESLoggingHandler.class), appender);
+        Loggers.removeAppender(LogManager.getLogger(OpenSearchLoggingHandler.class), appender);
         Loggers.removeAppender(LogManager.getLogger(TransportLogger.class), appender);
         Loggers.removeAppender(LogManager.getLogger(TcpTransport.class), appender);
         appender.stop();
         super.tearDown();
     }
 
     @TestLogging(
-            value = "org.elasticsearch.transport.netty4.ESLoggingHandler:trace,org.elasticsearch.transport.TransportLogger:trace",
+            value = "org.opensearch.transport.netty4.ESLoggingHandler:trace,org.opensearch.transport.TransportLogger:trace",
             reason = "to ensure we log network events on TRACE level")
     public void testLoggingHandler() {
         final String writePattern =
@@ -71,7 +71,7 @@ public void testLoggingHandler() {
                         "hot threads request", TransportLogger.class.getCanonicalName(), Level.TRACE, writePattern);
 
         final MockLogAppender.LoggingExpectation flushExpectation =
-                new MockLogAppender.SeenEventExpectation("flush", ESLoggingHandler.class.getCanonicalName(), Level.TRACE, "*FLUSH*");
+                new MockLogAppender.SeenEventExpectation("flush", OpenSearchLoggingHandler.class.getCanonicalName(), Level.TRACE, "*FLUSH*");
 
         final String readPattern =
                 ".*\\[length: \\d+" +
@@ -92,7 +92,7 @@ public void testLoggingHandler() {
         appender.assertAllExpectationsMatched();
     }
 
-    @TestLogging(value = "org.elasticsearch.transport.TcpTransport:DEBUG", reason = "to ensure we log connection events on DEBUG level")
+    @TestLogging(value = "org.opensearch.transport.TcpTransport:DEBUG", reason = "to ensure we log connection events on DEBUG level")
     public void testConnectionLogging() throws IOException {
         appender.addExpectation(new MockLogAppender.PatternSeenEventExpectation("open connection log",
                 TcpTransport.class.getCanonicalName(), Level.DEBUG,

modules/transport-netty4/src/javaRestTest/java/org/elasticsearch/rest/Netty4BadRequestIT.java → modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest;
+package org.opensearch.rest;
 
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;

modules/transport-netty4/src/javaRestTest/java/org/elasticsearch/rest/Netty4HeadBodyIsEmptyIT.java → modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest;
+package org.opensearch.rest;
 
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpChannel.java → modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java

@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.channel.Channel;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.common.concurrent.CompletableContext;
 import org.elasticsearch.http.HttpChannel;
 import org.elasticsearch.http.HttpResponse;
-import org.elasticsearch.transport.netty4.Netty4TcpChannel;
+import org.opensearch.transport.netty4.Netty4TcpChannel;
 
 import java.net.InetSocketAddress;
 

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpPipeliningHandler.java → modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandler.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java → modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -34,7 +34,7 @@
 import org.elasticsearch.http.HttpRequest;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.transport.netty4.Netty4Utils;
+import org.opensearch.transport.netty4.Netty4Utils;
 
 import java.util.AbstractMap;
 import java.util.Collection;

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequestCreator.java → modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestCreator.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;

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

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpResponse.java → modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpResponse.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.http.netty4;
+package org.opensearch.http.netty4;
 
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.HttpHeaders;
@@ -26,7 +26,7 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.http.HttpResponse;
 import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.transport.netty4.Netty4Utils;
+import org.opensearch.transport.netty4.Netty4Utils;
 
 public class Netty4HttpResponse extends DefaultFullHttpResponse implements HttpResponse {