Skip to content

Commit 634a8af

Browse files
fenik17normanmaurer
authored andcommitted
Fix some warnings at generics usage
Motivation: Existing warnings from java compiler Modifications: Add/fix type parameters Result: Less warnings
1 parent ce22230 commit 634a8af

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

codec-xml/src/main/java/io/netty/handler/codec/xml/XmlDecoder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class XmlDecoder extends ByteToMessageDecoder {
3838
private static final AsyncXMLInputFactory XML_INPUT_FACTORY = new InputFactoryImpl();
3939
private static final XmlDocumentEnd XML_DOCUMENT_END = XmlDocumentEnd.INSTANCE;
4040

41-
private final AsyncXMLStreamReader streamReader = XML_INPUT_FACTORY.createAsyncForByteArray();
41+
private final AsyncXMLStreamReader<AsyncByteArrayFeeder> streamReader = XML_INPUT_FACTORY.createAsyncForByteArray();
4242
private final AsyncByteArrayFeeder streamFeeder = (AsyncByteArrayFeeder) streamReader.getInputFeeder();
4343

4444
@Override

common/src/main/java/io/netty/util/concurrent/DefaultPromise.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ private void notifyListenersNow() {
478478
if (listeners instanceof DefaultFutureListeners) {
479479
notifyListeners0((DefaultFutureListeners) listeners);
480480
} else {
481-
notifyListener0(this, (GenericFutureListener<? extends Future<V>>) listeners);
481+
notifyListener0(this, (GenericFutureListener<?>) listeners);
482482
}
483483
synchronized (this) {
484484
if (this.listeners == null) {
@@ -516,7 +516,7 @@ private void addListener0(GenericFutureListener<? extends Future<? super V>> lis
516516
} else if (listeners instanceof DefaultFutureListeners) {
517517
((DefaultFutureListeners) listeners).add(listener);
518518
} else {
519-
listeners = new DefaultFutureListeners((GenericFutureListener<? extends Future<V>>) listeners, listener);
519+
listeners = new DefaultFutureListeners((GenericFutureListener<?>) listeners, listener);
520520
}
521521
}
522522

microbench/src/main/java/io/netty/microbench/headers/HeadersBenchmark.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ public void http2AddAllSlow(Blackhole bh) {
210210
}
211211

212212
private static final class SlowHeaders implements Headers<CharSequence, CharSequence, SlowHeaders> {
213-
private final Headers<CharSequence, CharSequence, ? extends Headers> delegate;
214-
private SlowHeaders(Headers<CharSequence, CharSequence, ? extends Headers> delegate) {
213+
private final Headers<CharSequence, CharSequence, ? extends Headers<?, ?, ?>> delegate;
214+
private SlowHeaders(Headers<CharSequence, CharSequence, ? extends Headers<?, ?, ?>> delegate) {
215215
this.delegate = delegate;
216216
}
217217

resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private void doResolveRec(final String inetHost,
6868
if (resolverIndex >= resolvers.length) {
6969
promise.setFailure(lastFailure);
7070
} else {
71-
NameResolver resolver = resolvers[resolverIndex];
71+
NameResolver<T> resolver = resolvers[resolverIndex];
7272
resolver.resolve(inetHost).addListener(new FutureListener<T>() {
7373
@Override
7474
public void operationComplete(Future<T> future) throws Exception {
@@ -94,7 +94,7 @@ private void doResolveAllRec(final String inetHost,
9494
if (resolverIndex >= resolvers.length) {
9595
promise.setFailure(lastFailure);
9696
} else {
97-
NameResolver resolver = resolvers[resolverIndex];
97+
NameResolver<T> resolver = resolvers[resolverIndex];
9898
resolver.resolveAll(inetHost).addListener(new FutureListener<List<T>>() {
9999
@Override
100100
public void operationComplete(Future<List<T>> future) throws Exception {

transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.netty.util.ReferenceCountUtil;
2525
import io.netty.util.concurrent.FastThreadLocal;
2626
import io.netty.util.internal.InternalThreadLocalMap;
27-
import io.netty.util.internal.PlatformDependent;
2827
import io.netty.util.internal.PromiseNotificationUtil;
2928
import io.netty.util.internal.SystemPropertyUtil;
3029
import io.netty.util.internal.logging.InternalLogger;
@@ -755,7 +754,7 @@ public interface MessageProcessor {
755754
static final class Entry {
756755
private static final Recycler<Entry> RECYCLER = new Recycler<Entry>() {
757756
@Override
758-
protected Entry newObject(Handle handle) {
757+
protected Entry newObject(Handle<Entry> handle) {
759758
return new Entry(handle);
760759
}
761760
};

0 commit comments

Comments
 (0)