some case

Author: YangSen-qn

src/main/java/com/qiniu/processing/OperationManager.java

@@ -4,6 +4,7 @@
 import com.qiniu.http.Client;
 import com.qiniu.http.Response;
 import com.qiniu.media.apis.ApiPfop;
+import com.qiniu.media.apis.ApiPrefop;
 import com.qiniu.storage.Api;
 import com.qiniu.storage.Configuration;
 import com.qiniu.util.Auth;
@@ -128,8 +129,7 @@ public String pfop(String bucket, String key, String fops, StringMap params) thr
                 .setNotifyUrl(notifyUrl)
                 .setType(type);
         ApiPfop api = new ApiPfop(client, new Api.Config.Builder()
-                .setRequestDebugLevel(Api.Config.DebugLevelDetail)
-                .setResponseDebugLevel(Api.Config.DebugLevelDetail)
+                .setAuth(auth)
                 .build());
         ApiPfop.Response response = api.request(request);
         if (response == null) {
@@ -287,13 +287,24 @@ public OperationStatus prefop(String bucket, String persistentId) throws QiniuEx
      * @throws QiniuException 异常
      */
     public <T> T prefop(String bucket, String persistentId, Class<T> retClass) throws QiniuException {
-        String url = String.format("%s/status/get/prefop?id=%s", configuration.apiHost(auth.accessKey, bucket), persistentId);
-        Response response = this.client.get(url);
+        String url = configuration.apiHost(auth.accessKey, bucket);
+        ApiPrefop.Request request = new ApiPrefop.Request(url, persistentId);
+        ApiPrefop api = new ApiPrefop(client,  new Api.Config.Builder()
+                .setAuth(auth)
+                .build());
+        ApiPrefop.Response response = api.request(request);
+        if (response == null) {
+            throw QiniuException.unrecoverable("unknown error");
+        }
         if (!response.isOK()) {
-            throw new QiniuException(response);
+            throw new QiniuException(response.getResponse());
         }
-        T object = response.jsonToObject(retClass);
-        response.close();
-        return object;
+
+//        String url = String.format("%s/status/get/prefop?id=%s", configuration.apiHost(auth.accessKey, bucket), persistentId);
+//        Response response = this.client.get(url);
+//        if (!response.isOK()) {
+//            throw new QiniuException(response);
+//        }
+        return response.getResponse().jsonToObject(retClass);
     }
 }

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

@@ -669,15 +669,15 @@ protected void addQueryPair(String key, String value) {
         }
 
         protected void addQueryPair(String key, Integer value) {
-            addQueryPair(key, value+"");
+            addQueryPair(key, value + "");
         }
 
         protected void addQueryPair(String key, Long value) {
-            addQueryPair(key, value+"");
+            addQueryPair(key, value + "");
         }
 
         protected void addQueryPair(String key, Boolean value) {
-            addQueryPair(key, value+"");
+            addQueryPair(key, value + "");
         }
 
         /**
@@ -1367,6 +1367,8 @@ protected Response(com.qiniu.http.Response response) throws QiniuException {
                 return;
             }
 
+            // 七牛只有 Json 和 流，流外部处理，SDK 不关闭
+            // Json 会自动关闭
             if (response.isJson()) {
                 String bodyString = response.bodyString();
                 try {
@@ -1378,6 +1380,14 @@ protected Response(com.qiniu.http.Response response) throws QiniuException {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                return;
+            }
+
+            // 没有 Body
+            if (response.getResponse() != null
+                    && response.getResponse().body() != null
+                    && response.getResponse().body().contentLength() == 0) {
+                response.close();
             }
         }
 

src/test/java/com/qiniu/apis/ApiTestConfig.java renamed to src/test/java/com/qiniu/iam/apis/ApiTestConfig.java

@@ -1,4 +1,4 @@
-package com.qiniu.apis;
+package com.qiniu.iam.apis;
 
 import com.qiniu.storage.Api;
 import test.com.qiniu.TestConfig;

src/test/java/com/qiniu/apis/GroupsApiTest.java renamed to src/test/java/com/qiniu/iam/apis/GroupsApiTest.java

@@ -1,7 +1,6 @@
-package com.qiniu.apis;
+package com.qiniu.iam.apis;
 
 import com.qiniu.common.QiniuException;
-import com.qiniu.iam.apis.*;
 import com.qiniu.storage.Api;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;

src/test/java/com/qiniu/apis/PolicyApiTest.java renamed to src/test/java/com/qiniu/iam/apis/PolicyApiTest.java

@@ -1,7 +1,6 @@
-package com.qiniu.apis;
+package com.qiniu.iam.apis;
 
 import com.qiniu.common.QiniuException;
-import com.qiniu.iam.apis.*;
 import com.qiniu.storage.Api;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;

src/test/java/com/qiniu/apis/SystemApiTest.java renamed to src/test/java/com/qiniu/iam/apis/SystemApiTest.java

@@ -1,9 +1,6 @@
-package com.qiniu.apis;
+package com.qiniu.iam.apis;
 
 import com.qiniu.common.QiniuException;
-import com.qiniu.iam.apis.ApiGetActions;
-import com.qiniu.iam.apis.ApiGetAudits;
-import com.qiniu.iam.apis.ApiGetServices;
 import com.qiniu.storage.Api;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;

src/test/java/com/qiniu/apis/UserApiTest.java renamed to src/test/java/com/qiniu/iam/apis/UserApiTest.java

@@ -1,7 +1,6 @@
-package com.qiniu.apis;
+package com.qiniu.iam.apis;
 
 import com.qiniu.common.QiniuException;
-import com.qiniu.iam.apis.*;
 import com.qiniu.storage.Api;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;