improve for coding style

JacksonTian · yndu13 · commit f78b60c6ea2e · 2024-07-08T15:01:06.000+08:00
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/DefaultAcsClient.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/DefaultAcsClient.java
@@ -38,12 +38,10 @@
 @SuppressWarnings("deprecation")
 public class DefaultAcsClient implements IAcsClient {
 
-    /*
-        Now maxRetryNumber and autoRetry has no effect.
-     */
+    // Now maxRetryNumber and autoRetry has no effect.
     private int maxRetryNumber = 3;
     private boolean autoRetry = true;
-    private IClientProfile clientProfile = null;
+    private IClientProfile clientProfile;
     private AlibabaCloudCredentialsProvider credentialsProvider;
 
     private IHttpClient httpClient;
@@ -118,12 +116,10 @@ public <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, Stri
             request.setSysSignatureAlgorithm(this.signatureAlgorithm);
         }
         Signer signer = Signer.getSigner(new LegacyCredentials(credential), request.getSysSignatureVersion(), request.getSysSignatureAlgorithm());
-        FormatType format = null;
         if (null == request.getSysRegionId()) {
             request.setSysRegionId(regionId);
         }
-        return doAction(request, autoRetry, maxRetryNumber, regionId, new LegacyCredentials(credential), signer,
-                format);
+        return doAction(request, regionId, new LegacyCredentials(credential), signer, null);
     }
 
     @Override
@@ -191,8 +187,6 @@ public <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, bool
         if (null == profile) {
             throw new ClientException("SDK.InvalidProfile", "No active profile found.");
         }
-        boolean retry = autoRetry;
-        int retryNumber = maxRetryCounts;
         String region = profile.getRegionId();
         if (null == request.getSysRegionId()) {
             request.setSysRegionId(region);
@@ -212,7 +206,7 @@ public <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, bool
         Signer signer = Signer.getSigner(credentials, request.getSysSignatureVersion(), request.getSysSignatureAlgorithm());
         FormatType format = profile.getFormat();
 
-        return this.doAction(request, retry, retryNumber, request.getSysRegionId(), credentials, signer, format);
+        return this.doAction(request, request.getSysRegionId(), credentials, signer, format);
     }
 
     private <T extends AcsResponse> T parseAcsResponse(AcsRequest<T> request, HttpResponse baseResponse)
