andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Java 8 migration. Replace Collections.sort(list, comparator) with list.sort(comparator) (#8754)

Browse Source 
Motivation:

Simplify code with new Java 8 api.

Modification:

Use new Java8 api

Result:

Use new Java8 features
This commit is contained in:
Dmitriy Dumanskiy 2019-01-22 17:56:14 +02:00 committed by Norman Maurer
parent afc03da93b
commit b0e59e7b13
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resolver-dns/src/main/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCache.java
View File

@ -20,12 +20,13 @@ import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.UnstableApi; import io.netty.util.internal.UnstableApi;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import static io.netty.util.internal.ObjectUtil.*; import static io.netty.util.internal.ObjectUtil.checkNotNull;
import static io.netty.util.internal.ObjectUtil.checkPositive;
import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero;
/** /**
* Default implementation of {@link AuthoritativeDnsServerCache}, backed by a {@link ConcurrentMap}. * Default implementation of {@link AuthoritativeDnsServerCache}, backed by a {@link ConcurrentMap}.
@ -53,7 +54,7 @@ public class DefaultAuthoritativeDnsServerCache implements AuthoritativeDnsServe
@Override @Override
protected void sortEntries(String hostname, List<InetSocketAddress> entries) { protected void sortEntries(String hostname, List<InetSocketAddress> entries) {
if (comparator != null) { if (comparator != null) {
Collections.sort(entries, comparator); entries.sort(comparator);
} }
} }
}; };
@ -83,7 +84,6 @@ public class DefaultAuthoritativeDnsServerCache implements AuthoritativeDnsServe
this.comparator = comparator; this.comparator = comparator;
} }
@SuppressWarnings("unchecked")
@Override @Override
public DnsServerAddressStream get(String hostname) { public DnsServerAddressStream get(String hostname) {
checkNotNull(hostname, "hostname"); checkNotNull(hostname, "hostname");

22
resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java
View File

@ -383,7 +383,7 @@ public class DnsNameResolver extends InetNameResolver {
b.group(executor()); b.group(executor());
b.channelFactory(channelFactory); b.channelFactory(channelFactory);
b.option(ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION, true); b.option(ChannelOption.DATAGRAM_CHANNEL_ACTIVE_ON_REGISTRATION, true);
final DnsResponseHandler responseHandler = new DnsResponseHandler(executor().<Channel>newPromise()); final DnsResponseHandler responseHandler = new DnsResponseHandler(executor().newPromise());
b.handler(new ChannelInitializer<DatagramChannel>() { b.handler(new ChannelInitializer<DatagramChannel>() {
@Override @Override
protected void initChannel(DatagramChannel ch) throws Exception { protected void initChannel(DatagramChannel ch) throws Exception {
@ -455,7 +455,7 @@ public class DnsNameResolver extends InetNameResolver {
if (cached == null || cached.size() == 0) { if (cached == null || cached.size() == 0) {
// If there is no cache hit (which may be the case for example when a NoopAuthoritativeDnsServerCache // If there is no cache hit (which may be the case for example when a NoopAuthoritativeDnsServerCache
// is used), we will just directly use the provided nameservers. // is used), we will just directly use the provided nameservers.
Collections.sort(nameservers, nameServerComparator); nameservers.sort(nameServerComparator);
return new SequentialDnsServerAddressStream(nameservers, 0); return new SequentialDnsServerAddressStream(nameservers, 0);
} }
return cached; return cached;
@ -610,7 +610,7 @@ public class DnsNameResolver extends InetNameResolver {
* @return the address as the result of the resolution * @return the address as the result of the resolution
*/ */
public final Future<InetAddress> resolve(String inetHost, Iterable<DnsRecord> additionals) { public final Future<InetAddress> resolve(String inetHost, Iterable<DnsRecord> additionals) {
return resolve(inetHost, additionals, executor().<InetAddress>newPromise()); return resolve(inetHost, additionals, executor().newPromise());
} }
/** /**
@ -643,7 +643,7 @@ public class DnsNameResolver extends InetNameResolver {
* @return the list of the address as the result of the resolution * @return the list of the address as the result of the resolution
*/ */
public final Future<List<InetAddress>> resolveAll(String inetHost, Iterable<DnsRecord> additionals) { public final Future<List<InetAddress>> resolveAll(String inetHost, Iterable<DnsRecord> additionals) {
return resolveAll(inetHost, additionals, executor().<List<InetAddress>>newPromise()); return resolveAll(inetHost, additionals, executor().newPromise());
} }
/** /**
@ -684,7 +684,7 @@ public class DnsNameResolver extends InetNameResolver {
* @return the list of the {@link DnsRecord}s as the result of the resolution * @return the list of the {@link DnsRecord}s as the result of the resolution
*/ */
public final Future<List<DnsRecord>> resolveAll(DnsQuestion question) { public final Future<List<DnsRecord>> resolveAll(DnsQuestion question) {
return resolveAll(question, EMPTY_ADDITIONALS, executor().<List<DnsRecord>>newPromise()); return resolveAll(question, EMPTY_ADDITIONALS, executor().newPromise());
} }
/** /**
@ -700,7 +700,7 @@ public class DnsNameResolver extends InetNameResolver {
* @return the list of the {@link DnsRecord}s as the result of the resolution * @return the list of the {@link DnsRecord}s as the result of the resolution
*/ */
public final Future<List<DnsRecord>> resolveAll(DnsQuestion question, Iterable<DnsRecord> additionals) { public final Future<List<DnsRecord>> resolveAll(DnsQuestion question, Iterable<DnsRecord> additionals) {
return resolveAll(question, additionals, executor().<List<DnsRecord>>newPromise()); return resolveAll(question, additionals, executor().newPromise());
} }
/** /**
@ -769,7 +769,7 @@ public class DnsNameResolver extends InetNameResolver {
for (DnsRecord r: additionals) { for (DnsRecord r: additionals) {
validateAdditional(r, validateType); validateAdditional(r, validateType);
} }
return records.toArray(new DnsRecord[records.size()]); return records.toArray(new DnsRecord[0]);
} }
Iterator<DnsRecord> additionalsIt = additionals.iterator(); Iterator<DnsRecord> additionalsIt = additionals.iterator();
@ -783,7 +783,7 @@ public class DnsNameResolver extends InetNameResolver {
records.add(r); records.add(r);
} while (additionalsIt.hasNext()); } while (additionalsIt.hasNext());
return records.toArray(new DnsRecord[records.size()]); return records.toArray(new DnsRecord[0]);
} }
private static void validateAdditional(DnsRecord record, boolean validateType) { private static void validateAdditional(DnsRecord record, boolean validateType) {
@ -1024,7 +1024,7 @@ public class DnsNameResolver extends InetNameResolver {
*/ */
public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query( public Future<AddressedEnvelope<DnsResponse, InetSocketAddress>> query(
DnsQuestion question, Promise<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>> promise) { DnsQuestion question, Promise<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>> promise) {
return query(nextNameServerAddress(), question, Collections.<DnsRecord>emptyList(), promise); return query(nextNameServerAddress(), question, Collections.emptyList(), promise);
} }
private InetSocketAddress nextNameServerAddress() { private InetSocketAddress nextNameServerAddress() {
@ -1038,7 +1038,7 @@ public class DnsNameResolver extends InetNameResolver {
InetSocketAddress nameServerAddr, DnsQuestion question) { InetSocketAddress nameServerAddr, DnsQuestion question) {
return query0(nameServerAddr, question, EMPTY_ADDITIONALS, true, ch.newPromise(), return query0(nameServerAddr, question, EMPTY_ADDITIONALS, true, ch.newPromise(),
ch.eventLoop().<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>>newPromise()); ch.eventLoop().newPromise());
} }
/** /**
@ -1048,7 +1048,7 @@ public class DnsNameResolver extends InetNameResolver {
InetSocketAddress nameServerAddr, DnsQuestion question, Iterable<DnsRecord> additionals) { InetSocketAddress nameServerAddr, DnsQuestion question, Iterable<DnsRecord> additionals) {
return query0(nameServerAddr, question, toArray(additionals, false), true, ch.newPromise(), return query0(nameServerAddr, question, toArray(additionals, false), true, ch.newPromise(),
ch.eventLoop().<AddressedEnvelope<? extends DnsResponse, InetSocketAddress>>newPromise()); ch.eventLoop().newPromise());
} }
/** /**