api add auth auth type

Author: YangSen-qn

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

@@ -44,7 +44,7 @@ protected Api(Client client) {
      * @param client 请求的 Client 【必须】
      * @param config 请求的流程的配置信息
      **/
-    Api(Client client, Config config) {
+    protected Api(Client client, Config config) {
         this(client, Api.createInterceptors(config));
     }
 
@@ -54,7 +54,7 @@ protected Api(Client client) {
      * @param client       请求的 Client【必须】
      * @param interceptors 请求的拦截器
      **/
-    Api(Client client, Interceptor... interceptors) {
+    protected Api(Client client, Interceptor... interceptors) {
         if (client == null) {
             client = new Client();
         }
@@ -333,6 +333,16 @@ public Config build() {
      */
     public static class Request implements Cloneable {
 
+        protected static final int AuthTypeNone = 0;
+        protected static final int AuthTypeQiniu = 1;
+
+        /**
+         * 鉴权类型
+         * 0：不鉴权
+         * 1：Qiniu 鉴权
+         */
+        private int authType = AuthTypeNone;
+
         /**
          * 请求的 scheme
          * eg: https
@@ -444,6 +454,19 @@ protected Request(String scheme, String host) {
             this.host = host;
         }
 
+        /**
+         * 设置鉴权类型
+         * 0：不鉴权
+         * 1：Qiniu 鉴权
+         */
+        protected int getAuthType() {
+            return this.authType;
+        }
+
+        protected void setAuthType(int authType) {
+            this.authType = authType;
+        }
+
         /**
          * 获取请求的 urlPrefix， scheme + host
          * eg: https://upload.qiniu.com
@@ -483,6 +506,18 @@ protected void addPathSegment(String segment) {
             path = null;
         }
 
+        protected void addPathSegment(Boolean segment) {
+            addPathSegment((Boolean) segment ? "true" : "false");
+        }
+
+        protected void addPathSegment(Integer segment) {
+            addPathSegment(segment + "");
+        }
+
+        protected void addPathSegment(Long segment) {
+            addPathSegment(segment + "");
+        }
+
         String getMethodString() {
             if (method == null) {
                 return "GET";
@@ -1114,15 +1149,17 @@ protected Response(com.qiniu.http.Response response) throws QiniuException {
                 return;
             }
 
-            String bodyString = response.bodyString();
-            try {
-                if (bodyString.startsWith("[")) {
-                    this.dataArray = Json.decodeArray(bodyString);
-                } else {
-                    this.dataMap = Json.decode(bodyString);
+            if (response.isJson()) {
+                String bodyString = response.bodyString();
+                try {
+                    if (bodyString.startsWith("[")) {
+                        this.dataArray = Json.decodeArray(bodyString);
+                    } else {
+                        this.dataMap = Json.decode(bodyString);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
         }
 

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

@@ -26,23 +26,31 @@ Api.Response intercept(Api.Request request, Api.Handler handler) throws QiniuExc
             return handler.handle(request);
         }
 
-        String url = request.getUrl().toString();
-        String method = request.getMethodString();
-        Headers headers = Headers.of(request.getHeader());
-        byte[] body = request.getBytesBody();
-        String authorization = "Qiniu " + auth.signQiniuAuthorization(url, method, body, headers);
-        request.addHeaderField("Authorization", authorization);
+        if (request.getAuthType() == Api.Request.AuthTypeQiniu) {
+            String url = request.getUrl().toString();
+            String method = request.getMethodString();
+            Headers headers = Headers.of(request.getHeader());
+            byte[] body = request.getBytesBody();
+            String authorization = "Qiniu " + auth.signQiniuAuthorization(url, method, body, headers);
+            request.addHeaderField("Authorization", authorization);
+        }
+
         return handler.handle(request);
     }
 
     static final class Builder {
+
         private Auth auth;
 
         Builder setAuth(Auth auth) {
             this.auth = auth;
             return this;
         }
 
+        Builder setAuthType(int authType) {
+            return this;
+        }
+
         Api.Interceptor build() {
             return new ApiInterceptorAuth(auth);
         }

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

@@ -1168,6 +1168,7 @@ private Response get(String url) throws QiniuException {
 
     private Response get(String url, Api.Interceptor[] interceptors) throws QiniuException {
         Api.Request request = new Api.Request(url);
+        request.setAuthType(Api.Request.AuthTypeQiniu);
         return new Api(client, interceptors).requestWithInterceptor(request);
     }
 
@@ -1178,6 +1179,7 @@ private Response post(String url, byte[] body) throws QiniuException {
 
     private Response post(String url, byte[] body, Api.Interceptor[] interceptors) throws QiniuException {
         Api.Request request = new Api.Request(url);
+        request.setAuthType(Api.Request.AuthTypeQiniu);
         request.setMethod(MethodType.POST);
         if (body == null) {
             body = new byte[0];