From 776e38af88be9e92a0b31611a12f090a5c3499c4 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Wed, 15 Jan 2020 09:10:13 +0100 Subject: [PATCH] Remove @UnstableApi annotation from resolver-* (#9952) Motivation: The resolver API and implementations should be considered stable by now so we should not mark these with @UnstableApi Modifications: Remove @UnstableApi annotation from API and implementation of resolver Result: Make it explicit that the API is considered stable --- .../main/java/io/netty/resolver/dns/macos/package-info.java | 3 --- .../io/netty/resolver/dns/AuthoritativeDnsServerCache.java | 2 -- .../netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java | 2 -- .../io/netty/resolver/dns/BiDnsQueryLifecycleObserver.java | 2 -- .../netty/resolver/dns/BiDnsQueryLifecycleObserverFactory.java | 2 -- .../netty/resolver/dns/DefaultAuthoritativeDnsServerCache.java | 2 -- .../src/main/java/io/netty/resolver/dns/DefaultDnsCache.java | 2 -- .../main/java/io/netty/resolver/dns/DefaultDnsCnameCache.java | 2 -- .../resolver/dns/DefaultDnsServerAddressStreamProvider.java | 2 -- .../java/io/netty/resolver/dns/DnsAddressResolverGroup.java | 2 -- resolver-dns/src/main/java/io/netty/resolver/dns/DnsCache.java | 2 -- .../src/main/java/io/netty/resolver/dns/DnsCacheEntry.java | 3 --- .../src/main/java/io/netty/resolver/dns/DnsCnameCache.java | 2 -- .../src/main/java/io/netty/resolver/dns/DnsNameResolver.java | 2 -- .../java/io/netty/resolver/dns/DnsNameResolverBuilder.java | 2 -- .../java/io/netty/resolver/dns/DnsNameResolverException.java | 2 -- .../io/netty/resolver/dns/DnsNameResolverTimeoutException.java | 2 -- .../java/io/netty/resolver/dns/DnsQueryLifecycleObserver.java | 2 -- .../netty/resolver/dns/DnsQueryLifecycleObserverFactory.java | 2 -- .../java/io/netty/resolver/dns/DnsServerAddressStream.java | 3 --- .../io/netty/resolver/dns/DnsServerAddressStreamProvider.java | 3 --- .../io/netty/resolver/dns/DnsServerAddressStreamProviders.java | 2 -- .../main/java/io/netty/resolver/dns/DnsServerAddresses.java | 3 --- .../resolver/dns/MultiDnsServerAddressStreamProvider.java | 3 --- .../io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java | 2 -- .../src/main/java/io/netty/resolver/dns/NoopDnsCache.java | 2 -- .../src/main/java/io/netty/resolver/dns/NoopDnsCnameCache.java | 2 -- .../resolver/dns/NoopDnsQueryLifecycleObserverFactory.java | 2 -- .../netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java | 2 -- .../resolver/dns/SequentialDnsServerAddressStreamProvider.java | 3 --- .../resolver/dns/SingletonDnsServerAddressStreamProvider.java | 3 --- .../dns/UnixResolverDnsServerAddressStreamProvider.java | 2 -- .../src/main/java/io/netty/resolver/dns/package-info.java | 3 --- .../main/java/io/netty/resolver/AbstractAddressResolver.java | 2 -- resolver/src/main/java/io/netty/resolver/AddressResolver.java | 2 -- .../src/main/java/io/netty/resolver/AddressResolverGroup.java | 2 -- .../src/main/java/io/netty/resolver/CompositeNameResolver.java | 2 -- .../java/io/netty/resolver/DefaultAddressResolverGroup.java | 2 -- .../io/netty/resolver/DefaultHostsFileEntriesResolver.java | 2 -- .../src/main/java/io/netty/resolver/DefaultNameResolver.java | 2 -- resolver/src/main/java/io/netty/resolver/HostsFileEntries.java | 3 --- .../main/java/io/netty/resolver/HostsFileEntriesResolver.java | 3 --- resolver/src/main/java/io/netty/resolver/HostsFileParser.java | 2 -- resolver/src/main/java/io/netty/resolver/InetNameResolver.java | 2 -- .../main/java/io/netty/resolver/InetSocketAddressResolver.java | 2 -- resolver/src/main/java/io/netty/resolver/NameResolver.java | 2 -- .../src/main/java/io/netty/resolver/NoopAddressResolver.java | 2 -- .../main/java/io/netty/resolver/NoopAddressResolverGroup.java | 2 -- .../src/main/java/io/netty/resolver/ResolvedAddressTypes.java | 3 --- .../java/io/netty/resolver/RoundRobinInetAddressResolver.java | 2 -- .../src/main/java/io/netty/resolver/SimpleNameResolver.java | 2 -- resolver/src/main/java/io/netty/resolver/package-info.java | 3 --- 52 files changed, 117 deletions(-) diff --git a/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java b/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java index d12eeb90a3..56a806fe73 100644 --- a/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java +++ b/resolver-dns-native-macos/src/main/java/io/netty/resolver/dns/macos/package-info.java @@ -17,7 +17,4 @@ /** * MacOS specific nameserver resolution. */ -@UnstableApi package io.netty.resolver.dns.macos; - -import io.netty.util.internal.UnstableApi; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCache.java index b011066700..f4a443e4df 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCache.java @@ -16,14 +16,12 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; /** * Cache which stores the nameservers that should be used to resolve a specific hostname. */ -@UnstableApi public interface AuthoritativeDnsServerCache { /** diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java b/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java index 555e713a04..ecdadb0710 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/AuthoritativeDnsServerCacheAdapter.java @@ -17,7 +17,6 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; import io.netty.handler.codec.dns.DnsRecord; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -30,7 +29,6 @@ import static java.util.Objects.requireNonNull; * {@link AuthoritativeDnsServerCache} implementation which delegates all operations to a wrapped {@link DnsCache}. * This implementation is only present to preserve a upgrade story. */ -@UnstableApi final class AuthoritativeDnsServerCacheAdapter implements AuthoritativeDnsServerCache { private static final DnsRecord[] EMPTY = new DnsRecord[0]; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserver.java index fc02999438..0b417e7e42 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserver.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserver.java @@ -18,7 +18,6 @@ package io.netty.resolver.dns; import io.netty.channel.ChannelFuture; import io.netty.handler.codec.dns.DnsQuestion; import io.netty.handler.codec.dns.DnsResponseCode; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; import java.util.List; @@ -28,7 +27,6 @@ import static java.util.Objects.requireNonNull; /** * Combines two {@link DnsQueryLifecycleObserver} into a single {@link DnsQueryLifecycleObserver}. */ -@UnstableApi public final class BiDnsQueryLifecycleObserver implements DnsQueryLifecycleObserver { private final DnsQueryLifecycleObserver a; private final DnsQueryLifecycleObserver b; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserverFactory.java b/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserverFactory.java index c1547f9338..15f0d1b2b7 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserverFactory.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/BiDnsQueryLifecycleObserverFactory.java @@ -16,14 +16,12 @@ package io.netty.resolver.dns; import io.netty.handler.codec.dns.DnsQuestion; -import io.netty.util.internal.UnstableApi; import static java.util.Objects.requireNonNull; /** * Combines two {@link DnsQueryLifecycleObserverFactory} into a single {@link DnsQueryLifecycleObserverFactory}. */ -@UnstableApi public final class BiDnsQueryLifecycleObserverFactory implements DnsQueryLifecycleObserverFactory { private final DnsQueryLifecycleObserverFactory a; private final DnsQueryLifecycleObserverFactory b; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCache.java index b3f1763ef3..826f292c4b 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultAuthoritativeDnsServerCache.java @@ -16,7 +16,6 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; import java.util.Comparator; @@ -30,7 +29,6 @@ import static java.util.Objects.requireNonNull; /** * Default implementation of {@link AuthoritativeDnsServerCache}, backed by a {@link ConcurrentMap}. */ -@UnstableApi public class DefaultAuthoritativeDnsServerCache implements AuthoritativeDnsServerCache { private final int minTtl; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java index a4281c1ce9..3bc5fcd87a 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCache.java @@ -18,7 +18,6 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; import io.netty.handler.codec.dns.DnsRecord; import io.netty.util.internal.StringUtil; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.util.Collections; @@ -32,7 +31,6 @@ import static java.util.Objects.requireNonNull; * Default implementation of {@link DnsCache}, backed by a {@link ConcurrentMap}. * If any additional {@link DnsRecord} is used, no caching takes place. */ -@UnstableApi public class DefaultDnsCache implements DnsCache { private final Cache resolveCache = new Cache() { diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCnameCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCnameCache.java index c8b853ff9d..2ca0ace416 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCnameCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsCnameCache.java @@ -17,7 +17,6 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; import io.netty.util.AsciiString; -import io.netty.util.internal.UnstableApi; import java.util.List; @@ -28,7 +27,6 @@ import static java.util.Objects.requireNonNull; /** * Default implementation of a {@link DnsCnameCache}. */ -@UnstableApi public final class DefaultDnsCnameCache implements DnsCnameCache { private final int minTtl; private final int maxTtl; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java index f9adcca73b..2ac58cb821 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java @@ -18,7 +18,6 @@ package io.netty.resolver.dns; import io.netty.util.NetUtil; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.SocketUtils; -import io.netty.util.internal.UnstableApi; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -37,7 +36,6 @@ import static io.netty.resolver.dns.DnsServerAddresses.sequential; *

* This may use the JDK's blocking DNS resolution to bootstrap the default DNS server addresses. */ -@UnstableApi public final class DefaultDnsServerAddressStreamProvider implements DnsServerAddressStreamProvider { private static final InternalLogger logger = InternalLoggerFactory.getInstance(DefaultDnsServerAddressStreamProvider.class); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java index de8bf4b5f9..87db7dda88 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsAddressResolverGroup.java @@ -26,7 +26,6 @@ import io.netty.resolver.NameResolver; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Promise; import io.netty.util.internal.StringUtil; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -37,7 +36,6 @@ import java.util.concurrent.ConcurrentMap; /** * A {@link AddressResolverGroup} of {@link DnsNameResolver}s. */ -@UnstableApi public class DnsAddressResolverGroup extends AddressResolverGroup { private final DnsNameResolverBuilder dnsResolverBuilder; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCache.java index 28e8989e6e..1ddaa53d41 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCache.java @@ -17,7 +17,6 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; import io.netty.handler.codec.dns.DnsRecord; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.util.List; @@ -25,7 +24,6 @@ import java.util.List; /** * A cache for DNS resolution entries. */ -@UnstableApi public interface DnsCache { /** diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCacheEntry.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCacheEntry.java index 129402bc4e..25eaec0348 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCacheEntry.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCacheEntry.java @@ -15,14 +15,11 @@ */ package io.netty.resolver.dns; -import io.netty.util.internal.UnstableApi; - import java.net.InetAddress; /** * Represents the results from a previous DNS query which can be cached. */ -@UnstableApi public interface DnsCacheEntry { /** * Get the resolved address. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCnameCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCnameCache.java index 820ef67d24..0c1b370c6d 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCnameCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsCnameCache.java @@ -16,12 +16,10 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; -import io.netty.util.internal.UnstableApi; /** * A cache for {@code CNAME}s. */ -@UnstableApi public interface DnsCnameCache { /** diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java index 444d92827c..952bdd24ea 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolver.java @@ -59,7 +59,6 @@ import io.netty.util.concurrent.Promise; import io.netty.util.internal.EmptyArrays; import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.StringUtil; -import io.netty.util.internal.UnstableApi; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -88,7 +87,6 @@ import static java.util.Objects.requireNonNull; /** * A DNS-based {@link InetNameResolver}. */ -@UnstableApi public class DnsNameResolver extends InetNameResolver { private static final InternalLogger logger = InternalLoggerFactory.getInstance(DnsNameResolver.class); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java index d1768e5948..ea40eee663 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverBuilder.java @@ -24,7 +24,6 @@ import io.netty.channel.socket.SocketChannel; import io.netty.resolver.HostsFileEntriesResolver; import io.netty.resolver.ResolvedAddressTypes; import io.netty.util.concurrent.Future; -import io.netty.util.internal.UnstableApi; import java.util.ArrayList; import java.util.Arrays; @@ -37,7 +36,6 @@ import static java.util.Objects.requireNonNull; /** * A {@link DnsNameResolver} builder. */ -@UnstableApi public final class DnsNameResolverBuilder { private EventLoop eventLoop; private ChannelFactory channelFactory; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverException.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverException.java index f294b88a22..133a5997af 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverException.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverException.java @@ -19,14 +19,12 @@ import static java.util.Objects.requireNonNull; import io.netty.handler.codec.dns.DnsQuestion; import io.netty.util.internal.EmptyArrays; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; /** * A {@link RuntimeException} raised when {@link DnsNameResolver} failed to perform a successful query. */ -@UnstableApi public class DnsNameResolverException extends RuntimeException { private static final long serialVersionUID = -8826717909627131850L; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverTimeoutException.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverTimeoutException.java index e1ad13de4d..7d3e721a14 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverTimeoutException.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsNameResolverTimeoutException.java @@ -16,7 +16,6 @@ package io.netty.resolver.dns; import io.netty.handler.codec.dns.DnsQuestion; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; @@ -24,7 +23,6 @@ import java.net.InetSocketAddress; * A {@link DnsNameResolverException} raised when {@link DnsNameResolver} failed to perform a successful query because * of an timeout. In this case you may want to retry the operation. */ -@UnstableApi public final class DnsNameResolverTimeoutException extends DnsNameResolverException { private static final long serialVersionUID = -8826717969627131854L; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserver.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserver.java index 39ce19dd90..3ad2ebc766 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserver.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserver.java @@ -19,7 +19,6 @@ import io.netty.channel.ChannelFuture; import io.netty.handler.codec.dns.DnsQuestion; import io.netty.handler.codec.dns.DnsRecordType; import io.netty.handler.codec.dns.DnsResponseCode; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; import java.util.List; @@ -43,7 +42,6 @@ import java.util.List; * return an object of type {@link DnsQueryLifecycleObserver}. Implementations may use this to build a query tree to * understand the "sub queries" generated by a single query. */ -@UnstableApi public interface DnsQueryLifecycleObserver { /** * The query has been written. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserverFactory.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserverFactory.java index 6b5d822a0c..afe36f942d 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserverFactory.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsQueryLifecycleObserverFactory.java @@ -16,12 +16,10 @@ package io.netty.resolver.dns; import io.netty.handler.codec.dns.DnsQuestion; -import io.netty.util.internal.UnstableApi; /** * Used to generate new instances of {@link DnsQueryLifecycleObserver}. */ -@UnstableApi public interface DnsQueryLifecycleObserverFactory { /** * Create a new instance of a {@link DnsQueryLifecycleObserver}. This will be called at the start of a new query. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStream.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStream.java index af014f9514..c5d0453063 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStream.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStream.java @@ -16,14 +16,11 @@ package io.netty.resolver.dns; -import io.netty.util.internal.UnstableApi; - import java.net.InetSocketAddress; /** * An infinite stream of DNS server addresses. */ -@UnstableApi public interface DnsServerAddressStream { /** * Retrieves the next DNS server address from the stream. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProvider.java index 05285e9a4f..e0384ea6c2 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProvider.java @@ -15,8 +15,6 @@ */ package io.netty.resolver.dns; -import io.netty.util.internal.UnstableApi; - /** * Provides an opportunity to override which {@link DnsServerAddressStream} is used to resolve a specific hostname. *

@@ -24,7 +22,6 @@ import io.netty.util.internal.UnstableApi; * * /etc/resolver. */ -@UnstableApi public interface DnsServerAddressStreamProvider { /** * Ask this provider for the name servers to query for {@code hostname}. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProviders.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProviders.java index fbcd8cc9c1..2983ccbad9 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProviders.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddressStreamProviders.java @@ -16,7 +16,6 @@ package io.netty.resolver.dns; import io.netty.util.internal.PlatformDependent; -import io.netty.util.internal.UnstableApi; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -24,7 +23,6 @@ import java.util.concurrent.atomic.AtomicLong; /** * Utility methods related to {@link DnsServerAddressStreamProvider}. */ -@UnstableApi public final class DnsServerAddressStreamProviders { // We use 5 minutes which is the same as what OpenJDK is using in sun.net.dns.ResolverConfigurationImpl. private static final long REFRESH_INTERVAL = TimeUnit.MINUTES.toNanos(5); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java index 7b209be111..e944b37ee0 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DnsServerAddresses.java @@ -18,8 +18,6 @@ package io.netty.resolver.dns; import static java.util.Objects.requireNonNull; -import io.netty.util.internal.UnstableApi; - import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collection; @@ -28,7 +26,6 @@ import java.util.List; /** * Provides an infinite sequence of DNS server addresses to {@link DnsNameResolver}. */ -@UnstableApi @SuppressWarnings("IteratorNextCanNotThrowNoSuchElementException") public abstract class DnsServerAddresses { /** diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/MultiDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/MultiDnsServerAddressStreamProvider.java index 87e1aaa937..915e70e950 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/MultiDnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/MultiDnsServerAddressStreamProvider.java @@ -15,15 +15,12 @@ */ package io.netty.resolver.dns; -import io.netty.util.internal.UnstableApi; - import java.util.List; /** * A {@link DnsServerAddressStreamProvider} which iterates through a collection of * {@link DnsServerAddressStreamProvider} until the first non-{@code null} result is found. */ -@UnstableApi public final class MultiDnsServerAddressStreamProvider implements DnsServerAddressStreamProvider { private final DnsServerAddressStreamProvider[] providers; diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java index a3a675174f..dcc1172da4 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopAuthoritativeDnsServerCache.java @@ -16,14 +16,12 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; /** * A noop {@link AuthoritativeDnsServerCache} that actually never caches anything. */ -@UnstableApi public final class NoopAuthoritativeDnsServerCache implements AuthoritativeDnsServerCache { public static final NoopAuthoritativeDnsServerCache INSTANCE = new NoopAuthoritativeDnsServerCache(); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCache.java index ec36c84d1a..9d008a236d 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCache.java @@ -17,7 +17,6 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; import io.netty.handler.codec.dns.DnsRecord; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.util.Collections; @@ -26,7 +25,6 @@ import java.util.List; /** * A noop DNS cache that actually never caches anything. */ -@UnstableApi public final class NoopDnsCache implements DnsCache { public static final NoopDnsCache INSTANCE = new NoopDnsCache(); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCnameCache.java b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCnameCache.java index 54113c40b2..a869228136 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCnameCache.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsCnameCache.java @@ -16,9 +16,7 @@ package io.netty.resolver.dns; import io.netty.channel.EventLoop; -import io.netty.util.internal.UnstableApi; -@UnstableApi public final class NoopDnsCnameCache implements DnsCnameCache { public static final NoopDnsCnameCache INSTANCE = new NoopDnsCnameCache(); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsQueryLifecycleObserverFactory.java b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsQueryLifecycleObserverFactory.java index d53e9cd74a..2dbcfa592e 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsQueryLifecycleObserverFactory.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/NoopDnsQueryLifecycleObserverFactory.java @@ -16,9 +16,7 @@ package io.netty.resolver.dns; import io.netty.handler.codec.dns.DnsQuestion; -import io.netty.util.internal.UnstableApi; -@UnstableApi public final class NoopDnsQueryLifecycleObserverFactory implements DnsQueryLifecycleObserverFactory { public static final NoopDnsQueryLifecycleObserverFactory INSTANCE = new NoopDnsQueryLifecycleObserverFactory(); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java b/resolver-dns/src/main/java/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java index 68c14fec61..e725fc8ae2 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/RoundRobinDnsAddressResolverGroup.java @@ -23,7 +23,6 @@ import io.netty.resolver.AddressResolver; import io.netty.resolver.AddressResolverGroup; import io.netty.resolver.NameResolver; import io.netty.resolver.RoundRobinInetAddressResolver; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -33,7 +32,6 @@ import java.net.InetSocketAddress; * multiple are provided by the nameserver. This is ideal for use in applications that use a pool of connections, for * which connecting to a single resolved address would be inefficient. */ -@UnstableApi public class RoundRobinDnsAddressResolverGroup extends DnsAddressResolverGroup { public RoundRobinDnsAddressResolverGroup(DnsNameResolverBuilder dnsResolverBuilder) { diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/SequentialDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/SequentialDnsServerAddressStreamProvider.java index a23aeba9fe..24f4ebba0b 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/SequentialDnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/SequentialDnsServerAddressStreamProvider.java @@ -15,8 +15,6 @@ */ package io.netty.resolver.dns; -import io.netty.util.internal.UnstableApi; - import java.net.InetSocketAddress; import static io.netty.resolver.dns.DnsServerAddresses.sequential; @@ -24,7 +22,6 @@ import static io.netty.resolver.dns.DnsServerAddresses.sequential; /** * A {@link DnsServerAddressStreamProvider} which is backed by a sequential list of DNS servers. */ -@UnstableApi public final class SequentialDnsServerAddressStreamProvider extends UniSequentialDnsServerAddressStreamProvider { /** * Create a new instance. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/SingletonDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/SingletonDnsServerAddressStreamProvider.java index cfd5f8b3aa..1b7ccffa29 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/SingletonDnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/SingletonDnsServerAddressStreamProvider.java @@ -15,14 +15,11 @@ */ package io.netty.resolver.dns; -import io.netty.util.internal.UnstableApi; - import java.net.InetSocketAddress; /** * A {@link DnsServerAddressStreamProvider} which always uses a single DNS server for resolution. */ -@UnstableApi public final class SingletonDnsServerAddressStreamProvider extends UniSequentialDnsServerAddressStreamProvider { /** * Create a new instance. diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java index b14c5ae890..c7856741d9 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/UnixResolverDnsServerAddressStreamProvider.java @@ -17,7 +17,6 @@ package io.netty.resolver.dns; import io.netty.util.NetUtil; import io.netty.util.internal.SocketUtils; -import io.netty.util.internal.UnstableApi; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -45,7 +44,6 @@ import static java.util.Objects.requireNonNull; * * /etc/resolver to respect the system default domain servers. */ -@UnstableApi public final class UnixResolverDnsServerAddressStreamProvider implements DnsServerAddressStreamProvider { private static final InternalLogger logger = InternalLoggerFactory.getInstance(UnixResolverDnsServerAddressStreamProvider.class); diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/package-info.java b/resolver-dns/src/main/java/io/netty/resolver/dns/package-info.java index 3edc17840e..63825ba878 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/package-info.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/package-info.java @@ -18,7 +18,4 @@ * An alternative to Java's built-in domain name lookup mechanism that resolves a domain name asynchronously, * which supports the queries of an arbitrary DNS record type as well. */ -@UnstableApi package io.netty.resolver.dns; - -import io.netty.util.internal.UnstableApi; diff --git a/resolver/src/main/java/io/netty/resolver/AbstractAddressResolver.java b/resolver/src/main/java/io/netty/resolver/AbstractAddressResolver.java index 67566c6832..c5b0d61a04 100644 --- a/resolver/src/main/java/io/netty/resolver/AbstractAddressResolver.java +++ b/resolver/src/main/java/io/netty/resolver/AbstractAddressResolver.java @@ -20,7 +20,6 @@ import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Promise; import io.netty.util.internal.TypeParameterMatcher; -import io.netty.util.internal.UnstableApi; import java.net.SocketAddress; import java.nio.channels.UnsupportedAddressTypeException; @@ -32,7 +31,6 @@ import static java.util.Objects.requireNonNull; /** * A skeletal {@link AddressResolver} implementation. */ -@UnstableApi public abstract class AbstractAddressResolver implements AddressResolver { private final EventExecutor executor; diff --git a/resolver/src/main/java/io/netty/resolver/AddressResolver.java b/resolver/src/main/java/io/netty/resolver/AddressResolver.java index 042affd750..adb613a50a 100644 --- a/resolver/src/main/java/io/netty/resolver/AddressResolver.java +++ b/resolver/src/main/java/io/netty/resolver/AddressResolver.java @@ -17,7 +17,6 @@ package io.netty.resolver; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.io.Closeable; import java.net.SocketAddress; @@ -27,7 +26,6 @@ import java.util.List; /** * Resolves a possibility unresolved {@link SocketAddress}. */ -@UnstableApi public interface AddressResolver extends Closeable { /** diff --git a/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java b/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java index 7827771e4f..19bde8c687 100644 --- a/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java +++ b/resolver/src/main/java/io/netty/resolver/AddressResolverGroup.java @@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.FutureListener; -import io.netty.util.internal.UnstableApi; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -33,7 +32,6 @@ import java.util.concurrent.ConcurrentMap; /** * Creates and manages {@link NameResolver}s so that each {@link EventExecutor} has its own resolver instance. */ -@UnstableApi public abstract class AddressResolverGroup implements Closeable { private static final InternalLogger logger = InternalLoggerFactory.getInstance(AddressResolverGroup.class); diff --git a/resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java b/resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java index d17e6a54de..26e1bd6c7a 100644 --- a/resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java +++ b/resolver/src/main/java/io/netty/resolver/CompositeNameResolver.java @@ -19,7 +19,6 @@ import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.util.Arrays; import java.util.List; @@ -31,7 +30,6 @@ import static java.util.Objects.requireNonNull; * * In case of a failure, only the last one will be reported. */ -@UnstableApi public final class CompositeNameResolver extends SimpleNameResolver { private final NameResolver[] resolvers; diff --git a/resolver/src/main/java/io/netty/resolver/DefaultAddressResolverGroup.java b/resolver/src/main/java/io/netty/resolver/DefaultAddressResolverGroup.java index 9e22b8fe3b..1b6fb53178 100644 --- a/resolver/src/main/java/io/netty/resolver/DefaultAddressResolverGroup.java +++ b/resolver/src/main/java/io/netty/resolver/DefaultAddressResolverGroup.java @@ -17,14 +17,12 @@ package io.netty.resolver; import io.netty.util.concurrent.EventExecutor; -import io.netty.util.internal.UnstableApi; import java.net.InetSocketAddress; /** * A {@link AddressResolverGroup} of {@link DefaultNameResolver}s. */ -@UnstableApi public final class DefaultAddressResolverGroup extends AddressResolverGroup { public static final DefaultAddressResolverGroup INSTANCE = new DefaultAddressResolverGroup(); diff --git a/resolver/src/main/java/io/netty/resolver/DefaultHostsFileEntriesResolver.java b/resolver/src/main/java/io/netty/resolver/DefaultHostsFileEntriesResolver.java index 9051262eb1..97ca29ba37 100644 --- a/resolver/src/main/java/io/netty/resolver/DefaultHostsFileEntriesResolver.java +++ b/resolver/src/main/java/io/netty/resolver/DefaultHostsFileEntriesResolver.java @@ -17,7 +17,6 @@ package io.netty.resolver; import io.netty.util.CharsetUtil; import io.netty.util.internal.PlatformDependent; -import io.netty.util.internal.UnstableApi; import java.net.Inet4Address; import java.net.Inet6Address; @@ -29,7 +28,6 @@ import java.util.Map; /** * Default {@link HostsFileEntriesResolver} that resolves hosts file entries only once. */ -@UnstableApi public final class DefaultHostsFileEntriesResolver implements HostsFileEntriesResolver { private final Map inet4Entries; diff --git a/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java b/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java index d6d3aea46e..38ae0eba24 100644 --- a/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java +++ b/resolver/src/main/java/io/netty/resolver/DefaultNameResolver.java @@ -19,7 +19,6 @@ package io.netty.resolver; import io.netty.util.internal.SocketUtils; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.UnknownHostException; @@ -30,7 +29,6 @@ import java.util.List; * A {@link InetNameResolver} that resolves using JDK's built-in domain name lookup mechanism. * Note that this resolver performs a blocking name lookup from the caller thread. */ -@UnstableApi public class DefaultNameResolver extends InetNameResolver { public DefaultNameResolver(EventExecutor executor) { diff --git a/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java b/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java index 1275cd8422..68bac76cb9 100644 --- a/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java +++ b/resolver/src/main/java/io/netty/resolver/HostsFileEntries.java @@ -15,8 +15,6 @@ */ package io.netty.resolver; -import io.netty.util.internal.UnstableApi; - import java.net.Inet4Address; import java.net.Inet6Address; import java.util.Collections; @@ -26,7 +24,6 @@ import java.util.Map; /** * A container of hosts file entries */ -@UnstableApi public final class HostsFileEntries { /** diff --git a/resolver/src/main/java/io/netty/resolver/HostsFileEntriesResolver.java b/resolver/src/main/java/io/netty/resolver/HostsFileEntriesResolver.java index 753467d1a4..feedbd9945 100644 --- a/resolver/src/main/java/io/netty/resolver/HostsFileEntriesResolver.java +++ b/resolver/src/main/java/io/netty/resolver/HostsFileEntriesResolver.java @@ -15,14 +15,11 @@ */ package io.netty.resolver; -import io.netty.util.internal.UnstableApi; - import java.net.InetAddress; /** * Resolves a hostname against the hosts file entries. */ -@UnstableApi public interface HostsFileEntriesResolver { /** diff --git a/resolver/src/main/java/io/netty/resolver/HostsFileParser.java b/resolver/src/main/java/io/netty/resolver/HostsFileParser.java index 86d284b3fe..9feeda8bbb 100644 --- a/resolver/src/main/java/io/netty/resolver/HostsFileParser.java +++ b/resolver/src/main/java/io/netty/resolver/HostsFileParser.java @@ -17,7 +17,6 @@ package io.netty.resolver; import io.netty.util.NetUtil; import io.netty.util.internal.PlatformDependent; -import io.netty.util.internal.UnstableApi; import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -43,7 +42,6 @@ import static java.util.Objects.requireNonNull; /** * A parser for hosts files. */ -@UnstableApi public final class HostsFileParser { private static final String WINDOWS_DEFAULT_SYSTEM_ROOT = "C:\\Windows"; diff --git a/resolver/src/main/java/io/netty/resolver/InetNameResolver.java b/resolver/src/main/java/io/netty/resolver/InetNameResolver.java index eb5cfe092a..f90cd105f3 100644 --- a/resolver/src/main/java/io/netty/resolver/InetNameResolver.java +++ b/resolver/src/main/java/io/netty/resolver/InetNameResolver.java @@ -17,7 +17,6 @@ package io.netty.resolver; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -25,7 +24,6 @@ import java.net.InetSocketAddress; /** * A skeletal {@link NameResolver} implementation that resolves {@link InetAddress}. */ -@UnstableApi public abstract class InetNameResolver extends SimpleNameResolver { private volatile AddressResolver addressResolver; diff --git a/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java b/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java index 70b68628d4..83034596cf 100644 --- a/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java +++ b/resolver/src/main/java/io/netty/resolver/InetSocketAddressResolver.java @@ -19,7 +19,6 @@ import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -29,7 +28,6 @@ import java.util.List; /** * A {@link AbstractAddressResolver} that resolves {@link InetSocketAddress}. */ -@UnstableApi public class InetSocketAddressResolver extends AbstractAddressResolver { final NameResolver nameResolver; diff --git a/resolver/src/main/java/io/netty/resolver/NameResolver.java b/resolver/src/main/java/io/netty/resolver/NameResolver.java index 53a56b40b8..818122c4af 100644 --- a/resolver/src/main/java/io/netty/resolver/NameResolver.java +++ b/resolver/src/main/java/io/netty/resolver/NameResolver.java @@ -18,7 +18,6 @@ package io.netty.resolver; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.io.Closeable; import java.util.List; @@ -26,7 +25,6 @@ import java.util.List; /** * Resolves an arbitrary string that represents the name of an endpoint into an address. */ -@UnstableApi public interface NameResolver extends Closeable { /** diff --git a/resolver/src/main/java/io/netty/resolver/NoopAddressResolver.java b/resolver/src/main/java/io/netty/resolver/NoopAddressResolver.java index 95514696a8..c34bb576f0 100644 --- a/resolver/src/main/java/io/netty/resolver/NoopAddressResolver.java +++ b/resolver/src/main/java/io/netty/resolver/NoopAddressResolver.java @@ -18,7 +18,6 @@ package io.netty.resolver; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.net.SocketAddress; import java.util.Collections; @@ -28,7 +27,6 @@ import java.util.List; * A {@link AddressResolver} that does not perform any resolution but always reports successful resolution. * This resolver is useful when name resolution is performed by a handler in a pipeline, such as a proxy handler. */ -@UnstableApi public class NoopAddressResolver extends AbstractAddressResolver { public NoopAddressResolver(EventExecutor executor) { diff --git a/resolver/src/main/java/io/netty/resolver/NoopAddressResolverGroup.java b/resolver/src/main/java/io/netty/resolver/NoopAddressResolverGroup.java index 7727652e1f..980cc50d8e 100644 --- a/resolver/src/main/java/io/netty/resolver/NoopAddressResolverGroup.java +++ b/resolver/src/main/java/io/netty/resolver/NoopAddressResolverGroup.java @@ -17,14 +17,12 @@ package io.netty.resolver; import io.netty.util.concurrent.EventExecutor; -import io.netty.util.internal.UnstableApi; import java.net.SocketAddress; /** * A {@link AddressResolverGroup} of {@link NoopAddressResolver}s. */ -@UnstableApi public final class NoopAddressResolverGroup extends AddressResolverGroup { public static final NoopAddressResolverGroup INSTANCE = new NoopAddressResolverGroup(); diff --git a/resolver/src/main/java/io/netty/resolver/ResolvedAddressTypes.java b/resolver/src/main/java/io/netty/resolver/ResolvedAddressTypes.java index ae3e55d4be..ea849bf06a 100644 --- a/resolver/src/main/java/io/netty/resolver/ResolvedAddressTypes.java +++ b/resolver/src/main/java/io/netty/resolver/ResolvedAddressTypes.java @@ -15,12 +15,9 @@ */ package io.netty.resolver; -import io.netty.util.internal.UnstableApi; - /** * Defined resolved address types. */ -@UnstableApi public enum ResolvedAddressTypes { /** * Only resolve IPv4 addresses diff --git a/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java b/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java index f09d26d652..cc433d36bf 100644 --- a/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java +++ b/resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java @@ -19,7 +19,6 @@ import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -35,7 +34,6 @@ import java.util.concurrent.ThreadLocalRandom; * if multiple are returned by the {@link NameResolver}. * Use {@link #asAddressResolver()} to create a {@link InetSocketAddress} resolver */ -@UnstableApi public class RoundRobinInetAddressResolver extends InetNameResolver { private final NameResolver nameResolver; diff --git a/resolver/src/main/java/io/netty/resolver/SimpleNameResolver.java b/resolver/src/main/java/io/netty/resolver/SimpleNameResolver.java index fb2b289709..6cf9283b47 100644 --- a/resolver/src/main/java/io/netty/resolver/SimpleNameResolver.java +++ b/resolver/src/main/java/io/netty/resolver/SimpleNameResolver.java @@ -21,14 +21,12 @@ import static java.util.Objects.requireNonNull; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Promise; -import io.netty.util.internal.UnstableApi; import java.util.List; /** * A skeletal {@link NameResolver} implementation. */ -@UnstableApi public abstract class SimpleNameResolver implements NameResolver { private final EventExecutor executor; diff --git a/resolver/src/main/java/io/netty/resolver/package-info.java b/resolver/src/main/java/io/netty/resolver/package-info.java index 0dd9ab2a3c..a92459842a 100644 --- a/resolver/src/main/java/io/netty/resolver/package-info.java +++ b/resolver/src/main/java/io/netty/resolver/package-info.java @@ -17,7 +17,4 @@ /** * Resolves an arbitrary string that represents the name of an endpoint into an address. */ -@UnstableApi package io.netty.resolver; - -import io.netty.util.internal.UnstableApi;