Introduce Netty 4

build.gradle

@@ -175,6 +175,7 @@ subprojects {
     "org.elasticsearch.test:logger-usage:${version}": ':test:logger-usage',
     // for transport client
     "org.elasticsearch.plugin:transport-netty3-client:${version}": ':modules:transport-netty3',
+    "org.elasticsearch.plugin:transport-netty4-client:${version}": ':modules:transport-netty4',
     "org.elasticsearch.plugin:reindex-client:${version}": ':modules:reindex',
     "org.elasticsearch.plugin:lang-mustache-client:${version}": ':modules:lang-mustache',
     "org.elasticsearch.plugin:percolator-client:${version}": ':modules:percolator',

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -297,6 +297,10 @@ class BuildPlugin implements Plugin<Project> {
                 url "http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/${revision}"
             }
         }
+        repos.maven {
+            name 'netty-snapshots'
+            url "http://s3.amazonaws.com/download.elasticsearch.org/nettysnapshots/20160722"
+        }
     }
 
     /** Returns a closure which can be used with a MavenPom for removing transitive dependencies. */

client/transport/build.gradle

@@ -26,6 +26,7 @@ group = 'org.elasticsearch.client'
 dependencies {
   compile "org.elasticsearch:elasticsearch:${version}"
   compile project(path: ':modules:transport-netty3', configuration: 'runtime')
+  compile project(path: ':modules:transport-netty4', configuration: 'runtime')
   compile project(path: ':modules:reindex', configuration: 'runtime')
   compile project(path: ':modules:lang-mustache', configuration: 'runtime')
   compile project(path: ':modules:percolator', configuration: 'runtime')

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

@@ -16,30 +16,47 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.elasticsearch.transport.client;
 
 import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.network.NetworkModule;
+import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.reindex.ReindexPlugin;
 import org.elasticsearch.percolator.PercolatorPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.mustache.MustachePlugin;
 import org.elasticsearch.transport.Netty3Plugin;
+import org.elasticsearch.transport.Netty4Plugin;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-
+import java.util.List;
 
 /**
  * A builder to create an instance of {@link TransportClient}
- * This class pre-installs the {@link Netty3Plugin}, {@link ReindexPlugin}, {@link PercolatorPlugin}, and {@link MustachePlugin}
+ * This class pre-installs the
+ * {@link Netty3Plugin},
+ * {@link Netty4Plugin},
+ * {@link ReindexPlugin},
+ * {@link PercolatorPlugin},
+ * and {@link MustachePlugin}
  * for the client. These plugins are all elasticsearch core modules required.
  */
 @SuppressWarnings({"unchecked","varargs"})
 public class PreBuiltTransportClient extends TransportClient {
-    private static final Collection<Class<? extends Plugin>> PRE_INSTALLED_PLUGINS = Collections.unmodifiableList(Arrays.asList(
-        TransportPlugin.class, ReindexPlugin.class, PercolatorPlugin.class, MustachePlugin.class));
+
+    private static final Collection<Class<? extends Plugin>> PRE_INSTALLED_PLUGINS =
+            Collections.unmodifiableList(
+                    Arrays.asList(
+                            Netty3Plugin.class,
+                            Netty4Plugin.class,
+                            TransportPlugin.class,
+                            ReindexPlugin.class,
+                            PercolatorPlugin.class,
+                            MustachePlugin.class));
 
     @SafeVarargs
     public PreBuiltTransportClient(Settings settings, Class<? extends Plugin>... plugins) {
@@ -50,14 +67,25 @@ public PreBuiltTransportClient(Settings settings, Collection<Class<? extends Plu
         super(settings, Settings.EMPTY, addPlugins(plugins, PRE_INSTALLED_PLUGINS));
     }
 
-    /**
-     * The default transport implementation for the transport client.
-     */
-    public static final class TransportPlugin extends Netty3Plugin {
-        // disable assertions for permissions since we might not have the permissions here
-        // compared to if we are loaded as a real module to the es server
-        public TransportPlugin(Settings settings) {
-            super(Settings.builder().put("netty.assert.buglevel", false).put(settings).build());
+    public static final class TransportPlugin extends Plugin {
+
+        private static final Setting<Boolean> ASSERT_NETTY_BUGLEVEL =
+                Setting.boolSetting("netty.assert.buglevel", true, Setting.Property.NodeScope);
+
+        @Override
+        public List<Setting<?>> getSettings() {
+            return Collections.singletonList(ASSERT_NETTY_BUGLEVEL);
         }
+
+        @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("netty.assert.buglevel", true)
+                    .build();
+        }
+
     }
+
 }

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

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.elasticsearch.transport.client;
 
 import com.carrotsearch.randomizedtesting.RandomizedTest;
@@ -57,4 +58,5 @@ public void testInstallPluginTwice() {
             }
         }
     }
+
 }

