Default transport and HTTP to Netty 4

This commit sets the default transport and HTTP implementation to use
transport-netty4.

Relates #19563

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

@@ -80,8 +80,8 @@ public class PreBuiltTransportClient extends TransportClient {
         @Override
         public Settings additionalSettings() {
             return Settings.builder()
-                    .put(NetworkModule.TRANSPORT_TYPE_KEY, Netty3Plugin.NETTY_TRANSPORT_NAME)
-                    .put(NetworkModule.HTTP_TYPE_KEY, Netty3Plugin.NETTY_HTTP_TRANSPORT_NAME)
+                    .put(NetworkModule.TRANSPORT_TYPE_KEY, Netty4Plugin.NETTY_TRANSPORT_NAME)
+                    .put(NetworkModule.HTTP_TYPE_KEY, Netty4Plugin.NETTY_HTTP_TRANSPORT_NAME)
                     .put("netty.assert.buglevel", true)
                     .build();
         }

modules/transport-netty3/build.gradle

@@ -36,6 +36,15 @@ dependencies {
     compile 'io.netty:netty:3.10.6.Final'
 }
 
+integTest {
+    includePackaged = true
+    cluster {
+        setting 'http.type', 'netty3'
+        setting 'transport.type', 'netty3'
+        numNodes = 2
+    }
+}
+
 thirdPartyAudit.excludes = [
         // uses internal java api: sun.security.x509 (X509CertInfo, X509CertImpl, X500Name)
         'org.jboss.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',

modules/transport-netty3/src/main/java/org/elasticsearch/transport/Netty3Plugin.java

@@ -83,16 +83,6 @@ public class Netty3Plugin extends Plugin {
         );
     }
 
-    @Override
-    public Settings additionalSettings() {
-        return Settings.builder()
-            // here we set the netty3 transport and http transport as the default. This is a set once setting
-            // ie. if another plugin does that as well the server will fail - only one default network can exist!
-            .put(NetworkModule.HTTP_DEFAULT_TYPE_SETTING.getKey(), NETTY_HTTP_TRANSPORT_NAME)
-            .put(NetworkModule.TRANSPORT_DEFAULT_TYPE_SETTING.getKey(), NETTY_TRANSPORT_NAME)
-            .build();
-    }
-
     public void onModule(NetworkModule networkModule) {
         if (networkModule.canRegisterHttpExtensions()) {
             networkModule.registerHttpTransport(NETTY_HTTP_TRANSPORT_NAME, Netty3HttpServerTransport.class);

modules/transport-netty4/build.gradle

@@ -45,8 +45,6 @@ dependencies {
 integTest {
     includePackaged = true
     cluster {
-        setting 'http.type', 'netty4'
-        setting 'transport.type', 'netty4'
         numNodes = 2
     }
 }

modules/transport-netty4/src/main/java/org/elasticsearch/transport/Netty4Plugin.java

@@ -84,6 +84,16 @@ public class Netty4Plugin extends Plugin {
         );
     }
 
+    @Override
+    public Settings additionalSettings() {
+        return Settings.builder()
+                // here we set the netty4 transport and http transport as the default. This is a set once setting
+                // ie. if another plugin does that as well the server will fail - only one default network can exist!
+                .put(NetworkModule.HTTP_DEFAULT_TYPE_SETTING.getKey(), NETTY_HTTP_TRANSPORT_NAME)
+                .put(NetworkModule.TRANSPORT_DEFAULT_TYPE_SETTING.getKey(), NETTY_TRANSPORT_NAME)
+                .build();
+    }
+
     public void onModule(NetworkModule networkModule) {
         if (networkModule.canRegisterHttpExtensions()) {
             networkModule.registerHttpTransport(NETTY_HTTP_TRANSPORT_NAME, Netty4HttpServerTransport.class);