@@ -254,13 +248,13 @@ private <T extends AcsResponse> T parseAcsResponse(AcsRequest<T> request, HttpRe
     public <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, boolean autoRetry, int maxRetryNumber,
                                                          String regionId, Credential credential, Signer signer, FormatType format)
             throws ClientException, ServerException {
-        return doAction(request, autoRetry, maxRetryNumber, regionId, new LegacyCredentials(credential), signer,
+        return doAction(request, regionId, new LegacyCredentials(credential), signer,
                 format);
     }
 
     public ProductDomain getDomain(AcsRequest request, String regionId)
             throws ClientException {
-        ProductDomain domain = null;
+        ProductDomain domain;
         if (request.getSysProductDomain() != null) {
             domain = request.getSysProductDomain();
         } else {
@@ -283,11 +277,11 @@ public ProductDomain getDomain(AcsRequest request, String regionId)
         return domain;
     }
 
-    private <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, boolean autoRetry, int maxRetryNumber,
+    private <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request,
                                                           String regionId, AlibabaCloudCredentials credentials, Signer signer, FormatType format)
             throws ClientException, ServerException {
         if (!GlobalTracer.isRegistered() || clientProfile.isCloseTrace()) {
-            return doRealAction(request, autoRetry, maxRetryNumber, regionId, credentials, signer, format);
+            return doRealAction(request, regionId, credentials, signer, format);
         }
 
         Tracer tracer = GlobalTracer.get();
@@ -302,7 +296,7 @@ private <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, boo
                 .start();
         tracer.inject(span.context(), Format.Builtin.HTTP_HEADERS, new HttpHeadersInjectAdapter(request));
         try {
-            HttpResponse response = doRealAction(request, autoRetry, maxRetryNumber, regionId, credentials, signer, format);
+            HttpResponse response = doRealAction(request, regionId, credentials, signer, format);
             span.setTag("status", response.getStatus());
             span.setTag("ReasonPhrase", response.getReasonPhrase());
             return response;
@@ -315,7 +309,7 @@ private <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request, boo
 
     }
 
-    private <T extends AcsResponse> HttpResponse doRealAction(AcsRequest<T> request, boolean autoRetry, int maxRetryNumber,
+    private <T extends AcsResponse> HttpResponse doRealAction(AcsRequest<T> request,
                                                               String regionId, AlibabaCloudCredentials credentials, Signer signer, FormatType format)
             throws ClientException, ServerException {
 
@@ -454,17 +448,17 @@ private <T extends AcsResponse> HttpResponse doRealAction(AcsRequest<T> request,
      * 2019-01-03 change access control from private to protected, then subClass can
      * override it and rewrite httpResponse processing
      */
-    protected <T extends AcsResponse> T readResponse(Class<T> clasz, HttpResponse httpResponse, FormatType format)
+    protected <T extends AcsResponse> T readResponse(Class<T> clazz, HttpResponse httpResponse, FormatType format)
             throws ClientException {
         // new version response contains "@XmlRootElement" annotation
-        if (clasz.isAnnotationPresent(XmlRootElement.class)
+        if (clazz.isAnnotationPresent(XmlRootElement.class)
                 && !clientProfile.getHttpClientConfig().isCompatibleMode()) {
             Unmarshaller unmarshaller = UnmarshallerFactory.getUnmarshaller(format);
-            return unmarshaller.unmarshal(clasz, httpResponse.getHttpContentString());
+            return unmarshaller.unmarshal(clazz, httpResponse.getHttpContentString());
         } else {
             Reader reader = ReaderFactory.createInstance(format);
             UnmarshallerContext context = new UnmarshallerContext();
-            T response = null;
+            T response;
             String stringContent = httpResponse.getHttpContentString();
 
             if (stringContent == null) {
@@ -473,13 +467,13 @@ protected <T extends AcsResponse> T readResponse(Class<T> clasz, HttpResponse ht
             }
 
             try {
-                response = clasz.newInstance();
+                response = clazz.newInstance();
             } catch (Exception e) {
                 throw new ClientException("SDK.InvalidResponseClass",
-                        "Unable to allocate " + clasz.getName() + " class");
+                        "Unable to allocate " + clazz.getName() + " class");
             }
 
-            String responseEndpoint = clasz.getName().substring(clasz.getName().lastIndexOf(".") + 1);
+            String responseEndpoint = clazz.getName().substring(clazz.getName().lastIndexOf(".") + 1);
             if (response.checkShowJsonItemName()) {
                 context.setResponseMap(reader.read(stringContent, responseEndpoint));
             } else {
@@ -532,6 +526,7 @@ public void doActionWithProxy(ProtocolType protocolType, String httpsProxy, Stri
             config.setHttpsProxy(httpsProxy);
             return;
         }
+        return;
     }
 
     /**
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/BasicSessionCredentials.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/BasicSessionCredentials.java
@@ -6,7 +6,7 @@ public class BasicSessionCredentials implements AlibabaCloudCredentials {
     private final String accessKeyId;
     private final String accessKeySecret;
     private final String sessionToken;
-    private long sessionStartedTimeInMilliSeconds = 0;
+    private long sessionStartedTimeInMilliSeconds;
 
     public BasicSessionCredentials(String accessKeyId, String accessKeySecret, String sessionToken) {
         this(accessKeyId, accessKeySecret, sessionToken, 0);
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ECSMetadataServiceCredentialsFetcher.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ECSMetadataServiceCredentialsFetcher.java
@@ -15,7 +15,7 @@
 public class ECSMetadataServiceCredentialsFetcher {
     private static final String URL_IN_ECS_METADATA = "/latest/meta-data/ram/security-credentials/";
     private static final int DEFAULT_TIMEOUT_IN_MILLISECONDS = 1000;
-    private static final String ECS_METADAT_FETCH_ERROR_MSG = "Failed to get RAM session credentials from ECS metadata service.";
+    private static final String ECS_METADATA_FETCH_ERROR_MSG = "Failed to get RAM session credentials from ECS metadata service.";
     private static final int DEFAULT_ECS_SESSION_TOKEN_DURATION_SECONDS = 3600 * 6;
     private URL credentialUrl;
     private String roleName;
@@ -28,7 +28,7 @@ public ECSMetadataServiceCredentialsFetcher() {
 
     public void setRoleName(String roleName) {
         if (null == roleName) {
-            throw new NullPointerException("You must specifiy a valid role name.");
+            throw new NullPointerException("You must specify a valid role name.");
         }
         this.roleName = roleName;
         setCredentialUrl();
@@ -68,22 +68,22 @@ public String getMetadata() throws ClientException {
         }
 
         if (response.getStatus() != HttpURLConnection.HTTP_OK) {
-            throw new ClientException(ECS_METADAT_FETCH_ERROR_MSG + " HttpCode=" + response.getStatus());
+            throw new ClientException(ECS_METADATA_FETCH_ERROR_MSG + " HttpCode=" + response.getStatus());
         }
 
         return new String(response.getHttpContent());
     }
 
     public InstanceProfileCredentials fetch() throws ClientException {
         String jsonContent = getMetadata();
-        JsonObject jsonObject = JsonParser.parseString(jsonContent).getAsJsonObject();;
+        JsonObject jsonObject = JsonParser.parseString(jsonContent).getAsJsonObject();
         if (!jsonObject.has("Code") || !jsonObject.has("AccessKeyId") || !jsonObject.has("AccessKeySecret") || !jsonObject
                 .has("SecurityToken") || !jsonObject.has("Expiration")) {
             throw new ClientException("Invalid json got from ECS Metadata service.");
         }
 
         if (!"Success".equals(jsonObject.get("Code").getAsString())) {
-            throw new ClientException(ECS_METADAT_FETCH_ERROR_MSG);
+            throw new ClientException(ECS_METADATA_FETCH_ERROR_MSG);
         }
         return new InstanceProfileCredentials(
             jsonObject.get("AccessKeyId").getAsString(),
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/EnvironmentVariableCredentialsProvider.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/EnvironmentVariableCredentialsProvider.java
@@ -15,10 +15,10 @@ public AlibabaCloudCredentials getCredentials() throws ClientException {
         if (accessKeyId == null || accessKeySecret == null) {
             return null;
         }
-        if (accessKeyId.length() == 0) {
+        if (accessKeyId.isEmpty()) {
             throw new ClientException("Environment variable accessKeyId cannot be empty");
         }
-        if (accessKeySecret.length() == 0) {
+        if (accessKeySecret.isEmpty()) {
             throw new ClientException("Environment variable accessKeySecret cannot be empty");
         }
         return new BasicCredentials(accessKeyId, accessKeySecret);
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/InstanceProfileCredentialsProvider.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/InstanceProfileCredentialsProvider.java
@@ -12,7 +12,7 @@ public class InstanceProfileCredentialsProvider implements AlibabaCloudCredentia
 
     public InstanceProfileCredentialsProvider(String roleName) {
         if (null == roleName) {
-            throw new NullPointerException("You must specifiy a valid role name.");
+            throw new NullPointerException("You must specify a valid role name.");
         }
         this.roleName = roleName;
         this.fetcher = new ECSMetadataServiceCredentialsFetcher();
@@ -29,11 +29,7 @@ public InstanceProfileCredentialsProvider withFetcher(ECSMetadataServiceCredenti
     public AlibabaCloudCredentials getCredentials() throws ClientException {
         if (credentials == null || credentials.isExpired()) {
             ecsMetadataServiceFetchCount += 1;
-            int maxRetryTimes = MAX_ECS_METADATA_FETCH_RETRY_TIMES;
-            credentials = fetcher.fetch(maxRetryTimes);
-            // } else if (credentials.isExpired()) {
-            // throw new ClientException("SDK.SessionTokenExpired", "Current session token
-            // has expired.");
+            credentials = fetcher.fetch(MAX_ECS_METADATA_FETCH_RETRY_TIMES);
         } else if (credentials.willSoonExpire() && credentials.shouldRefresh()) {
             try {
                 ecsMetadataServiceFetchCount += 1;
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/OIDCCredentialsProvider.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/OIDCCredentialsProvider.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.Date;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -136,7 +135,7 @@ private String invokeAssumeRoleWithOIDC() throws ClientException {
         queries.put("Format", "JSON");
         queries.put("Version", "2015-04-01");
         queries.put("Timestamp", ParameterHelper.getISO8601Time(new Date()));
-        String url = null;
+        String url;
         try {
             url = this.stsEndpoint + "?" + new String(ParameterHelper.getFormData(queries));
         } catch (UnsupportedEncodingException e) {
@@ -148,11 +147,11 @@ private String invokeAssumeRoleWithOIDC() throws ClientException {
         httpRequest.setHttpContentType(FormatType.FORM);
         httpRequest.setSysConnectTimeout(1000);
         httpRequest.setSysReadTimeout(3000);
-        String oidcToken = null;
+        String oidcToken;
         FileInputStream in = null;
         byte[] buffer;
         try {
-            in = new FileInputStream(new File(oidcTokenFilePath));
+            in = new FileInputStream(oidcTokenFilePath);
             buffer = new byte[in.available()];
             in.read(buffer);
             oidcToken = new String(buffer, "UTF-8");
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/OssSignatureComposer.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/OssSignatureComposer.java
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
@@ -75,8 +75,7 @@ public synchronized static DefaultProfile getProfile(String regionId) {
      * @Deprecated : Use addEndpoint(String regionId, String product, String endpoint) instead of this
      */
     @Deprecated
-    public synchronized static void addEndpoint(String endpointName, String regionId, String product, String domain)
-            throws ClientException {
+    public synchronized static void addEndpoint(String endpointName, String regionId, String product, String domain) {
         addEndpoint(endpointName, regionId, product, domain, true);
     }
 
diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/DefaultAcsClientTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/DefaultAcsClientTest.java
diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/OssSignatureComposerTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/OssSignatureComposerTest.java

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ public AlibabaCloudCredentials getCredentials() throws ClientException {`
`15`	`15`	`if (accessKeyId == null \|\| accessKeySecret == null) {`
`16`	`16`	`return null;`
`17`	`17`	`}`
`18`		`- if (accessKeyId.length() == 0) {`
	`18`	`+ if (accessKeyId.isEmpty()) {`
`19`	`19`	`throw new ClientException("Environment variable accessKeyId cannot be empty");`
`20`	`20`	`}`
`21`		`- if (accessKeySecret.length() == 0) {`
	`21`	`+ if (accessKeySecret.isEmpty()) {`
`22`	`22`	`throw new ClientException("Environment variable accessKeySecret cannot be empty");`
`23`	`23`	`}`
`24`	`24`	`return new BasicCredentials(accessKeyId, accessKeySecret);`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ public synchronized static DefaultProfile getProfile(String regionId) {`
`75`	`75`	`* @Deprecated : Use addEndpoint(String regionId, String product, String endpoint) instead of this`
`76`	`76`	`*/`
`77`	`77`	`@Deprecated`
`78`		`- public synchronized static void addEndpoint(String endpointName, String regionId, String product, String domain)`
`79`		`- throws ClientException {`
	`78`	`+ public synchronized static void addEndpoint(String endpointName, String regionId, String product, String domain) {`
`80`	`79`	`addEndpoint(endpointName, regionId, product, domain, true);`
`81`	`80`	`}`
`82`	`81`