54f102feb9
Motivation:
At the moment we basically drop all non prefered addresses when calling DnsNameResolver.resolveAll(...). This is just incorrect and was introduced by 4cd39cc4b3. More correct is to still retain these but sort the returned List to have the prefered addresses on the beginning of the List. This also ensures resolve(...) will return the correct return type.
Modifications:
- Introduce PreferredAddressTypeComperator which we use to sort the List so it will contain the preferred address type first.
- Add unit test to verify behaviour
Result:
Include not only preferred addresses in the List that is returned by resolveAll(...)
55 lines
1.9 KiB
Java
55 lines
1.9 KiB
Java
/*
|
|
* Copyright 2019 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.resolver.dns;
|
|
|
|
import io.netty.channel.socket.InternetProtocolFamily;
|
|
|
|
import java.net.Inet4Address;
|
|
import java.net.Inet6Address;
|
|
import java.net.InetAddress;
|
|
import java.util.Comparator;
|
|
|
|
final class PreferredAddressTypeComparator implements Comparator<InetAddress> {
|
|
|
|
private static final PreferredAddressTypeComparator IPv4 = new PreferredAddressTypeComparator(Inet4Address.class);
|
|
private static final PreferredAddressTypeComparator IPv6 = new PreferredAddressTypeComparator(Inet6Address.class);
|
|
|
|
static PreferredAddressTypeComparator comparator(InternetProtocolFamily family) {
|
|
switch (family) {
|
|
case IPv4:
|
|
return IPv4;
|
|
case IPv6:
|
|
return IPv6;
|
|
default:
|
|
throw new IllegalArgumentException();
|
|
}
|
|
}
|
|
|
|
private final Class<? extends InetAddress> preferredAddressType;
|
|
|
|
private PreferredAddressTypeComparator(Class<? extends InetAddress> preferredAddressType) {
|
|
this.preferredAddressType = preferredAddressType;
|
|
}
|
|
|
|
@Override
|
|
public int compare(InetAddress o1, InetAddress o2) {
|
|
if (o1.getClass() == o2.getClass()) {
|
|
return 0;
|
|
}
|
|
return preferredAddressType.isAssignableFrom(o1.getClass()) ? -1 : 1;
|
|
}
|
|
}
|