add region id and user agent in the http header

atptro · JacksonTian · commit fb7e7a911268 · 2019-03-14T19:02:20.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
@@ -42,10 +42,18 @@ public class DefaultAcsClient implements IAcsClient {
     private static final String SIGNATURE_BEGIN = "string to sign is:";
     private final UserAgentConfig userAgentConfig = new UserAgentConfig();
 
+    @Deprecated
     public DefaultAcsClient() throws ClientException {
         this.clientProfile = DefaultProfile.getProfile();
         this.httpClient = HttpClientFactory.buildClient(this.clientProfile);
+    }
+
+    public DefaultAcsClient(String regionId) throws ClientException {
+        this.clientProfile = DefaultProfile.getProfile(regionId);
+        this.httpClient = HttpClientFactory.buildClient(this.clientProfile);
         this.defaultCredentialsProvider = new DefaultCredentialsProvider();
+        this.endpointResolver = new DefaultEndpointResolver(this);
+        this.appendUserAgent("HTTPClient", this.httpClient.getClass().getSimpleName());
     }
 
     public DefaultAcsClient(IClientProfile profile) {
@@ -62,7 +70,7 @@ public DefaultAcsClient(IClientProfile profile, AlibabaCloudCredentialsProvider
         this.clientProfile.setCredentialsProvider(this.credentialsProvider);
         this.httpClient = HttpClientFactory.buildClient(this.clientProfile);
         this.endpointResolver = new DefaultEndpointResolver(this, profile);
-        this.appendUserAgent("Client", this.httpClient.getClass().getSimpleName());
+        this.appendUserAgent("HTTPClient", this.httpClient.getClass().getSimpleName());
     }
 
     @Override
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
@@ -71,7 +71,6 @@ public void setSysVersion(String version) {
         this.putHeaderParameter("x-acs-version", version);
     }
 
-    @Deprecated
     public Map<String, String> getPathParameters() {
         return Collections.unmodifiableMap(pathParameters);
     }
@@ -146,6 +145,7 @@ public HttpRequest signRequest(Signer signer, AlibabaCloudCredentials credential
         if (null != signer && null != credentials) {
             String accessKeyId = credentials.getAccessKeyId();
             imutableMap = this.composer.refreshSignParameters(this.getSysHeaders(), signer, accessKeyId, format);
+            imutableMap.put("RegionId", this.getSysRegionId());
             if (credentials instanceof BasicSessionCredentials) {
                 String sessionToken = ((BasicSessionCredentials) credentials).getSessionToken();
                 if (null != sessionToken) {
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/AuthConstant.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/AuthConstant.java
@@ -20,7 +20,7 @@ public class AuthConstant {
     public static final String INI_ROLE_ARN = "role_arn";
 
     public static final long TSC_VALID_TIME_SECONDS = 3600L;
-    public static final String DEFAULT_REGION = "cn-hangzhou";
+    public static final String DEFAULT_REGION = "region_id";
     public static final String INI_ENABLE = "enable";
 
 }
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
@@ -47,6 +47,11 @@ public class DefaultAcsClientTest {
     public void testConstructor() throws ClientException, IOException {
         DefaultAcsClient client = new DefaultAcsClient();
         Assert.assertTrue(DefaultProfile.getProfile() == client.getProfile());
+
+        client = new DefaultAcsClient("cn-test");
+        Assert.assertEquals("cn-test", client.getProfile().getRegionId());
+        Assert.assertEquals("ApacheHttpClient",
+                client.getUserAgentConfig().getSysUserAgentsMap().get("HTTPClient"));
     }
 
     @SuppressWarnings("deprecation")
@@ -382,7 +387,7 @@ public void testDoActionEndpointTestabilityException() throws ClientException, I
     public void doActionTest() throws ClientException {
         System.setProperty("alibabacloud.accessKeyId", "test");
         System.setProperty("alibabacloud.accessKeyIdSecret", "test");
-        DefaultAcsClient client = new DefaultAcsClient();
+        DefaultAcsClient client = new DefaultAcsClient("test");
         DefaultEndpointResolver endpointResolver = Mockito.mock(DefaultEndpointResolver.class);
         client.setEndpointResolver(endpointResolver);
         String endPoint = "endpoint-test.exception.com";
@@ -694,7 +699,7 @@ public void userAgentConfigTest() {
         client.appendUserAgent("order", "1.2.2");
         String userAgent = UserAgentConfig.resolve(null, client.getUserAgentConfig());
         String resultStr = UserAgentConfig.getDefaultMessage()
-                + " Client/ApacheHttpClient test/1.2.3 order/1.2.2";
+                + " HTTPClient/ApacheHttpClient test/1.2.3 order/1.2.2";
         Assert.assertEquals(resultStr, userAgent);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ public void setSysVersion(String version) {`
`71`	`71`	`this.putHeaderParameter("x-acs-version", version);`
`72`	`72`	`}`
`73`	`73`
`74`		`- @Deprecated`
`75`	`74`	`public Map<String, String> getPathParameters() {`
`76`	`75`	`return Collections.unmodifiableMap(pathParameters);`
`77`	`76`	`}`
`@@ -146,6 +145,7 @@ public HttpRequest signRequest(Signer signer, AlibabaCloudCredentials credential`
`146`	`145`	`if (null != signer && null != credentials) {`
`147`	`146`	`String accessKeyId = credentials.getAccessKeyId();`
`148`	`147`	`imutableMap = this.composer.refreshSignParameters(this.getSysHeaders(), signer, accessKeyId, format);`
	`148`	`+ imutableMap.put("RegionId", this.getSysRegionId());`
`149`	`149`	`if (credentials instanceof BasicSessionCredentials) {`
`150`	`150`	`String sessionToken = ((BasicSessionCredentials) credentials).getSessionToken();`
`151`	`151`	`if (null != sessionToken) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class AuthConstant {`
`20`	`20`	`public static final String INI_ROLE_ARN = "role_arn";`
`21`	`21`
`22`	`22`	`public static final long TSC_VALID_TIME_SECONDS = 3600L;`
`23`		`- public static final String DEFAULT_REGION = "cn-hangzhou";`
	`23`	`+ public static final String DEFAULT_REGION = "region_id";`
`24`	`24`	`public static final String INI_ENABLE = "enable";`
`25`	`25`
`26`	`26`	`}`