Merge pull request #29 from aliyun/refine_rtmp

baiyubin2020 · web-flow · commit 35addccfd659 · 2016-08-10T13:00:09.000+08:00
rtmp
diff --git a/src/main/java/com/aliyun/oss/OSS.java b/src/main/java/com/aliyun/oss/OSS.java
@@ -1648,20 +1648,6 @@ public void generateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRe
     public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
             long expires) throws OSSException, ClientException;
     
-    /**
-     * 生成Live Channel的RTMP推流地址。
-     * @param bucketName Bucket名称。
-     * @param liveChannel Live Channel名称。
-     * @param PlaylistName 生成的点播用m3u8文件的basename，例如playlist.m3u8。
-     * @param expires 期望的过期时间，格式采用epoch time，例如1459922563。
-     * @param parameters 用户自定义参数，没有填null。
-     * @return Live Channel的RTMP推流地址。
-     * @throws OSSException OSS Server异常信息。
-     * @throws ClientException OSS Client异常信息。
-     */
-    public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
-            long expires, Map<String, String> parameters) throws OSSException, ClientException;
-    
     /**
      * 生成Live Channel的RTMP推流地址。
      * @param generatePushflowUrlRequest 请求参数。
diff --git a/src/main/java/com/aliyun/oss/OSSClient.java b/src/main/java/com/aliyun/oss/OSSClient.java
@@ -1391,20 +1391,13 @@ public void generateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRe
     public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
             long expires) throws OSSException, ClientException {
         return this.generateRtmpUri(new GenerateRtmpUriRequest(bucketName, liveChannelName,
-                PlaylistName, expires, null));
+                PlaylistName, expires));
     }
     
     @Override
-    public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
-            long expires, Map<String, String> parameters) throws OSSException, ClientException {
-        return this.generateRtmpUri(new GenerateRtmpUriRequest(bucketName, liveChannelName,
-                PlaylistName, expires, parameters));
-    }
-    
-    @Override
-    public String generateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest) 
+    public String generateRtmpUri(GenerateRtmpUriRequest generateRtmpUriRequest) 
             throws OSSException, ClientException {
-        return liveChannelOperation.generatePushflowUrl(generatePushflowUrlRequest);
+        return liveChannelOperation.generateRtmpUri(generateRtmpUriRequest);
     }
     
     @Override
diff --git a/src/main/java/com/aliyun/oss/internal/LiveChannelOperation.java b/src/main/java/com/aliyun/oss/internal/LiveChannelOperation.java
@@ -336,7 +336,7 @@ public void generateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRe
         doOperation(request, emptyResponseParser, bucketName, key);
     }
     
-    public String generatePushflowUrl(GenerateRtmpUriRequest request) 
+    public String generateRtmpUri(GenerateRtmpUriRequest request) 
             throws OSSException, ClientException {
         
         assertParameterNotNull(request, "request");
@@ -368,11 +368,6 @@ public String generatePushflowUrl(GenerateRtmpUriRequest request)
         
         // Parameters
         requestMessage.addParameter(RequestParameters.PLAYLIST_NAME, playlistName);
-        if (request.getParameters() != null && request.getParameters().size() > 0) {
-            for (Map.Entry<String, String> entry : request.getParameters().entrySet()) {
-                requestMessage.addParameter(entry.getKey(), entry.getValue());
-            }
-        }
         
         if (useSecurityToken) {
             requestMessage.addParameter(SECURITY_TOKEN, currentCreds.getSecurityToken());
diff --git a/src/main/java/com/aliyun/oss/model/GenerateRtmpUriRequest.java b/src/main/java/com/aliyun/oss/model/GenerateRtmpUriRequest.java
@@ -19,9 +19,6 @@
 
 package com.aliyun.oss.model;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * 生成带有签名信息的推流地址的请求
  */
@@ -34,15 +31,6 @@ public GenerateRtmpUriRequest(String bucketName, String liveChannelName,
         this.playlistName = playlistName;
         this.expires = expires;
     }
-    
-    public GenerateRtmpUriRequest(String bucketName, String liveChannelName, 
-            String playlistName, long expires, Map<String, String> parameters) {
-        this.bucketName = bucketName;
-        this.liveChannelName = liveChannelName;
-        this.playlistName = playlistName;
-        this.expires = expires;
-        this.parameters = parameters;
-    }
 
     public String getBucketName() {
         return bucketName;
@@ -76,22 +64,9 @@ public void setExpires(long expires) {
         this.expires = expires;
     }
 
-    public Map<String, String> getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(Map<String, String> params) {
-        this.parameters = params;
-    }
-    
-    public void addParameter(String key, String value) {
-        this.parameters.put(key, value);
-    }
-
     private String bucketName;
     private String liveChannelName;
     private String playlistName;
     private Long expires;
-    private Map<String, String> parameters = new LinkedHashMap<String, String>();
     
 }
