🎨 优化部分代码

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java

@@ -1,12 +1,7 @@
 package me.chanjar.weixin.common.util.http.apache;
 
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
-import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
@@ -25,10 +20,13 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.protocol.HttpContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.concurrent.NotThreadSafe;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * httpclient 连接管理器 自带DNS解析.
  * <p>大部分代码拷贝自：DefaultApacheHttpClientBuilder</p>
@@ -50,12 +48,7 @@ public class ApacheHttpDnsClientBuilder implements ApacheHttpClientBuilder {
 
   private DnsResolver dnsResover;
 
-  private HttpRequestRetryHandler httpRequestRetryHandler = new HttpRequestRetryHandler() {
+  private HttpRequestRetryHandler httpRequestRetryHandler = (exception, executionCount, context) -> false;
-    @Override
-    public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
-      return false;
-    }
-  };
   private SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory();
   private PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory();
   private String httpProxyHost;

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java

@@ -4,7 +4,6 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
-import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
@@ -26,6 +25,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.ssl.SSLContexts;
 
+import javax.annotation.concurrent.NotThreadSafe;
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.security.KeyManagementException;

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpTpDefaultConfigImpl.java

@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class WxCpTpDefaultConfigImpl implements WxCpTpConfigStorage, Serializable {
   private static final long serialVersionUID = 6678780920621872824L;
-  // locker
+
   private final transient Map<String, Lock> providerAccessTokenLocker = new ConcurrentHashMap<>();
   private final transient Map<String, Lock> suiteAccessTokenLocker = new ConcurrentHashMap<>();
   private final transient Map<String, Lock> accessTokenLocker = new ConcurrentHashMap<>();
@@ -319,10 +319,10 @@ public class WxCpTpDefaultConfigImpl implements WxCpTpConfigStorage, Serializabl
   public boolean isAuthCorpJsApiTicketExpired(String authCorpId) {
     Long t = this.authCorpJsApiTicketExpireTimeMap.get(authCorpId);
     if (t == null) {
-      return System.currentTimeMillis() > t;
-    } else {
       return true;
     }
+
+    return System.currentTimeMillis() > t;
   }
 
   @Override
@@ -348,10 +348,10 @@ public class WxCpTpDefaultConfigImpl implements WxCpTpConfigStorage, Serializabl
   public boolean isAuthSuiteJsApiTicketExpired(String authCorpId) {
     Long t = authSuiteJsApiTicketExpireTimeMap.get(authCorpId);
     if (t == null) {
-      return System.currentTimeMillis() > t;
-    } else {
       return true;
     }
+
+    return System.currentTimeMillis() > t;
   }
 
   @Override