Fix some warnings at generics usage

Motivation: Existing warnings from java compiler Modifications: Add/fix type parameters Result: Less warnings
initpassion · Feb 22, 2017 · 634a8af · 634a8af
1 parent ce22230
commit 634a8af
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDecoder.java b/codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDecoder.java
@@ -38,7 +38,7 @@ public class XmlDecoder extends ByteToMessageDecoder {
     private static final AsyncXMLInputFactory XML_INPUT_FACTORY = new InputFactoryImpl();
     private static final XmlDocumentEnd XML_DOCUMENT_END = XmlDocumentEnd.INSTANCE;
 
-    private final AsyncXMLStreamReader streamReader = XML_INPUT_FACTORY.createAsyncForByteArray();
+    private final AsyncXMLStreamReader<AsyncByteArrayFeeder> streamReader = XML_INPUT_FACTORY.createAsyncForByteArray();
     private final AsyncByteArrayFeeder streamFeeder = (AsyncByteArrayFeeder) streamReader.getInputFeeder();
 
     @Override

diff --git a/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java b/common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
@@ -478,7 +478,7 @@ private void notifyListenersNow() {
             if (listeners instanceof DefaultFutureListeners) {
                 notifyListeners0((DefaultFutureListeners) listeners);
             } else {
-                notifyListener0(this, (GenericFutureListener<? extends Future<V>>) listeners);
+                notifyListener0(this, (GenericFutureListener<?>) listeners);
             }
             synchronized (this) {
                 if (this.listeners == null) {
@@ -516,7 +516,7 @@ private void addListener0(GenericFutureListener<? extends Future<? super V>> lis
         } else if (listeners instanceof DefaultFutureListeners) {
             ((DefaultFutureListeners) listeners).add(listener);
         } else {
-            listeners = new DefaultFutureListeners((GenericFutureListener<? extends Future<V>>) listeners, listener);
+            listeners = new DefaultFutureListeners((GenericFutureListener<?>) listeners, listener);
         }
     }
 

diff --git a/microbench/src/main/java/io/netty/microbench/headers/HeadersBenchmark.java b/microbench/src/main/java/io/netty/microbench/headers/HeadersBenchmark.java
@@ -210,8 +210,8 @@ public void http2AddAllSlow(Blackhole bh) {
     }
 
     private static final class SlowHeaders implements Headers<CharSequence, CharSequence, SlowHeaders> {
-        private final Headers<CharSequence, CharSequence, ? extends Headers> delegate;
-        private SlowHeaders(Headers<CharSequence, CharSequence, ? extends Headers> delegate) {
+        private final Headers<CharSequence, CharSequence, ? extends Headers<?, ?, ?>> delegate;
+        private SlowHeaders(Headers<CharSequence, CharSequence, ? extends Headers<?, ?, ?>> delegate) {
             this.delegate = delegate;
         }
 

diff --git a/resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java b/resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java
@@ -68,7 +68,7 @@ private void doResolveRec(final String inetHost,
         if (resolverIndex >= resolvers.length) {
             promise.setFailure(lastFailure);
         } else {
-            NameResolver resolver = resolvers[resolverIndex];
+            NameResolver<T> resolver = resolvers[resolverIndex];
             resolver.resolve(inetHost).addListener(new FutureListener<T>() {
                 @Override
                 public void operationComplete(Future<T> future) throws Exception {
@@ -94,7 +94,7 @@ private void doResolveAllRec(final String inetHost,
         if (resolverIndex >= resolvers.length) {
             promise.setFailure(lastFailure);
         } else {
-            NameResolver resolver = resolvers[resolverIndex];
+            NameResolver<T> resolver = resolvers[resolverIndex];
             resolver.resolveAll(inetHost).addListener(new FutureListener<List<T>>() {
                 @Override
                 public void operationComplete(Future<List<T>> future) throws Exception {

diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
@@ -24,7 +24,6 @@
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.concurrent.FastThreadLocal;
 import io.netty.util.internal.InternalThreadLocalMap;
-import io.netty.util.internal.PlatformDependent;
 import io.netty.util.internal.PromiseNotificationUtil;
 import io.netty.util.internal.SystemPropertyUtil;
 import io.netty.util.internal.logging.InternalLogger;
@@ -755,7 +754,7 @@ public interface MessageProcessor {
     static final class Entry {
         private static final Recycler<Entry> RECYCLER = new Recycler<Entry>() {
             @Override
-            protected Entry newObject(Handle handle) {
+            protected Entry newObject(Handle<Entry> handle) {
                 return new Entry(handle);
             }
         };