modify core

wuling0412 · wuling0412 · commit c87a032b9c4f · 2017-03-08T19:15:35.000+08:00
diff --git a/aliyun-java-sdk-core/pom.xml b/aliyun-java-sdk-core/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.aliyun</groupId>
   <artifactId>aliyun-java-sdk-core</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.10</version>
+  <version>3.1.1</version>
   <name>aliyun-java-sdk-core</name>
   <url>http://www.aliyun.com</url>
   <description>Aliyun Open API SDK for Java
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
@@ -204,7 +204,7 @@ public <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request,
 		}catch (SocketTimeoutException exp){
 			throw new ClientException("SDK.ServerUnreachable","SocketTimeoutException has occurred on a socket read or accept.");
 		}catch (IOException exp) {
-			throw new ClientException("SDK.ServerUnreachable", "Speicified endpoint or uri is not valid.");
+			throw new ClientException("SDK.ServerUnreachable", "Server unreachable: " + exp.toString());
 		} catch (NoSuchAlgorithmException exp) {
 			throw new ClientException("SDK.InvalidMD5Algorithm", "MD5 hash is not supported by client side.");
 		}
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/regions/DescribeEndpointServiceImpl.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/regions/DescribeEndpointServiceImpl.java
@@ -37,7 +37,10 @@ public DescribeEndpointResponse describeEndpoint(String regionId, String service
         request.setRegionId(locationConfig.getRegionId());
         request.setLocationProduct(serviceCode);
         request.setSecurityToken(credential.getSecurityToken());
-        request.setEndpointType(DEFAULT_ENDPOINT_TYPE);
+        if (isEmpty(endpointType)) {
+            endpointType = DEFAULT_ENDPOINT_TYPE;
+        }
+        request.setEndpointType(endpointType);
 
         ISigner signer = ShaHmac1Singleton.INSTANCE.getInstance();
         ProductDomain domain = new ProductDomain(locationConfig.getProduct(), locationConfig.getEndpoint());
@@ -47,7 +50,7 @@ public DescribeEndpointResponse describeEndpoint(String regionId, String service
             HttpResponse httpResponse = HttpResponse.getResponse(httpRequest);
             if (httpResponse.isSuccess()) {
                 String data = new String(httpResponse.getContent(), "utf-8");
-                DescribeEndpointResponse response = getEndpointResponse(data);
+                DescribeEndpointResponse response = getEndpointResponse(data, endpointType);
                 if (response == null || isEmpty(response.getEndpoint())) {
                     return null;
                 }
@@ -68,16 +71,16 @@ public DescribeEndpointResponse describeEndpoint(String regionId, String service
         }
     }
 
-    private DescribeEndpointResponse getEndpointResponse(String data) throws ClientException {
+    private DescribeEndpointResponse getEndpointResponse(String data, String endpointType) throws ClientException {
         Reader reader = ReaderFactory.createInstance(FormatType.JSON);
         UnmarshallerContext context = new UnmarshallerContext();
 
         context.setResponseMap(reader.read(data, "DescribeEndpointsResponse"));
 
         int endpointsLength = context.lengthValue("DescribeEndpointsResponse.Endpoints.Length");
         for (int i = 0; i < endpointsLength; i++) {
-            if (DEFAULT_ENDPOINT_TYPE.equalsIgnoreCase(context.stringValue("DescribeEndpointsResponse.Endpoints[" + i
-                    + "].Type"))) {
+            if (endpointType.equalsIgnoreCase(context
+                    .stringValue("DescribeEndpointsResponse.Endpoints[" + i + "].Type"))) {
                 DescribeEndpointResponse response = new DescribeEndpointResponse();
 
                 response.setRequestId(context.stringValue("DescribeEndpointsResponse.RequestId"));
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/regions/LocationConfig.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/regions/LocationConfig.java
@@ -1,6 +1,9 @@
 package com.aliyuncs.regions;
 
-public final class LocationConfig {
+public final class LocationConfig {   
+    public static final String LOCATION_INNER_ENDPOINT = "location.aliyuncs.com";
+    public static final String LOCATION_INNER_PRODUCT  = "Location";
+    
     private String regionId = "cn-hangzhou";
     private String product  = "Location";
     private String endpoint = "location.aliyuncs.com";

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public <T extends AcsResponse> HttpResponse doAction(AcsRequest<T> request,`
`204`	`204`	`}catch (SocketTimeoutException exp){`
`205`	`205`	`throw new ClientException("SDK.ServerUnreachable","SocketTimeoutException has occurred on a socket read or accept.");`
`206`	`206`	`}catch (IOException exp) {`
`207`		`- throw new ClientException("SDK.ServerUnreachable", "Speicified endpoint or uri is not valid.");`
	`207`	`+ throw new ClientException("SDK.ServerUnreachable", "Server unreachable: " + exp.toString());`
`208`	`208`	`} catch (NoSuchAlgorithmException exp) {`
`209`	`209`	`throw new ClientException("SDK.InvalidMD5Algorithm", "MD5 hash is not supported by client side.");`
`210`	`210`	`}`