improve coding styles

aliyun · Jul 22, 2024 · 75fc8c2 · 75fc8c2
1 parent 3360475
commit 75fc8c2
Show file tree

Hide file tree

Showing 31 changed files with 54 additions and 72 deletions.
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/AcsRequest.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/AcsRequest.java
@@ -24,7 +24,7 @@ public abstract class AcsRequest<T extends AcsResponse> extends HttpRequest {
     private UserAgentConfig userAgentConfig;
     protected ISignatureComposer composer = null;
     private String version = null;
-    private String product = null;
+    private String product;
     private String actionName = null;
     private String regionId = null;
     private String securityToken = null;
@@ -76,7 +76,7 @@ public static String concatQueryString(Map<String, String> parameters) throws Un
             return null;
         }
 
-        StringBuilder urlBuilder = new StringBuilder("");
+        StringBuilder urlBuilder = new StringBuilder();
         for (Entry<String, String> entry : parameters.entrySet()) {
             String key = entry.getKey();
             String val = entry.getValue();

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/RoaAcsRequest.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/RoaAcsRequest.java
@@ -114,7 +114,7 @@ protected void putPathParameter(String name, String value) {
     @Override
     public String composeUrl(String endpoint, Map<String, String> queries) throws UnsupportedEncodingException {
         Map<String, String> mapQueries = (queries == null) ? this.getSysQueryParameters() : queries;
-        StringBuilder urlBuilder = new StringBuilder("");
+        StringBuilder urlBuilder = new StringBuilder();
         urlBuilder.append(this.getSysProtocol().toString());
         urlBuilder.append("://").append(endpoint);
         if (null != this.uriPattern) {

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/RpcAcsRequest.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/RpcAcsRequest.java
@@ -131,7 +131,7 @@ public void setSysSecurityToken(String securityToken) {
     @Override
     public String composeUrl(String endpoint, Map<String, String> queries) throws UnsupportedEncodingException {
         Map<String, String> mapQueries = (queries == null) ? this.getSysQueryParameters() : queries;
-        StringBuilder urlBuilder = new StringBuilder("");
+        StringBuilder urlBuilder = new StringBuilder();
         urlBuilder.append(this.getSysProtocol().toString());
         urlBuilder.append("://").append(endpoint);
         if (-1 == urlBuilder.indexOf("?")) {
@@ -166,7 +166,7 @@ public HttpRequest signRequest(Signer signer, AlibabaCloudCredentials credential
                 format);
         headerMap.putAll(this.getSysHeaders());
         headerMap = this.composer.refreshSignParameters(headerMap, signer, null, null);
-        if (imutableMap.get("RegionId") == null && this.getSysRegionId() != null && !this.getSysRegionId().equals("")) {
+        if (imutableMap.get("RegionId") == null && this.getSysRegionId() != null && !this.getSysRegionId().isEmpty()) {
             if ((bodyParams == null || bodyParams.get("RegionId") == null)) {
                 imutableMap.put("RegionId", getSysRegionId());
             }

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/DefaultCredentialsProvider.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/DefaultCredentialsProvider.java
@@ -27,7 +27,7 @@ public DefaultCredentialsProvider() throws ClientException {
         defaultProviders.add(new ProfileCredentialsProvider());
         String roleName = AuthUtils.getEnvironmentECSMetaData();
         if (roleName != null) {
-            if (roleName.length() == 0) {
+            if (roleName.isEmpty()) {
                 throw new ClientException("Environment variable roleName('ALIBABA_CLOUD_ECS_METADATA') cannot be empty");
             }
             defaultProviders.add(new InstanceProfileCredentialsProvider(roleName));

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/LegacyCredentials.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/LegacyCredentials.java
@@ -5,8 +5,8 @@ public class LegacyCredentials implements AlibabaCloudCredentials {
 
     private final Credential legacyCredential;
 
-    public LegacyCredentials(Credential legacyCrendential) {
-        this.legacyCredential = legacyCrendential;
+    public LegacyCredentials(Credential legacyCredential) {
+        this.legacyCredential = legacyCredential;
     }
 
     @Override

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ProfileCredentialsProvider.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ProfileCredentialsProvider.java
@@ -31,7 +31,7 @@ public AlibabaCloudCredentials getCredentials() throws ClientException {
         if (filePath == null) {
             filePath = AuthConstant.DEFAULT_CREDENTIALS_FILE_PATH;
         }
-        if (filePath.length() == 0) {
+        if (filePath.isEmpty()) {
             throw new ClientException("The specified credentials file is empty");
         }
         Wini ini;

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/SHA256withRSASigner.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/SHA256withRSASigner.java
@@ -41,8 +41,7 @@ public String signString(String stringToSign, String accessKeySecret) {
             rsaSign.initSign(privateKey);
             rsaSign.update(stringToSign.getBytes(ENCODING));
             byte[] sign = rsaSign.sign();
-            String signature = DatatypeConverter.printBase64Binary(sign);
-            return signature;
+            return DatatypeConverter.printBase64Binary(sign);
         } catch (NoSuchAlgorithmException e) {
             throw new IllegalArgumentException(e.toString());
         } catch (InvalidKeySpecException e) {

diff --git a/...a-sdk-core/src/main/java/com/aliyuncs/auth/STSGetSessionAccessKeyCredentialsProvider.java b/...a-sdk-core/src/main/java/com/aliyuncs/auth/STSGetSessionAccessKeyCredentialsProvider.java
@@ -65,7 +65,7 @@ private BasicSessionCredentials getNewSessionCredentials() throws ClientExceptio
 
         return new BasicSessionCredentials(
                 response.getSessionAccessKey().getSessionAccessKeyId(),
-                response.getSessionAccessKey().getSessionAccessKeySecert(),
+                response.getSessionAccessKey().getSessionAccessKeySecret(),
                 null,
                 sessionDurationSeconds
         );

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/V3SignatureComposer.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/V3SignatureComposer.java
@@ -84,7 +84,7 @@ private Map<String, String> getCanonicalizedHeadersMap(Map<String, String> heade
     }
 
     private String getCanonicalizedResource(Map<String, String> query) {
-        if (query == null || query.size() == 0) {
+        if (query == null || query.isEmpty()) {
             return "";
         }
         String[] keys = query.keySet().toArray(new String[query.size()]);

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/AssumeRoleRequest.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/AssumeRoleRequest.java
@@ -19,16 +19,9 @@
 
 package com.aliyuncs.auth.sts;
 
-/**
- * Created by haowei.yao on 2017/9/14.
- */
-
 import com.aliyuncs.RpcAcsRequest;
 import com.aliyuncs.http.ProtocolType;
 
-/**
- * @author auto create
- */
 public class AssumeRoleRequest extends RpcAcsRequest<AssumeRoleResponse> {
 
     private Long durationSeconds;

diff --git a/...n-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/GenerateSessionAccessKeyResponse.java b/...n-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/GenerateSessionAccessKeyResponse.java
@@ -59,13 +59,13 @@ public void setSessionAccessKeyId(String sessionAccessKeyId) {
             this.sessionAccessKeyId = sessionAccessKeyId;
         }
 
-        public String getSessionAccessKeySecert() {
+        public String getSessionAccessKeySecret() {
             return sessionAccessKeySecret;
         }
 
         @XmlElement(name = "SessionAccessKeySecret")
-        public void setSessionAccessKeySecert(String sessionAccessKeySecert) {
-            this.sessionAccessKeySecret = sessionAccessKeySecert;
+        public void setSessionAccessKeySecret(String sessionAccessKeySecret) {
+            this.sessionAccessKeySecret = sessionAccessKeySecret;
         }
 
         public String getExpiration() {

diff --git a/...sdk-core/src/main/java/com/aliyuncs/auth/sts/GetSessionAccessKeyResponseUnmarshaller.java b/...sdk-core/src/main/java/com/aliyuncs/auth/sts/GetSessionAccessKeyResponseUnmarshaller.java
@@ -12,7 +12,7 @@ public static GenerateSessionAccessKeyResponse unmarshall(GenerateSessionAccessK
 
         SessionAccessKey credentials = new SessionAccessKey();
         credentials.setSessionAccessKeyId(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.SessionAccessKeyId"));
-        credentials.setSessionAccessKeySecert(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.SessionAccessKeySecret"));
+        credentials.setSessionAccessKeySecret(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.SessionAccessKeySecret"));
         credentials.setExpiration(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.Expiration"));
 
         getSessionAccessKeyResponse.setSessionAccessKey(credentials);

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/EndpointResolverRules.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/EndpointResolverRules.java
@@ -50,14 +50,14 @@ private String getEndpoint(String productCode, String regionId) {
                 }
             }
 
-            String endpoint = "";
+            String endpoint;
             if ("regional".equals(this.productEndpointRegional)) {
                 endpoint = "<product_id><suffix><network>.<region_id>.aliyuncs.com";
                 endpoint = endpoint.replace("<region_id>", regionId.toLowerCase());
             } else {
                 endpoint = "<product_id><suffix><network>.aliyuncs.com";
             }
-            if (this.productSuffix == null || "".equals(this.productSuffix)) {
+            if (StringUtils.isEmpty(this.productSuffix)) {
                 endpoint = endpoint.replace("<suffix>", "");
             } else {
                 endpoint = endpoint.replace("<suffix>", "-" + this.productSuffix.toLowerCase());

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/ResolveEndpointRequest.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/ResolveEndpointRequest.java
@@ -1,17 +1,19 @@
 package com.aliyuncs.endpoint;
 
+import com.aliyuncs.utils.StringUtils;
+
 import java.util.HashMap;
 
 public class ResolveEndpointRequest {
 
     public static final String ENDPOINT_TYPE_INNER = "innerAPI";
     public static final String ENDPOINT_TYPE_OPEN = "openAPI";
 
-    public String productCode = null;
-    public String regionId = null;
-    public String endpointType = null;
-    public String locationServiceCode = null;
-    public String productCodeLower = null;
+    public String productCode;
+    public String regionId;
+    public String endpointType;
+    public String locationServiceCode;
+    public String productCodeLower;
     public HashMap<String, String> productEndpointMap = null;
     public String productEndpointRegional = null;
     public String productNetwork = "public";
@@ -24,7 +26,7 @@ public ResolveEndpointRequest(String regionId, String productCode,
         this.productCode = productCode;
         this.productCodeLower = productCode.toLowerCase();
 
-        if (endpointType == null || endpointType.length() == 0) {
+        if (StringUtils.isEmpty(endpointType)) {
             endpointType = ENDPOINT_TYPE_OPEN;
         }
 

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/CallBack.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/CallBack.java
@@ -2,9 +2,6 @@
 
 /**
  * 用于异步调用时的回调逻辑
- *
- * @author VK.Gao
- * @date 2017/03/02
  */
 public interface CallBack {
 

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/CompositeX509TrustManager.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/CompositeX509TrustManager.java
@@ -27,7 +27,7 @@ public CompositeX509TrustManager(List<X509TrustManager> trustManagers) {
     }
 
     @Override
-    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    public void checkClientTrusted(X509Certificate[] chain, String authType) {
         // do nothing
     }
 

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpClientFactory.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpClientFactory.java
@@ -20,7 +20,7 @@ public static IHttpClient buildClient(IClientProfile profile) {
                 profile.setHttpClientConfig(clientConfig);
             }
 
-            String customClientClassName = null;
+            String customClientClassName;
             if (clientConfig.isCompatibleMode()) {
                 customClientClassName = COMPATIBLE_HTTP_CLIENT_CLASS_NAME;
             } else if (clientConfig.getClientType() == HttpClientType.Custom && !StringUtils.isEmpty(clientConfig.getCustomClientClassName())) {

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpUtil.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpUtil.java
@@ -53,7 +53,7 @@ public static String debugHttpRequest(HttpRequest request) {
             StringBuilder debugString = new StringBuilder();
 
             String sysUrl = request.getSysUrl();
-            URL url = null;
+            URL url;
             try {
                 url = new URL(sysUrl);
                 debugString.append("> " + request.getSysMethod() + " " + url.getProtocol().toUpperCase() + "/1.1\n> ");

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java
@@ -120,8 +120,7 @@ private SSLConnectionSocketFactory createSSLConnectionSocketFactory() throws Cli
                 } else {
                     hostnameVerifier = new DefaultHostnameVerifier();
                 }
-                SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
-                return sslConnectionSocketFactory;
+                return new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
             } else {
                 HostnameVerifier hostnameVerifier;
                 if (null == clientConfig.getHostnameVerifier()) {

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java
@@ -48,9 +48,9 @@ protected void init(HttpClientConfig clientConfig) {
     @Override
     public HttpResponse syncInvoke(HttpRequest request) throws IOException, ClientException {
         InputStream content = null;
-        HttpResponse response = null;
+        HttpResponse response;
         HttpURLConnection httpConn = buildHttpConnection(request);
-        OutputStream out = null;
+        OutputStream out;
 
         try {
             httpConn.connect();
@@ -85,8 +85,7 @@ public Future<HttpResponse> asyncInvoke(HttpRequest apiRequest, CallBack callbac
     }
 
     private boolean calcIgnoreSSLCert(HttpRequest request) {
-        boolean ignoreSSLCert = request.isIgnoreSSLCerts() ? request.isIgnoreSSLCerts() : clientConfig.isIgnoreSSLCerts();
-        return ignoreSSLCert;
+        return request.isIgnoreSSLCerts() ? request.isIgnoreSSLCerts() : clientConfig.isIgnoreSSLCerts();
     }
 
     private CompositeX509TrustManager calcX509TrustManager(HttpRequest request) throws KeyStoreException, NoSuchAlgorithmException {
@@ -245,7 +244,7 @@ private void setConnectionRequestProperty(HttpURLConnection httpConn, HttpReques
     private HttpURLConnection buildHttpConnection(HttpRequest request) throws IOException, ClientException {
         checkHttpRequest(request);
         String strUrl = request.getSysUrl();
-        URL url = null;
+        URL url;
         String[] urlArray = null;
         if (MethodType.POST.equals(request.getSysMethod()) && null == request.getHttpContent()) {
             urlArray = strUrl.split("\\?");

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/profile/DefaultProfile.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/profile/DefaultProfile.java
@@ -2,7 +2,6 @@
 
 import com.aliyuncs.auth.*;
 import com.aliyuncs.endpoint.DefaultEndpointResolver;
-import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.FormatType;
 import com.aliyuncs.http.HttpClientConfig;
 import com.aliyuncs.utils.ParameterHelper;
@@ -57,8 +56,7 @@ public synchronized static DefaultProfile getProfile(String regionId, ICredentia
     }
 
     public synchronized static DefaultProfile getProfile(String regionId, String accessKeyId, String secret) {
-        Credential creden = new Credential(accessKeyId, secret);
-        profile = new DefaultProfile(regionId, creden);
+        profile = new DefaultProfile(regionId, new Credential(accessKeyId, secret));
         return profile;
     }
 

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/profile/IClientProfile.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/profile/IClientProfile.java
@@ -7,7 +7,6 @@
 import com.aliyuncs.http.HttpClientConfig;
 import org.slf4j.Logger;
 
-@SuppressWarnings("deprecation")
 public interface IClientProfile {
 
     /**

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/reader/XmlReader.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/reader/XmlReader.java
@@ -40,7 +40,7 @@ private void read(Element element, String path, boolean appendPath) {
         path = buildPath(element, path, appendPath);
         List<Element> childElements = XmlUtils.getChildElements(element);
 
-        if (childElements.size() == 0) {
+        if (childElements.isEmpty()) {
             map.put(path, element.getTextContent());
             return;
         }

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/transform/UnmarshallerContext.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/transform/UnmarshallerContext.java
@@ -13,7 +13,7 @@ public class UnmarshallerContext {
 
     public Integer integerValue(String key) {
         String value = responseMap.get(key);
-        if (null == value || 0 == value.length()) {
+        if (null == value || value.isEmpty()) {
             return null;
         }
         return Integer.valueOf(value);
@@ -25,39 +25,39 @@ public String stringValue(String key) {
 
     public Long longValue(String key) {
         String value = responseMap.get(key);
-        if (null == value || 0 == value.length()) {
+        if (null == value || value.isEmpty()) {
             return null;
         }
         return Long.valueOf(responseMap.get(key));
     }
 
     public Boolean booleanValue(String key) {
         String value = responseMap.get(key);
-        if (null == value || 0 == value.length()) {
+        if (null == value || value.isEmpty()) {
             return null;
         }
         return Boolean.valueOf(responseMap.get(key));
     }
 
     public Float floatValue(String key) {
         String value = responseMap.get(key);
-        if (null == value || 0 == value.length()) {
+        if (null == value || value.isEmpty()) {
             return null;
         }
         return Float.valueOf(responseMap.get(key));
     }
 
     public Double doubleValue(String key) {
         String value = responseMap.get(key);
-        if (null == value || 0 == value.length()) {
+        if (null == value || value.isEmpty()) {
             return null;
         }
         return Double.valueOf(responseMap.get(key));
     }
 
     public int lengthValue(String key) {
         String value = responseMap.get(key);
-        if (null == value || 0 == value.length()) {
+        if (null == value || value.isEmpty()) {
             return 0;
         }
         return Integer.valueOf(responseMap.get(key));

diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/unmarshaller/Unmarshaller.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/unmarshaller/Unmarshaller.java
@@ -5,5 +5,5 @@
 
 public interface Unmarshaller {
 
-    <T extends AcsResponse> T unmarshal(Class<T> clasz, String content) throws ClientException;
+    <T extends AcsResponse> T unmarshal(Class<T> clazz, String content) throws ClientException;
 }
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/AuthUtils.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/AuthUtils.java
@@ -1,6 +1,5 @@
 package com.aliyuncs.utils;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
@@ -20,7 +19,7 @@ public static String getPrivateKey(String filePath) {
                     FileInputStream in = null;
                     byte[] buffer;
                     try {
-                        in = new FileInputStream(new File(filePath));
+                        in = new FileInputStream(filePath);
                         buffer = new byte[in.available()];
                         in.read(buffer);
                         privateKey = new String(buffer, "UTF-8");
@@ -48,10 +47,8 @@ public static void setPrivateKey(String key) {
     public static String getClientType() {
         if (null == clientType) {
             AuthUtils.clientType = "default";
-            return AuthUtils.clientType;
-        } else {
-            return AuthUtils.clientType;
         }
+        return AuthUtils.clientType;
     }
 
     public static void setClientType(String clientType) {