rename newCache、newCnameCache、newAuthoritativeDnsServerCache

qnnn · May 29, 2024 · 9780064 · 9780064
1 parent cab2bc7
commit 9780064
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
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
@@ -47,26 +47,26 @@ public class DnsAddressResolverGroup extends AddressResolverGroup<InetSocketAddr
     public DnsAddressResolverGroup(DnsNameResolverBuilder dnsResolverBuilder) {
         this.dnsResolverBuilder = dnsResolverBuilder.copy();
         this.dnsResolverBuilder
-                .resolveCache(dnsResolverBuilder.newCache()).cnameCache(dnsResolverBuilder.newCnameCache())
-                .authoritativeDnsServerCache(dnsResolverBuilder.newAuthoritativeDnsServerCache());
+                .resolveCache(dnsResolverBuilder.getOrNewCache()).cnameCache(dnsResolverBuilder.getOrNewCnameCache())
+                .authoritativeDnsServerCache(dnsResolverBuilder.getOrNewAuthoritativeDnsServerCache());
     }
 
     public DnsAddressResolverGroup(
             Class<? extends DatagramChannel> channelType,
             DnsServerAddressStreamProvider nameServerProvider) {
         this.dnsResolverBuilder = new DnsNameResolverBuilder();
         dnsResolverBuilder.channelType(channelType).nameServerProvider(nameServerProvider)
-                .resolveCache(dnsResolverBuilder.newCache()).cnameCache(dnsResolverBuilder.newCnameCache())
-                .authoritativeDnsServerCache(dnsResolverBuilder.newAuthoritativeDnsServerCache());
+                .resolveCache(dnsResolverBuilder.getOrNewCache()).cnameCache(dnsResolverBuilder.getOrNewCnameCache())
+                .authoritativeDnsServerCache(dnsResolverBuilder.getOrNewAuthoritativeDnsServerCache());
     }
 
     public DnsAddressResolverGroup(
             ChannelFactory<? extends DatagramChannel> channelFactory,
             DnsServerAddressStreamProvider nameServerProvider) {
         this.dnsResolverBuilder = new DnsNameResolverBuilder();
         dnsResolverBuilder.channelFactory(channelFactory).nameServerProvider(nameServerProvider)
-                .resolveCache(dnsResolverBuilder.newCache()).cnameCache(dnsResolverBuilder.newCnameCache())
-                .authoritativeDnsServerCache(dnsResolverBuilder.newAuthoritativeDnsServerCache());
+                .resolveCache(dnsResolverBuilder.getOrNewCache()).cnameCache(dnsResolverBuilder.getOrNewCnameCache())
+                .authoritativeDnsServerCache(dnsResolverBuilder.getOrNewAuthoritativeDnsServerCache());
     }
 
     @SuppressWarnings("deprecation")

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
@@ -513,14 +513,14 @@ public DnsNameResolverBuilder ndots(int ndots) {
         return this;
     }
 
-    public DnsCache newCache() {
+    public DnsCache getOrNewCache() {
         if (this.resolveCache != null) {
             return this.resolveCache;
         }
         return new DefaultDnsCache(intValue(minTtl, 0), intValue(maxTtl, Integer.MAX_VALUE), intValue(negativeTtl, 0));
     }
 
-    public AuthoritativeDnsServerCache newAuthoritativeDnsServerCache() {
+    public AuthoritativeDnsServerCache getOrNewAuthoritativeDnsServerCache() {
         if (this.authoritativeDnsServerCache != null) {
             return this.authoritativeDnsServerCache;
         }
@@ -536,7 +536,7 @@ private DnsServerAddressStream newQueryServerAddressStream(
         return new ThreadLocalNameServerAddressStream(dnsServerAddressStreamProvider);
     }
 
-    public DnsCnameCache newCnameCache() {
+    public DnsCnameCache getOrNewCnameCache() {
         if (this.cnameCache != null) {
             return this.cnameCache;
         }
@@ -592,9 +592,9 @@ public DnsNameResolver build() {
             logger.debug("authoritativeDnsServerCache and TTLs are mutually exclusive. TTLs are ignored.");
         }
 
-        DnsCache resolveCache = newCache();
-        DnsCnameCache cnameCache = newCnameCache();
-        AuthoritativeDnsServerCache authoritativeDnsServerCache = newAuthoritativeDnsServerCache();
+        DnsCache resolveCache = getOrNewCache();
+        DnsCnameCache cnameCache = getOrNewCnameCache();
+        AuthoritativeDnsServerCache authoritativeDnsServerCache = getOrNewAuthoritativeDnsServerCache();
 
         DnsServerAddressStream queryDnsServerAddressStream = this.queryDnsServerAddressStream != null ?
                 this.queryDnsServerAddressStream : newQueryServerAddressStream(dnsServerAddressStreamProvider);