diff --git a/src/test/java/com/aliyun/oss/OSSClientRequestTest.java b/src/test/java/com/aliyun/oss/OSSClientRequestTest.java
@@ -178,7 +178,7 @@ public void run() throws Exception{
                 bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, null));
             }
         };
-        executeTest(test1, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",
+        executeTest(test1, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",
                 new HashMap<String, String>(){
             {
             }
@@ -189,7 +189,7 @@ public void run() throws Exception{
                 bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, CannedAccessControlList.PublicRead));
             }
         };
-        executeTest(test2, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",
+        executeTest(test2, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",
                 new HashMap<String, String>(){
             {
                 put("x-oss-acl", "public-read");
@@ -201,7 +201,7 @@ public void run() throws Exception{
                 bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, CannedAccessControlList.PublicReadWrite));
             }
         };
-        executeTest(test3, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",
+        executeTest(test3, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",
                 new HashMap<String, String>(){
             {
                 put("x-oss-acl", "public-read-write");
@@ -213,7 +213,7 @@ public void run() throws Exception{
                 bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, CannedAccessControlList.Private));
             }
         };
-        executeTest(test4, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",
+        executeTest(test4, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",
                 new HashMap<String, String>(){
             {
                 put("x-oss-acl", "private");
diff --git a/src/test/java/com/aliyun/oss/integrationtests/BucketInfoTest.java b/src/test/java/com/aliyun/oss/integrationtests/BucketInfoTest.java
@@ -64,8 +64,8 @@ public void testListBucketWithEndpoint() {
             
             BucketList buckets = ossClient.listBuckets(listBucketsRequest);
             Assert.assertEquals(buckets.getBucketList().size(), 1);
-            Assert.assertTrue(buckets.getBucketList().get(0).getExtranetEndpoint().endsWith(".aliyuncs.com"));
-            Assert.assertTrue(buckets.getBucketList().get(0).getIntranetEndpoint().endsWith(".aliyuncs.com"));
+            Assert.assertNotNull(buckets.getBucketList().get(0).getExtranetEndpoint());
+            Assert.assertNotNull(buckets.getBucketList().get(0).getIntranetEndpoint());
         } catch (Exception e) {
             e.printStackTrace();
             Assert.fail(e.getMessage());
diff --git a/src/test/java/com/aliyun/oss/integrationtests/RtmpTest.java b/src/test/java/com/aliyun/oss/integrationtests/RtmpTest.java
@@ -21,10 +21,7 @@
 
 import java.text.ParseException;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import junit.framework.Assert;
 
 import org.junit.Ignore;
@@ -571,17 +568,10 @@ public void testGeneratePushflowUri() {
             
             // generate without parameters
             String uri2 = ossClient.generateRtmpUri(bucketName, liveChannel, 
-                    liveChannelInfo.getTarget().getPlaylistName(), expires, null);
+                    liveChannelInfo.getTarget().getPlaylistName(), expires);
             
             Assert.assertEquals(uri, uri2);
             
-            // generate with parameters
-            Map<String, String> params = new HashMap<String, String>();
-            params.put("mykey", "myvalue");
-            String uri3 = ossClient.generateRtmpUri(bucketName, liveChannel, 
-                    liveChannelInfo.getTarget().getPlaylistName(), expires, params);
-            
-            Assert.assertTrue(uri3.endsWith("mykey=myvalue"));
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
diff --git a/src/test/java/com/aliyun/oss/integrationtests/UploadPartCopyTest.java b/src/test/java/com/aliyun/oss/integrationtests/UploadPartCopyTest.java
@@ -339,7 +339,7 @@ public void testNormalUploadPartCopyWithSpecialChars() {
         final String sourceBucket = "normal-upload-part-copy-by-range-bucket-source";
         final String targetBucket = "normal-upload-part-copy-by-range-bucket-target";
         final String sourceKey = "测\\r试-中.~,+\"'*&￥#@%！（文）+字符|？/.zip";
-        final String targetKey = "测\\r试-中.~,+\"'*&￥#@%！（文）+字符|？/-2.zip";
+        final String targetKey = "测\\r试-中.~,+\"'*&￥#@%！（文）+字符|？-2.zip";
         final long partSize = 128 * 1024;     //128KB
         
         try {
diff --git a/src/test/java/com/aliyun/oss/integrationtests/UploadPartTest.java b/src/test/java/com/aliyun/oss/integrationtests/UploadPartTest.java
@@ -23,7 +23,6 @@
 import static com.aliyun.oss.integrationtests.TestConstants.BUCKET_NOT_EMPTY_ERR;
 import static com.aliyun.oss.integrationtests.TestConstants.ENTITY_TOO_SMALL_ERR;
 import static com.aliyun.oss.integrationtests.TestConstants.INVALID_PART_ERR;
-import static com.aliyun.oss.integrationtests.TestConstants.INVALID_PART_ORDER_ERR;
 import static com.aliyun.oss.integrationtests.TestConstants.NO_SUCH_BUCKET_ERR;
 import static com.aliyun.oss.integrationtests.TestConstants.NO_SUCH_UPLOAD_ERR;
 import static com.aliyun.oss.integrationtests.TestUtils.calcMultipartsETag;
@@ -913,25 +912,6 @@ public void testUnormalCompleteMultipartUpload() {
                 partETags.set(partNumber - 1, originalPartETag);
             }
             
-            // Invalid part number order(MUST be in ascending order)
-            final int swapFrom = 2;
-            final int swapTo = 5;
-            PartETag tmp = partETags.get(swapTo);
-            partETags.set(swapTo, partETags.get(2));
-            partETags.set(swapFrom, tmp);
-            try {
-                CompleteMultipartUploadRequest completeMultipartUploadRequest = 
-                        new CompleteMultipartUploadRequest(bucketName, key, uploadId, partETags);
-                ossClient.completeMultipartUpload(completeMultipartUploadRequest);
-                Assert.fail("Complete multipart upload should not be successful");
-            } catch (OSSException e) {
-                Assert.assertEquals(OSSErrorCode.INVALID_PART_ORDER, e.getErrorCode());
-                Assert.assertTrue(e.getMessage().startsWith(INVALID_PART_ORDER_ERR));
-            } finally {
-                partETags.set(swapFrom, partETags.get(swapTo));
-                partETags.set(swapTo, tmp);
-            }
-            
             // Try to complete multipart upload with non-existent part
             PartETag nonexistentPartETag = new PartETag(partCount + 1, invalidETag);
             partETags.add(nonexistentPartETag);

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public void run() throws Exception{`
`178`	`178`	`bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, null));`
`179`	`179`	`}`
`180`	`180`	`};`
`181`		`- executeTest(test1, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",`
	`181`	`+ executeTest(test1, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",`
`182`	`182`	`new HashMap<String, String>(){`
`183`	`183`	`{`
`184`	`184`	`}`
`@@ -189,7 +189,7 @@ public void run() throws Exception{`
`189`	`189`	`bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, CannedAccessControlList.PublicRead));`
`190`	`190`	`}`
`191`	`191`	`};`
`192`		`- executeTest(test2, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",`
	`192`	`+ executeTest(test2, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",`
`193`	`193`	`new HashMap<String, String>(){`
`194`	`194`	`{`
`195`	`195`	`put("x-oss-acl", "public-read");`
`@@ -201,7 +201,7 @@ public void run() throws Exception{`
`201`	`201`	`bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, CannedAccessControlList.PublicReadWrite));`
`202`	`202`	`}`
`203`	`203`	`};`
`204`		`- executeTest(test3, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",`
	`204`	`+ executeTest(test3, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",`
`205`	`205`	`new HashMap<String, String>(){`
`206`	`206`	`{`
`207`	`207`	`put("x-oss-acl", "public-read-write");`
`@@ -213,7 +213,7 @@ public void run() throws Exception{`
`213`	`213`	`bucketOp.setBucketAcl(new SetBucketAclRequest(bucketName, CannedAccessControlList.Private));`
`214`	`214`	`}`
`215`	`215`	`};`
`216`		`- executeTest(test4, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "",`
	`216`	`+ executeTest(test4, HttpMethod.PUT, bucketName + "." + endpoint.getHost(), "?acl",`
`217`	`217`	`new HashMap<String, String>(){`
`218`	`218`	`{`
`219`	`219`	`put("x-oss-acl", "private");`