This commit is contained in:
Looly 2019-10-16 09:59:50 +08:00
parent ab4f58bb31
commit 106556248d

View File

@ -312,7 +312,7 @@ public class NetUtil {
return null;
}
return CollectionUtil.addAll(new ArrayList<NetworkInterface>(), networkInterfaces);
return CollectionUtil.addAll(new ArrayList<>(), networkInterfaces);
}
/**
@ -322,13 +322,7 @@ public class NetUtil {
* @return IP地址列表 {@link LinkedHashSet}
*/
public static LinkedHashSet<String> localIpv4s() {
final LinkedHashSet<InetAddress> localAddressList = localAddressList(new Filter<InetAddress>() {
@Override
public boolean accept(InetAddress t) {
return t instanceof Inet4Address;
}
});
final LinkedHashSet<InetAddress> localAddressList = localAddressList(t -> t instanceof Inet4Address);
return toIpList(localAddressList);
}
@ -341,13 +335,7 @@ public class NetUtil {
* @since 4.5.17
*/
public static LinkedHashSet<String> localIpv6s() {
final LinkedHashSet<InetAddress> localAddressList = localAddressList(new Filter<InetAddress>() {
@Override
public boolean accept(InetAddress t) {
return t instanceof Inet6Address;
}
});
final LinkedHashSet<InetAddress> localAddressList = localAddressList(t -> t instanceof Inet6Address);
return toIpList(localAddressList);
}
@ -448,16 +436,13 @@ public class NetUtil {
* @since 3.0.1
*/
public static InetAddress getLocalhost() {
final LinkedHashSet<InetAddress> localAddressList = localAddressList(new Filter<InetAddress>() {
@Override
public boolean accept(InetAddress address) {
// 非loopback地址指127.*.*.*的地址
return false == address.isLoopbackAddress()
// 非地区本地地址指10.0.0.0 ~ 10.255.255.255172.16.0.0 ~ 172.31.255.255192.168.0.0 ~ 192.168.255.255
&& false == address.isSiteLocalAddress()
// 需为IPV4地址
&& address instanceof Inet4Address;
}
final LinkedHashSet<InetAddress> localAddressList = localAddressList(address -> {
// 非loopback地址指127.*.*.*的地址
return false == address.isLoopbackAddress()
// 非地区本地地址指10.0.0.0 ~ 10.255.255.255172.16.0.0 ~ 172.31.255.255192.168.0.0 ~ 192.168.255.255
&& false == address.isSiteLocalAddress()
// 需为IPV4地址
&& address instanceof Inet4Address;
});
if (CollUtil.isNotEmpty(localAddressList)) {