Revert "FormUpload With InputStream"

Author: rwifeng

build.gradle

@@ -16,7 +16,6 @@ dependencies {
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
     testCompile group: 'com.qiniu', name: 'happy-dns-java', version: '0.1.6'
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
 }
 
 

src/main/java/com/qiniu/common/Region.java

@@ -58,7 +58,7 @@ public String getApiHost() {
     /**
      * 域名构造器
      */
-    public static class Builder {
+    static class Builder {
         protected Region region;
 
         public Builder() {

src/main/java/com/qiniu/storage/UploadManager.java

@@ -9,8 +9,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.io.IOUtils;
-
 /**
  * 七牛文件上传管理器，通过该类上传文件时，会自动根据定义的{@link Configuration#putThreshold}
  * 来判断是采用表单上传还是分片上传的方法，超过了定义的{@link Configuration#putThreshold}就会采用
@@ -88,37 +86,6 @@ public void accept(String key, Object value) {
         });
         return ret;
     }
-    
-    /**
-     * 上传字节流，表单形式
-     * 合适小文件，大文件请用流式上传
-     * @param inputStream
-     * @param key
-     * @param token
-     * @return
-     * @throws QiniuException
-     */
-    public Response putWithForm(InputStream inputStream, String key, String token) throws QiniuException, IOException {
-    	return putWithForm(inputStream, key, token, null, null, false);
-    }
-    
-    /**
-     * 上传字节流，表单形式
-     * 合适小文件，大文件请用流式上传
-     * @param inputStream
-     * @param key
-     * @param token
-     * @param params
-     * @param mime
-     * @param checkCrc
-     * @return
-     * @throws QiniuException
-     */
-    public Response putWithForm(InputStream inputStream, String key, String token, StringMap params,
-    					String mime, boolean checkCrc) throws QiniuException, IOException {
-    	byte[] data = IOUtils.toByteArray(inputStream);
-    	return put(data, key, token, params, mime, checkCrc);
-    }
 
     /**
      * 上传字节数组

src/test/java/test/com/qiniu/TestConfig.java

@@ -43,4 +43,12 @@ public static boolean isTravis() {
         return "travis".equals(System.getenv("QINIU_TEST_ENV"));
     }
 
+    public static void main(String[] args) {
+    	try {
+			System.out.println("done");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+    }
+    
 }

src/test/java/test/com/qiniu/rtc/RtcTest.java

@@ -10,7 +10,6 @@
 
 
 public class RtcTest {
-	
     private Auth auth = TestConfig.testAuth;
     private RtcAppManager manager = new RtcAppManager(auth);
     private RtcRoomManager rmanager = new RtcRoomManager(auth);

src/test/java/test/com/qiniu/storage/FormUploadTest2.java

@@ -1,97 +1,97 @@
 package test.com.qiniu.streaming;
 
+import com.google.gson.JsonSyntaxException;
 import com.qiniu.common.QiniuException;
 import com.qiniu.streaming.StreamingManager;
 import com.qiniu.streaming.model.ActivityRecords;
 import com.qiniu.streaming.model.StreamAttribute;
 import com.qiniu.streaming.model.StreamListing;
+import com.qiniu.streaming.model.StreamStatus;
 import com.qiniu.util.Auth;
+import com.qiniu.util.Json;
 import org.junit.Test;
 import test.com.qiniu.TestConfig;
 
 import static org.junit.Assert.*;
 
 /**
  * Created by bailong on 16/9/22
- * Updated by panyuan on 19/3/12
  */
 public class StreamingTest {
-	
     private Auth auth = TestConfig.testAuth;
+
     private String hub = "pilisdktest";
-    private String stream = "javasdk";
-    private String streamNoExist = "javasdk" + "NoExist";
-    private String streamKeyPrefix = "javasdk";
+    private String streamKeyPrefix = "pilijava" + System.currentTimeMillis();
     private StreamingManager manager = new StreamingManager(auth, hub);
 
-    /**
-     * 测试获取不存在的流的信息
-     * 检测返回状态码是否是612
-     */
-    @Test
+
+    //@Test
     public void testGetNoExistStream() {
         try {
-            manager.attribute(streamNoExist);
+            manager.attribute("nnnoexist");
             fail("should not exist");
         } catch (QiniuException e) {
+            e.printStackTrace();
             assertEquals(612, e.code());
         }
     }
 
-    /**
-     * 测试创建、禁用、启用、获取流信息、列举
-     * @throws QiniuException
-     */
-    @Test
+    // CHECKSTYLE:OFF
+    //@Test
     public void testStreamOperation() throws QiniuException {
-        StreamAttribute attr = manager.attribute(stream);
+        // CHECKSTYLE:ON
+        String streamKey = streamKeyPrefix + "-a";
+
+        manager.create(streamKey);
+
+        StreamAttribute attr = manager.attribute(streamKey);
         assertEquals(0, attr.disabledTill);
         assertNotEquals(0, attr.createdAt);
 
         try {
-            manager.create(stream);
+            manager.create(streamKey);
             fail("has already existed");
         } catch (QiniuException e) {
             assertEquals(614, e.code());
         }
 
-        manager.disableTill(stream, -1);
+        manager.disableTill(streamKey, -1);
 
-        attr = manager.attribute(stream);
+        attr = manager.attribute(streamKey);
         assertEquals(-1, attr.disabledTill);
         assertNotEquals(0, attr.updatedAt);
 
-        manager.enable(stream);
-        attr = manager.attribute(stream);
+        manager.enable(streamKey);
+        attr = manager.attribute(streamKey);
         assertEquals(0, attr.disabledTill);
         assertNotEquals(0, attr.updatedAt);
 
         long t = System.currentTimeMillis() / 1000 + 3600;
-        manager.disableTill(stream, t);
-        attr = manager.attribute(stream);
+        manager.disableTill(streamKey, t);
+        attr = manager.attribute(streamKey);
         assertEquals(t, attr.disabledTill);
         assertNotEquals(0, attr.updatedAt);
 
-        manager.enable(stream);
-        attr = manager.attribute(stream);
+        manager.enable(streamKey);
+        attr = manager.attribute(streamKey);
         assertEquals(0, attr.disabledTill);
         assertNotEquals(0, attr.updatedAt);
 
         try {
-            manager.status(stream);
+            StreamStatus status = manager.status(streamKey);
             fail();
         } catch (QiniuException e) {
             assertEquals(619, e.code());
         }
 
         try {
-            manager.saveAs(stream, null, 0, 0);
+            manager.saveAs(streamKey, null, 0, 0);
             fail();
         } catch (QiniuException e) {
             assertEquals(619, e.code());
         }
 
-        ActivityRecords records = manager.history(stream, System.currentTimeMillis() / 1000 - 1000, 0);
+        ActivityRecords records = manager.history(streamKey, System.currentTimeMillis() / 1000 - 1000, 0);
         assertEquals(0, records.items.length);
 
         StreamListing l = manager.listStreams(false, streamKeyPrefix, null);
@@ -118,31 +118,34 @@ public void testStreamOperation() throws QiniuException {
         assertFalse(it.hasNext());
     }
 
-    /**
-     * 测试saveas
-     * 检测返回状态码是否是404
-     * @throws QiniuException
-     */
-    @Test
+    //@Test
     public void testSaveAs() throws QiniuException {
         try {
-            manager.saveAs(streamNoExist, "f\"ff.m3u8");
+            manager.saveAs("test--sd", "f\"ff.m3u8");
         } catch (QiniuException e) {
-        	assertEquals(404, e.response.statusCode);
+            // 619 , no data; 612 stream not found, 但请求正常 //
+            if (e.code() != 619 && e.code() != 612) {
+                throw e;
+            }
         }
     }
 
-    /**
-     * 测试创建流
-     * 检测返回状态码是否为614
-     * @throws QiniuException
-     */
-    @Test
+    //@Test
     public void testCreate() throws QiniuException {
         try {
-            manager.create(stream);
+            String body = String.format("{\"key\":\"%s\"}", "stream\"Key");
+            System.out.println(body);
+            Json.decode(body);
+            fail("json 解析不正确");
+        } catch (JsonSyntaxException e) {
+
+        }
+        try {
+            manager.create("streamKey");
         } catch (QiniuException e) {
-        	assertEquals(614, e.code());
+            if (e.code() != 614) {
+                throw e;
+            }
         }
     }