Fix deleteVersions key escape issue

Author: liyanzhang505

src/main/java/com/aliyun/oss/common/parser/RequestMarshallers.java

@@ -700,7 +700,7 @@ public byte[] marshall(DeleteVersionsRequest request) {
                 KeyVersion key = keysToDelete.get(i);
                 xmlBody.append("<Object>");
                 xmlBody.append("<Key>" +
-                    escapeKey(HttpUtil.urlEncode(key.getKey(), StringUtils.DEFAULT_ENCODING)) + "</Key>");
+                    escapeKey(key.getKey()) + "</Key>");
                 if (key.getVersion() != null) {
                     xmlBody.append("<VersionId>" + key.getVersion() + "</VersionId>");
                 }

src/main/java/com/aliyun/oss/model/ListVersionsRequest.java

@@ -151,7 +151,7 @@ public class ListVersionsRequest extends GenericRequest {
      * can add this parameter to request that OSS encode the keys in the
      * response.
      */
-    private String encodingType = OSSConstants.URL_ENCODING;
+    private String encodingType;
 
 
     /**

src/test/java/com/aliyun/oss/integrationtests/ListVersionsTest.java

@@ -33,17 +33,15 @@
 import com.aliyun.oss.common.auth.Credentials;
 import com.aliyun.oss.common.auth.DefaultCredentialProvider;
 import com.aliyun.oss.common.auth.DefaultCredentials;
+import com.aliyun.oss.internal.OSSConstants;
+import com.aliyun.oss.model.*;
 import junit.framework.Assert;
 
 import org.junit.Test;
 
 import com.aliyun.oss.OSSErrorCode;
 import com.aliyun.oss.OSSException;
-import com.aliyun.oss.model.ListVersionsRequest;
-import com.aliyun.oss.model.OSSVersionSummary;
-import com.aliyun.oss.model.VersionListing;
-import com.aliyun.oss.model.BucketVersioningConfiguration;
-import com.aliyun.oss.model.SetBucketVersioningRequest;
+import com.aliyun.oss.model.DeleteVersionsRequest.KeyVersion;
 
 public class ListVersionsTest extends TestBase {
 
@@ -176,8 +174,7 @@ public void testListVersionsWithEncodingType() {
                 // Unormal
                 ListVersionsRequest listVersionsRequest = new ListVersionsRequest()
                     .withBucketName(bucketName)
-                    .withPrefix(objectPrefix)
-                    .withEncodingType(null);
+                    .withPrefix(objectPrefix);
 
                 ossClient.listVersions(listVersionsRequest);
                 Assert.fail("List version should not be successful.");
@@ -189,12 +186,19 @@ public void testListVersionsWithEncodingType() {
             // Normal
             ListVersionsRequest listVersionsRequest = new ListVersionsRequest()
                 .withBucketName(bucketName)
-                .withPrefix(objectPrefix);
+                .withPrefix(objectPrefix)
+                .withEncodingType(OSSConstants.URL_ENCODING);
 
             VersionListing versionListing = ossClient.listVersions(listVersionsRequest);
-            for (OSSVersionSummary version : versionListing.getVersionSummaries()) {
-                String decodedKey = URLDecoder.decode(version.getKey(), "UTF-8");
-                Assert.assertTrue(existingKeys.contains(decodedKey));
+            if (versionListing.getVersionSummaries().size() > 0) {
+                List<KeyVersion> keyVersionsList = new ArrayList<KeyVersion>();
+                for (OSSVersionSummary version : versionListing.getVersionSummaries()) {
+                    String decodedKey = URLDecoder.decode(version.getKey(), "UTF-8");
+                    Assert.assertTrue(existingKeys.contains(decodedKey));
+                    keyVersionsList.add(new KeyVersion(version.getKey(), version.getVersionId()));
+                }
+                DeleteVersionsRequest delVersionsRequest = new DeleteVersionsRequest(bucketName).withKeys(keyVersionsList);
+                ossClient.deleteVersions(delVersionsRequest);
             }
             Assert.assertNull(versionListing.getEncodingType());
         } catch (Exception e) {

src/test/java/com/aliyun/oss/integrationtests/ObjectVersionTest.java

@@ -31,6 +31,7 @@
 import com.aliyun.oss.common.auth.Credentials;
 import com.aliyun.oss.common.auth.DefaultCredentialProvider;
 import com.aliyun.oss.common.auth.DefaultCredentials;
+import com.aliyun.oss.internal.OSSUtils;
 import junit.framework.Assert;
 
 import org.junit.Test;
@@ -70,6 +71,7 @@
 import com.aliyun.oss.model.SetBucketVersioningRequest;
 
 import static com.aliyun.oss.integrationtests.TestUtils.*;
+import static org.junit.Assert.assertTrue;
 
 public class ObjectVersionTest extends TestBase {
 
@@ -222,8 +224,8 @@ public void tesDeleteVersion() {
     }
 
     @Test
-    public void tesDeleteVersions() {
-        String prefix = "version-test-del-multiple-versions";
+    public void testDeleteVersions() {
+        String prefix = (char)9 + "" + (char)0x20 + "123_.*  中文-!@#$%^&*()_+-=;'\"~`><?/':[]|\\";
         long inputStreamLength = 1024;
         String key = null;