core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java

@@ -21,7 +21,6 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefIterator;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.common.util.ByteArray;
 
@@ -36,24 +35,24 @@ public class PagedBytesReference extends BytesReference {
     private static final int PAGE_SIZE = BigArrays.BYTE_PAGE_SIZE;
 
     private final BigArrays bigarrays;
-    protected final ByteArray bytearray;
+    protected final ByteArray byteArray;
     private final int offset;
     private final int length;
 
-    public PagedBytesReference(BigArrays bigarrays, ByteArray bytearray, int length) {
-        this(bigarrays, bytearray, 0, length);
+    public PagedBytesReference(BigArrays bigarrays, ByteArray byteArray, int length) {
+        this(bigarrays, byteArray, 0, length);
     }
 
-    public PagedBytesReference(BigArrays bigarrays, ByteArray bytearray, int from, int length) {
+    public PagedBytesReference(BigArrays bigarrays, ByteArray byteArray, int from, int length) {
         this.bigarrays = bigarrays;
-        this.bytearray = bytearray;
+        this.byteArray = byteArray;
         this.offset = from;
         this.length = length;
     }
 
     @Override
     public byte get(int index) {
-        return bytearray.get(offset + index);
+        return byteArray.get(offset + index);
     }
 
     @Override
@@ -66,14 +65,14 @@ public BytesReference slice(int from, int length) {
         if (from < 0 || (from + length) > length()) {
             throw new IllegalArgumentException("can't slice a buffer with length [" + length() + "], with slice parameters from [" + from + "], length [" + length + "]");
         }
-        return new PagedBytesReference(bigarrays, bytearray, offset + from, length);
+        return new PagedBytesReference(bigarrays, byteArray, offset + from, length);
     }
 
     @Override
     public BytesRef toBytesRef() {
         BytesRef bref = new BytesRef();
         // if length <= pagesize this will dereference the page, or materialize the byte[]
-        bytearray.get(offset, length, bref);
+        byteArray.get(offset, length, bref);
         return bref;
     }
 
@@ -95,7 +94,7 @@ public final BytesRefIterator iterator() {
             @Override
             public BytesRef next() throws IOException {
                 if (nextFragmentSize != 0) {
-                    final boolean materialized = bytearray.get(offset + position, nextFragmentSize, slice);
+                    final boolean materialized = byteArray.get(offset + position, nextFragmentSize, slice);
                     assert materialized == false : "iteration should be page aligned but array got materialized";
                     position += nextFragmentSize;
                     final int remaining = length - position;
@@ -111,6 +110,6 @@ public BytesRef next() throws IOException {
 
     @Override
     public long ramBytesUsed() {
-        return bytearray.ramBytesUsed();
+        return byteArray.ramBytesUsed();
     }
 }

core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java

@@ -30,12 +30,13 @@
  */
 public final class ReleasablePagedBytesReference extends PagedBytesReference implements Releasable {
 
-    public ReleasablePagedBytesReference(BigArrays bigarrays, ByteArray bytearray, int length) {
-        super(bigarrays, bytearray, length);
+    public ReleasablePagedBytesReference(BigArrays bigarrays, ByteArray byteArray, int length) {
+        super(bigarrays, byteArray, length);
     }
 
     @Override
     public void close() {
-        Releasables.close(bytearray);
+        Releasables.close(byteArray);
     }
+
 }

core/src/main/java/org/elasticsearch/common/io/ReleasableBytesStream.java

@@ -28,4 +28,5 @@ public interface ReleasableBytesStream extends BytesStream {
 
     @Override
     ReleasablePagedBytesReference bytes();
+
 }

core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java

@@ -33,7 +33,7 @@
  */
 public class BytesStreamOutput extends StreamOutput implements BytesStream {
 
-    protected final BigArrays bigarrays;
+    protected final BigArrays bigArrays;
 
     protected ByteArray bytes;
     protected int count;
@@ -57,9 +57,9 @@ public BytesStreamOutput(int expectedSize) {
         this(expectedSize, BigArrays.NON_RECYCLING_INSTANCE);
     }
 
-    protected BytesStreamOutput(int expectedSize, BigArrays bigarrays) {
-        this.bigarrays = bigarrays;
-        this.bytes = bigarrays.newByteArray(expectedSize);
+    protected BytesStreamOutput(int expectedSize, BigArrays bigArrays) {
+        this.bigArrays = bigArrays;
+        this.bytes = bigArrays.newByteArray(expectedSize);
     }
 
     @Override
@@ -100,7 +100,7 @@ public void writeBytes(byte[] b, int offset, int length) throws IOException {
     public void reset() {
         // shrink list of pages
         if (bytes.size() > BigArrays.PAGE_SIZE_IN_BYTES) {
-            bytes = bigarrays.resize(bytes, BigArrays.PAGE_SIZE_IN_BYTES);
+            bytes = bigArrays.resize(bytes, BigArrays.PAGE_SIZE_IN_BYTES);
         }
 
         // go back to start
@@ -145,7 +145,7 @@ public int size() {
 
     @Override
     public BytesReference bytes() {
-        return new PagedBytesReference(bigarrays, bytes, count);
+        return new PagedBytesReference(bigArrays, bytes, count);
     }
 
     /**
@@ -157,7 +157,7 @@ public long ramBytesUsed() {
     }
 
     private void ensureCapacity(int offset) {
-        bytes = bigarrays.grow(bytes, offset);
+        bytes = bigArrays.grow(bytes, offset);
     }
 
 }

core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java

@@ -36,12 +36,13 @@ public ReleasableBytesStreamOutput(BigArrays bigarrays) {
         super(BigArrays.PAGE_SIZE_IN_BYTES, bigarrays);
     }
 
-    public ReleasableBytesStreamOutput(int expectedSize, BigArrays bigarrays) {
-        super(expectedSize, bigarrays);
+    public ReleasableBytesStreamOutput(int expectedSize, BigArrays bigArrays) {
+        super(expectedSize, bigArrays);
     }
 
     @Override
     public ReleasablePagedBytesReference bytes() {
-        return new ReleasablePagedBytesReference(bigarrays, bytes, count);
+        return new ReleasablePagedBytesReference(bigArrays, bytes, count);
     }
+
 }

core/src/main/java/org/elasticsearch/common/lease/Releasable.java

@@ -30,4 +30,5 @@ public interface Releasable extends Closeable {
 
     @Override
     void close();
+
 }

core/src/main/java/org/elasticsearch/http/HttpServerAdapter.java

@@ -29,4 +29,5 @@
 public interface HttpServerAdapter {
 
     void dispatchRequest(RestRequest request, RestChannel channel, ThreadContext context);
+
 }

core/src/main/java/org/elasticsearch/http/HttpServerTransport.java

@@ -22,9 +22,6 @@
 import org.elasticsearch.common.component.LifecycleComponent;
 import org.elasticsearch.common.transport.BoundTransportAddress;
 
-/**
- *
- */
 public interface HttpServerTransport extends LifecycleComponent {
 
     BoundTransportAddress boundAddress();
@@ -34,4 +31,5 @@ public interface HttpServerTransport extends LifecycleComponent {
     HttpStats stats();
 
     void httpServerAdapter(HttpServerAdapter httpServerAdapter);
+
 }

core/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java

@@ -101,4 +101,5 @@ public RestRequest request() {
     public boolean detailedErrorsEnabled() {
         return detailedErrorsEnabled;
     }
+
 }

core/src/main/java/org/elasticsearch/rest/RestChannel.java

@@ -30,6 +30,7 @@
  * A channel used to construct bytes / builder based outputs, and send responses.
  */
 public interface RestChannel {
+
     XContentBuilder newBuilder() throws IOException;
 
     XContentBuilder newErrorBuilder() throws IOException;
@@ -46,4 +47,5 @@ public interface RestChannel {
     boolean detailedErrorsEnabled();
 
     void sendResponse(RestResponse response);
+
 }

core/src/main/java/org/elasticsearch/rest/RestController.java

@@ -193,7 +193,7 @@ public void dispatchRequest(final RestRequest request, final RestChannel channel
         if (!checkRequestParameters(request, channel)) {
             return;
         }
-        try (ThreadContext.StoredContext t = threadContext.stashContext()) {
+        try (ThreadContext.StoredContext ignored = threadContext.stashContext()) {
             for (String key : headersToCopy) {
                 String httpHeader = request.header(key);
                 if (httpHeader != null) {