Skip to content

Commit 28a5de0

Browse files
JacksonTianJacksonTian
committed
improve coding styles
1 parent 9edfe14 commit 28a5de0

35 files changed

+56
-114
lines changed

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/AcsRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public abstract class AcsRequest<T extends AcsResponse> extends HttpRequest {
2424
private UserAgentConfig userAgentConfig;
2525
protected ISignatureComposer composer = null;
2626
private String version = null;
27-
private String product = null;
27+
private String product;
2828
private String actionName = null;
2929
private String regionId = null;
3030
private String securityToken = null;
@@ -76,7 +76,7 @@ public static String concatQueryString(Map<String, String> parameters) throws Un
7676
return null;
7777
}
7878

79-
StringBuilder urlBuilder = new StringBuilder("");
79+
StringBuilder urlBuilder = new StringBuilder();
8080
for (Entry<String, String> entry : parameters.entrySet()) {
8181
String key = entry.getKey();
8282
String val = entry.getValue();

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/CommonRequest.java

-24
Original file line numberDiff line numberDiff line change
@@ -509,30 +509,6 @@ public Map<String, String> getSysPathParameters() {
509509
return pathParameters;
510510
}
511511

512-
public void setSysAccept(FormatType type) {
513-
this.accept = type;
514-
}
515-
516-
public FormatType getSysAccept() {
517-
return this.accept;
518-
}
519-
520-
public SignatureVersion getSysSignatureVersion() {
521-
return signatureVersion;
522-
}
523-
524-
public void setSysSignatureVersion(SignatureVersion signatureVersion) {
525-
this.signatureVersion = signatureVersion;
526-
}
527-
528-
public SignatureAlgorithm getSysSignatureAlgorithm() {
529-
return signatureAlgorithm;
530-
}
531-
532-
public void setSysSignatureAlgorithm(SignatureAlgorithm signatureAlgorithm) {
533-
this.signatureAlgorithm = signatureAlgorithm;
534-
}
535-
536512
public RetryPolicy getSysRetryPolicy() {
537513
return this.retryPolicy;
538514
}

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/RoaAcsRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected void putPathParameter(String name, String value) {
114114
@Override
115115
public String composeUrl(String endpoint, Map<String, String> queries) throws UnsupportedEncodingException {
116116
Map<String, String> mapQueries = (queries == null) ? this.getSysQueryParameters() : queries;
117-
StringBuilder urlBuilder = new StringBuilder("");
117+
StringBuilder urlBuilder = new StringBuilder();
118118
urlBuilder.append(this.getSysProtocol().toString());
119119
urlBuilder.append("://").append(endpoint);
120120
if (null != this.uriPattern) {

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/RpcAcsRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void setSysSecurityToken(String securityToken) {
131131
@Override
132132
public String composeUrl(String endpoint, Map<String, String> queries) throws UnsupportedEncodingException {
133133
Map<String, String> mapQueries = (queries == null) ? this.getSysQueryParameters() : queries;
134-
StringBuilder urlBuilder = new StringBuilder("");
134+
StringBuilder urlBuilder = new StringBuilder();
135135
urlBuilder.append(this.getSysProtocol().toString());
136136
urlBuilder.append("://").append(endpoint);
137137
if (-1 == urlBuilder.indexOf("?")) {
@@ -166,7 +166,7 @@ public HttpRequest signRequest(Signer signer, AlibabaCloudCredentials credential
166166
format);
167167
headerMap.putAll(this.getSysHeaders());
168168
headerMap = this.composer.refreshSignParameters(headerMap, signer, null, null);
169-
if (imutableMap.get("RegionId") == null && this.getSysRegionId() != null && !this.getSysRegionId().equals("")) {
169+
if (imutableMap.get("RegionId") == null && this.getSysRegionId() != null && !this.getSysRegionId().isEmpty()) {
170170
if ((bodyParams == null || bodyParams.get("RegionId") == null)) {
171171
imutableMap.put("RegionId", getSysRegionId());
172172
}

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/DefaultCredentialsProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public DefaultCredentialsProvider() throws ClientException {
2727
defaultProviders.add(new ProfileCredentialsProvider());
2828
String roleName = AuthUtils.getEnvironmentECSMetaData();
2929
if (roleName != null) {
30-
if (roleName.length() == 0) {
30+
if (roleName.isEmpty()) {
3131
throw new ClientException("Environment variable roleName('ALIBABA_CLOUD_ECS_METADATA') cannot be empty");
3232
}
3333
defaultProviders.add(new InstanceProfileCredentialsProvider(roleName));

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/LegacyCredentials.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ public class LegacyCredentials implements AlibabaCloudCredentials {
55

66
private final Credential legacyCredential;
77

8-
public LegacyCredentials(Credential legacyCrendential) {
9-
this.legacyCredential = legacyCrendential;
8+
public LegacyCredentials(Credential legacyCredential) {
9+
this.legacyCredential = legacyCredential;
1010
}
1111

1212
@Override

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ProfileCredentialsProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public AlibabaCloudCredentials getCredentials() throws ClientException {
3131
if (filePath == null) {
3232
filePath = AuthConstant.DEFAULT_CREDENTIALS_FILE_PATH;
3333
}
34-
if (filePath.length() == 0) {
34+
if (filePath.isEmpty()) {
3535
throw new ClientException("The specified credentials file is empty");
3636
}
3737
Wini ini;

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/SHA256withRSASigner.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public String signString(String stringToSign, String accessKeySecret) {
4141
rsaSign.initSign(privateKey);
4242
rsaSign.update(stringToSign.getBytes(ENCODING));
4343
byte[] sign = rsaSign.sign();
44-
String signature = DatatypeConverter.printBase64Binary(sign);
45-
return signature;
44+
return DatatypeConverter.printBase64Binary(sign);
4645
} catch (NoSuchAlgorithmException e) {
4746
throw new IllegalArgumentException(e.toString());
4847
} catch (InvalidKeySpecException e) {

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/STSGetSessionAccessKeyCredentialsProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private BasicSessionCredentials getNewSessionCredentials() throws ClientExceptio
6565

6666
return new BasicSessionCredentials(
6767
response.getSessionAccessKey().getSessionAccessKeyId(),
68-
response.getSessionAccessKey().getSessionAccessKeySecert(),
68+
response.getSessionAccessKey().getSessionAccessKeySecret(),
6969
null,
7070
sessionDurationSeconds
7171
);

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/Signer.java

-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ public abstract class Signer {
3333
private final static Signer HMAC_SM3 = new HmacSM3Signer();
3434
private final static Signer HMAC_SHA256 = new HmacSHA256Signer();
3535

36-
public static Signer getSigner(AlibabaCloudCredentials credentials) {
37-
if (credentials instanceof KeyPairCredentials) {
38-
return SHA256_WITH_RSA_SIGNER;
39-
} else if (credentials instanceof BearerTokenCredentials) {
40-
return BEARER_TOKEN_SIGNER;
41-
} else {
42-
return HMACSHA1_SIGNER;
43-
}
44-
}
45-
4636
public static Signer getSigner(AlibabaCloudCredentials credentials, SignatureVersion signatureVersion, SignatureAlgorithm signatureAlgorithm) {
4737
switch (signatureVersion) {
4838
case V3:

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/V3SignatureComposer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private Map<String, String> getCanonicalizedHeadersMap(Map<String, String> heade
8484
}
8585

8686
private String getCanonicalizedResource(Map<String, String> query) {
87-
if (query == null || query.size() == 0) {
87+
if (query == null || query.isEmpty()) {
8888
return "";
8989
}
9090
String[] keys = query.keySet().toArray(new String[query.size()]);

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/AssumeRoleRequest.java

-7
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@
1919

2020
package com.aliyuncs.auth.sts;
2121

22-
/**
23-
* Created by haowei.yao on 2017/9/14.
24-
*/
25-
2622
import com.aliyuncs.RpcAcsRequest;
2723
import com.aliyuncs.http.ProtocolType;
2824

29-
/**
30-
* @author auto create
31-
*/
3225
public class AssumeRoleRequest extends RpcAcsRequest<AssumeRoleResponse> {
3326

3427
private Long durationSeconds;

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/GenerateSessionAccessKeyResponse.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ public void setSessionAccessKeyId(String sessionAccessKeyId) {
5959
this.sessionAccessKeyId = sessionAccessKeyId;
6060
}
6161

62-
public String getSessionAccessKeySecert() {
62+
public String getSessionAccessKeySecret() {
6363
return sessionAccessKeySecret;
6464
}
6565

6666
@XmlElement(name = "SessionAccessKeySecret")
67-
public void setSessionAccessKeySecert(String sessionAccessKeySecert) {
68-
this.sessionAccessKeySecret = sessionAccessKeySecert;
67+
public void setSessionAccessKeySecret(String sessionAccessKeySecret) {
68+
this.sessionAccessKeySecret = sessionAccessKeySecret;
6969
}
7070

7171
public String getExpiration() {

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/sts/GetSessionAccessKeyResponseUnmarshaller.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public static GenerateSessionAccessKeyResponse unmarshall(GenerateSessionAccessK
1212

1313
SessionAccessKey credentials = new SessionAccessKey();
1414
credentials.setSessionAccessKeyId(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.SessionAccessKeyId"));
15-
credentials.setSessionAccessKeySecert(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.SessionAccessKeySecret"));
15+
credentials.setSessionAccessKeySecret(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.SessionAccessKeySecret"));
1616
credentials.setExpiration(context.stringValue("GenerateSessionAccessKeyResponse.SessionAccessKey.Expiration"));
1717

1818
getSessionAccessKeyResponse.setSessionAccessKey(credentials);

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/EndpointResolverRules.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ private String getEndpoint(String productCode, String regionId) {
5050
}
5151
}
5252

53-
String endpoint = "";
53+
String endpoint;
5454
if ("regional".equals(this.productEndpointRegional)) {
5555
endpoint = "<product_id><suffix><network>.<region_id>.aliyuncs.com";
5656
endpoint = endpoint.replace("<region_id>", regionId.toLowerCase());
5757
} else {
5858
endpoint = "<product_id><suffix><network>.aliyuncs.com";
5959
}
60-
if (this.productSuffix == null || "".equals(this.productSuffix)) {
60+
if (StringUtils.isEmpty(this.productSuffix)) {
6161
endpoint = endpoint.replace("<suffix>", "");
6262
} else {
6363
endpoint = endpoint.replace("<suffix>", "-" + this.productSuffix.toLowerCase());

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/LocationServiceEndpointResolver.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.aliyuncs.exceptions.ClientException;
77
import com.aliyuncs.http.FormatType;
88
import com.aliyuncs.http.ProtocolType;
9+
import com.aliyuncs.utils.StringUtils;
910

1011
import java.util.HashSet;
1112
import java.util.Set;
@@ -44,7 +45,7 @@ public static void setLocationServiceEndpoint(String endpoint) {
4445

4546
@Override
4647
public String resolve(ResolveEndpointRequest request) throws ClientException {
47-
if (request.locationServiceCode == null || request.locationServiceCode.length() == 0) {
48+
if (StringUtils.isEmpty(request.locationServiceCode)) {
4849
return null;
4950
}
5051

@@ -112,7 +113,6 @@ private void callLocationService(String key, ResolveEndpointRequest request) thr
112113
validProductCodes.add(request.productCodeLower);
113114
validRegionIds.add(request.regionId);
114115

115-
116116
boolean foundFlag = false;
117117
for (DescribeEndpointsResponse.Endpoint endpoint : response.getEndpoints()) {
118118
if (endpoint.getSerivceCode().equals(request.locationServiceCode)
@@ -149,11 +149,6 @@ public String makeEndpointKey(ResolveEndpointRequest request) {
149149
);
150150
}
151151

152-
@Deprecated
153-
public String makeRegionIdKey(ResolveEndpointRequest request) {
154-
return request.locationServiceCode + "." + request.regionId + "." + request.endpointType;
155-
}
156-
157152
public String makeEndpointKey(String productCode, String locationServiceCode, String regionId,
158153
String endpointType) {
159154
return productCode.toLowerCase() + "." + locationServiceCode + "."

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/endpoint/ResolveEndpointRequest.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package com.aliyuncs.endpoint;
22

3+
import com.aliyuncs.utils.StringUtils;
4+
35
import java.util.HashMap;
46

57
public class ResolveEndpointRequest {
68

79
public static final String ENDPOINT_TYPE_INNER = "innerAPI";
810
public static final String ENDPOINT_TYPE_OPEN = "openAPI";
911

10-
public String productCode = null;
11-
public String regionId = null;
12-
public String endpointType = null;
13-
public String locationServiceCode = null;
14-
public String productCodeLower = null;
12+
public String productCode;
13+
public String regionId;
14+
public String endpointType;
15+
public String locationServiceCode;
16+
public String productCodeLower;
1517
public HashMap<String, String> productEndpointMap = null;
1618
public String productEndpointRegional = null;
1719
public String productNetwork = "public";
@@ -24,7 +26,7 @@ public ResolveEndpointRequest(String regionId, String productCode,
2426
this.productCode = productCode;
2527
this.productCodeLower = productCode.toLowerCase();
2628

27-
if (endpointType == null || endpointType.length() == 0) {
29+
if (StringUtils.isEmpty(endpointType)) {
2830
endpointType = ENDPOINT_TYPE_OPEN;
2931
}
3032

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/CallBack.java

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
/**
44
* 用于异步调用时的回调逻辑
5-
*
6-
* @author VK.Gao
7-
* @date 2017/03/02
85
*/
96
public interface CallBack {
107

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/CompositeX509TrustManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public CompositeX509TrustManager(List<X509TrustManager> trustManagers) {
2727
}
2828

2929
@Override
30-
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
30+
public void checkClientTrusted(X509Certificate[] chain, String authType) {
3131
// do nothing
3232
}
3333

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpClientFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static IHttpClient buildClient(IClientProfile profile) {
2020
profile.setHttpClientConfig(clientConfig);
2121
}
2222

23-
String customClientClassName = null;
23+
String customClientClassName;
2424
if (clientConfig.isCompatibleMode()) {
2525
customClientClassName = COMPATIBLE_HTTP_CLIENT_CLASS_NAME;
2626
} else if (clientConfig.getClientType() == HttpClientType.Custom && !StringUtils.isEmpty(clientConfig.getCustomClientClassName())) {

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/HttpUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static String debugHttpRequest(HttpRequest request) {
5353
StringBuilder debugString = new StringBuilder();
5454

5555
String sysUrl = request.getSysUrl();
56-
URL url = null;
56+
URL url;
5757
try {
5858
url = new URL(sysUrl);
5959
debugString.append("> " + request.getSysMethod() + " " + url.getProtocol().toUpperCase() + "/1.1\n> ");

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/IHttpClient.java

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public IHttpClient(HttpClientConfig clientConfig) throws ClientException {
1616
}
1717
this.clientConfig = clientConfig;
1818
init(clientConfig);
19-
2019
}
2120

2221
public IHttpClient() {

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/ApacheHttpClient.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ private SSLConnectionSocketFactory createSSLConnectionSocketFactory() throws Cli
120120
} else {
121121
hostnameVerifier = new DefaultHostnameVerifier();
122122
}
123-
SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
124-
return sslConnectionSocketFactory;
123+
return new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
125124
} else {
126125
HostnameVerifier hostnameVerifier;
127126
if (null == clientConfig.getHostnameVerifier()) {

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/http/clients/CompatibleUrlConnClient.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ protected void init(HttpClientConfig clientConfig) {
4848
@Override
4949
public HttpResponse syncInvoke(HttpRequest request) throws IOException, ClientException {
5050
InputStream content = null;
51-
HttpResponse response = null;
51+
HttpResponse response;
5252
HttpURLConnection httpConn = buildHttpConnection(request);
53-
OutputStream out = null;
53+
OutputStream out;
5454

5555
try {
5656
httpConn.connect();
@@ -85,8 +85,7 @@ public Future<HttpResponse> asyncInvoke(HttpRequest apiRequest, CallBack callbac
8585
}
8686

8787
private boolean calcIgnoreSSLCert(HttpRequest request) {
88-
boolean ignoreSSLCert = request.isIgnoreSSLCerts() ? request.isIgnoreSSLCerts() : clientConfig.isIgnoreSSLCerts();
89-
return ignoreSSLCert;
88+
return request.isIgnoreSSLCerts() ? request.isIgnoreSSLCerts() : clientConfig.isIgnoreSSLCerts();
9089
}
9190

9291
private CompositeX509TrustManager calcX509TrustManager(HttpRequest request) throws KeyStoreException, NoSuchAlgorithmException {
@@ -246,7 +245,7 @@ private void setConnectionRequestProperty(HttpURLConnection httpConn, HttpReques
246245
private HttpURLConnection buildHttpConnection(HttpRequest request) throws IOException, ClientException {
247246
checkHttpRequest(request);
248247
String strUrl = request.getSysUrl();
249-
URL url = null;
248+
URL url;
250249
String[] urlArray = null;
251250
if (MethodType.POST.equals(request.getSysMethod()) && null == request.getHttpContent()) {
252251
urlArray = strUrl.split("\\?");

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/profile/DefaultProfile.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.aliyuncs.auth.*;
44
import com.aliyuncs.endpoint.DefaultEndpointResolver;
5-
import com.aliyuncs.exceptions.ClientException;
65
import com.aliyuncs.http.FormatType;
76
import com.aliyuncs.http.HttpClientConfig;
87
import com.aliyuncs.utils.ParameterHelper;
@@ -57,8 +56,7 @@ public synchronized static DefaultProfile getProfile(String regionId, ICredentia
5756
}
5857

5958
public synchronized static DefaultProfile getProfile(String regionId, String accessKeyId, String secret) {
60-
Credential creden = new Credential(accessKeyId, secret);
61-
profile = new DefaultProfile(regionId, creden);
59+
profile = new DefaultProfile(regionId, new Credential(accessKeyId, secret));
6260
return profile;
6361
}
6462

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/profile/IClientProfile.java

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.aliyuncs.http.HttpClientConfig;
88
import org.slf4j.Logger;
99

10-
@SuppressWarnings("deprecation")
1110
public interface IClientProfile {
1211

1312
/**

0 commit comments

Comments
 (0)