Fixed an issue where the format was empty

atptro · JacksonTian · commit 36d8f7bcec48 · 2019-01-28T15:11:55.000+08:00
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
@@ -45,7 +45,7 @@ public RpcAcsRequest(String product, String version, String action, String locat
 
     private void initialize() {
         this.setSysMethod(MethodType.GET);
-        this.setAcceptFormat(FormatType.XML);
+        this.setSysAcceptFormat(FormatType.JSON);
         this.setHttpContentType(FormatType.FORM);
         this.composer = RpcSignatureComposer.getComposer();
     }
diff --git a/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/RoaSignatureComposer.java b/aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/RoaSignatureComposer.java
@@ -40,7 +40,7 @@ public Map<String, String> refreshSignParameters(Map<String, String> parameters,
         Map<String, String> immutableMap = new HashMap<String, String>(parameters);
         immutableMap.put("Date", ParameterHelper.getRFC2616Date(new Date()));
         if (null == format) {
-            format = FormatType.RAW;
+            format = FormatType.JSON;
         }
         immutableMap.put("Accept", FormatType.mapFormatToAccept(format));
         immutableMap.put("x-acs-signature-method", signer.getSignerName());
diff --git a/aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/RoaSignatureComposerTest.java b/aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/RoaSignatureComposerTest.java
@@ -149,13 +149,13 @@ public void refreshSignParametersTest() {
         when(signer.getSignerVersion()).thenReturn("signerVersion1");
         when(signer.getSignerType()).thenReturn("signerType1");
         PowerMockito.mockStatic(FormatType.class);
-        BDDMockito.given(FormatType.mapFormatToAccept(FormatType.RAW)).willReturn("raw");
+        BDDMockito.given(FormatType.mapFormatToAccept(FormatType.JSON)).willReturn("json");
         String accessKeyId = "ak";
         FormatType formatType = null;
         Map<String, String> res = composer.refreshSignParameters(parameters, signer, accessKeyId, formatType);
         Assert.assertEquals("paraValue1", res.get("paraKey1"));
         Assert.assertEquals("signerVersion1", res.get("x-acs-signature-version"));
-        Assert.assertEquals("raw", res.get("Accept"));
+        Assert.assertEquals("json", res.get("Accept"));
         Assert.assertEquals("signerType1", res.get("x-acs-signature-type"));
         Assert.assertEquals("signerName1", res.get("x-acs-signature-method"));
         Assert.assertNotNull(res.get("Date"));
diff --git a/java-sdk-function-test/src/test/java/com/aliyuncs/ErrorHandlingTest.java b/java-sdk-function-test/src/test/java/com/aliyuncs/ErrorHandlingTest.java
@@ -1,5 +1,6 @@
 package com.aliyuncs;
 
+import com.aliyuncs.airec.model.v20181012.PushDocumentRequest;
 import com.aliyuncs.exceptions.ClientException;
 import org.junit.Assert;
 import org.junit.Test;
@@ -42,4 +43,18 @@ public void timeOutErrorTest() {
             );
         }
     }
+
+    @Test
+    public void badFormatTypeTest() throws ClientException {
+        PushDocumentRequest request = new PushDocumentRequest();
+        request.setInstanceId("ff");
+        request.setTableName("test");
+        try {
+            this.client.getAcsResponse(request);
+            Assert.fail();
+        } catch (ClientException e) {
+            Assert.assertEquals("InstanceNotExist", e.getErrCode());
+            Assert.assertEquals("The specified instance does not exist.", e.getErrMsg());
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public RpcAcsRequest(String product, String version, String action, String locat`
`45`	`45`
`46`	`46`	`private void initialize() {`
`47`	`47`	`this.setSysMethod(MethodType.GET);`
`48`		`- this.setAcceptFormat(FormatType.XML);`
	`48`	`+ this.setSysAcceptFormat(FormatType.JSON);`
`49`	`49`	`this.setHttpContentType(FormatType.FORM);`
`50`	`50`	`this.composer = RpcSignatureComposer.getComposer();`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Map<String, String> refreshSignParameters(Map<String, String> parameters,`
`40`	`40`	`Map<String, String> immutableMap = new HashMap<String, String>(parameters);`
`41`	`41`	`immutableMap.put("Date", ParameterHelper.getRFC2616Date(new Date()));`
`42`	`42`	`if (null == format) {`
`43`		`- format = FormatType.RAW;`
	`43`	`+ format = FormatType.JSON;`
`44`	`44`	`}`
`45`	`45`	`immutableMap.put("Accept", FormatType.mapFormatToAccept(format));`
`46`	`46`	`immutableMap.put("x-acs-signature-method", signer.getSignerName());`