change path add segment

qiniu · May 29, 2024 · c087705 · c087705
1 parent a838948
commit c087705
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 55 deletions.
diff --git a/src/main/java/com/qiniu/storage/Api.java b/src/main/java/com/qiniu/storage/Api.java
@@ -403,7 +403,13 @@ protected Request(String urlPrefix) {
                 this.scheme = url.getProtocol();
                 this.host = url.getHost();
                 this.port = url.getPort();
-                this.addPathSegment(url.getPath());
+
+                // segment 不包含左边的 /, 截掉左边第一个 /
+                String segment = url.getPath();
+                if (segment != null && segment.startsWith("/")) {
+                    segment = segment.substring(1);
+                }
+                this.addPathSegment(segment);
 
                 String query = url.getQuery();
                 if (StringUtils.isNullOrEmpty(query)) {
@@ -506,7 +512,10 @@ public String getPath() throws QiniuException {
          * @throws QiniuException 组装 query 时的异常，一般为缺失必要参数的异常
          */
         protected void buildPath() throws QiniuException {
-            path = StringUtils.join(pathSegments, "");
+            path = StringUtils.join(pathSegments, "/");
+            if (!path.isEmpty()) {
+                path = "/" + path;
+            }
         }
 
 

diff --git a/src/main/java/com/qiniu/storage/ApiQueryRegion.java b/src/main/java/com/qiniu/storage/ApiQueryRegion.java
@@ -87,8 +87,8 @@ protected void buildQuery() throws QiniuException {
 
         @Override
         protected void buildPath() throws QiniuException {
-            addPathSegment("/v4");
-            addPathSegment("/query");
+            addPathSegment("v4");
+            addPathSegment("query");
             super.buildPath();
         }
     }

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV1MakeBlock.java b/src/main/java/com/qiniu/storage/ApiUploadV1MakeBlock.java
@@ -135,8 +135,8 @@ protected void buildPath() throws QiniuException {
                 ApiUtils.throwInvalidRequestParamException("block size");
             }
 
-            addPathSegment("/mkblk");
-            addPathSegment("/" + blockSize);
+            addPathSegment("mkblk");
+            addPathSegment("" + blockSize);
             super.buildPath();
         }
 

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV1MakeFile.java b/src/main/java/com/qiniu/storage/ApiUploadV1MakeFile.java
@@ -171,35 +171,35 @@ protected void buildPath() throws QiniuException {
                 ApiUtils.throwInvalidRequestParamException("file size");
             }
 
-            addPathSegment("/mkfile");
-            addPathSegment("/" + fileSize);
+            addPathSegment("mkfile");
+            addPathSegment("" + fileSize);
 
             if (!StringUtils.isNullOrEmpty(fileMimeType)) {
-                addPathSegment("/mimeType");
-                addPathSegment("/" + UrlSafeBase64.encodeToString(fileMimeType));
+                addPathSegment("mimeType");
+                addPathSegment(UrlSafeBase64.encodeToString(fileMimeType));
             }
 
             if (!StringUtils.isNullOrEmpty(fileName)) {
-                addPathSegment("/fname");
-                addPathSegment("/" + UrlSafeBase64.encodeToString(fileName));
+                addPathSegment("fname");
+                addPathSegment(UrlSafeBase64.encodeToString(fileName));
             }
 
             if (key != null) {
-                addPathSegment("/key");
-                addPathSegment("/" + UrlSafeBase64.encodeToString(key));
+                addPathSegment("key");
+                addPathSegment(UrlSafeBase64.encodeToString(key));
             }
 
             if (params != null && !params.isEmpty()) {
                 for (String key : params.keySet()) {
-                    addPathSegment("/" + key);
-                    addPathSegment("/" + UrlSafeBase64.encodeToString("" + params.get(key)));
+                    addPathSegment(key);
+                    addPathSegment(UrlSafeBase64.encodeToString("" + params.get(key)));
                 }
             }
 
             if (metaDataParam != null && !metaDataParam.isEmpty()) {
                 for (String key : metaDataParam.keySet()) {
-                    addPathSegment("/" + key);
-                    addPathSegment("/" + UrlSafeBase64.encodeToString("" + metaDataParam.get(key)));
+                    addPathSegment(key);
+                    addPathSegment(UrlSafeBase64.encodeToString("" + metaDataParam.get(key)));
                 }
             }
 

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV1PutChunk.java b/src/main/java/com/qiniu/storage/ApiUploadV1PutChunk.java
@@ -140,9 +140,9 @@ protected void buildPath() throws QiniuException {
                 ApiUtils.throwInvalidRequestParamException("block last context");
             }
 
-            addPathSegment("/bput");
-            addPathSegment("/" + blockLastContext);
-            addPathSegment("/" + chunkOffset);
+            addPathSegment("bput");
+            addPathSegment(blockLastContext);
+            addPathSegment("" + chunkOffset);
             super.buildPath();
         }
 

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV2AbortUpload.java b/src/main/java/com/qiniu/storage/ApiUploadV2AbortUpload.java
@@ -113,12 +113,12 @@ protected void buildPath() throws QiniuException {
             }
 
             String bucket = token.getBucket();
-            addPathSegment("/buckets");
-            addPathSegment("/" + bucket);
-            addPathSegment("/objects");
-            addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));
-            addPathSegment("/uploads");
-            addPathSegment("/" + uploadId);
+            addPathSegment("buckets");
+            addPathSegment(bucket);
+            addPathSegment("objects");
+            addPathSegment(ApiUtils.resumeV2EncodeKey(key));
+            addPathSegment("uploads");
+            addPathSegment(uploadId);
             super.buildPath();
         }
     }

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV2CompleteUpload.java b/src/main/java/com/qiniu/storage/ApiUploadV2CompleteUpload.java
@@ -191,12 +191,12 @@ protected void buildPath() throws QiniuException {
             }
 
             String bucket = token.getBucket();
-            addPathSegment("/buckets");
-            addPathSegment("/" + bucket);
-            addPathSegment("/objects");
-            addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));
-            addPathSegment("/uploads");
-            addPathSegment("/" + uploadId);
+            addPathSegment("buckets");
+            addPathSegment(bucket);
+            addPathSegment("objects");
+            addPathSegment(ApiUtils.resumeV2EncodeKey(key));
+            addPathSegment("uploads");
+            addPathSegment(uploadId);
             super.buildPath();
         }
 

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV2InitUpload.java b/src/main/java/com/qiniu/storage/ApiUploadV2InitUpload.java
@@ -105,11 +105,11 @@ protected void buildPath() throws QiniuException {
             }
 
             String bucket = getUploadToken().getBucket();
-            addPathSegment("/buckets");
-            addPathSegment("/" + bucket);
-            addPathSegment("/objects");
-            addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));
-            addPathSegment("/uploads");
+            addPathSegment("buckets");
+            addPathSegment(bucket);
+            addPathSegment("objects");
+            addPathSegment(ApiUtils.resumeV2EncodeKey(key));
+            addPathSegment("uploads");
             super.buildPath();
         }
     }

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV2ListParts.java b/src/main/java/com/qiniu/storage/ApiUploadV2ListParts.java
@@ -152,12 +152,12 @@ protected void buildPath() throws QiniuException {
             }
 
             String bucket = token.getBucket();
-            addPathSegment("/buckets");
-            addPathSegment("/" + bucket);
-            addPathSegment("/objects");
-            addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));
-            addPathSegment("/uploads");
-            addPathSegment("/" + uploadId);
+            addPathSegment("buckets");
+            addPathSegment(bucket);
+            addPathSegment("objects");
+            addPathSegment(ApiUtils.resumeV2EncodeKey(key));
+            addPathSegment("uploads");
+            addPathSegment(uploadId);
             super.buildPath();
         }
     }

diff --git a/src/main/java/com/qiniu/storage/ApiUploadV2UploadPart.java b/src/main/java/com/qiniu/storage/ApiUploadV2UploadPart.java
@@ -162,13 +162,13 @@ protected void buildPath() throws QiniuException {
             }
 
             String bucket = getUploadToken().getBucket();
-            addPathSegment("/buckets");
-            addPathSegment("/" + bucket);
-            addPathSegment("/objects");
-            addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));
-            addPathSegment("/uploads");
-            addPathSegment("/" + uploadId);
-            addPathSegment("/" + partNumber);
+            addPathSegment("buckets");
+            addPathSegment(bucket);
+            addPathSegment("objects");
+            addPathSegment(ApiUtils.resumeV2EncodeKey(key));
+            addPathSegment("uploads");
+            addPathSegment(uploadId);
+            addPathSegment("" + partNumber);
             super.buildPath();
         }
 

diff --git a/src/main/java/com/qiniu/storage/DownloadPrivateCloudUrl.java b/src/main/java/com/qiniu/storage/DownloadPrivateCloudUrl.java
@@ -60,9 +60,9 @@ protected void willBuildUrl() throws QiniuException {
 
     @Override
     protected void willSetKeyForUrl(Api.Request request) throws QiniuException {
-        request.addPathSegment("/getfile");
-        request.addPathSegment("/" + accessKey);
-        request.addPathSegment("/" + bucketName);
+        request.addPathSegment("getfile");
+        request.addPathSegment(accessKey);
+        request.addPathSegment(bucketName);
         super.willSetKeyForUrl(request);
     }
 

diff --git a/src/main/java/com/qiniu/storage/DownloadUrl.java b/src/main/java/com/qiniu/storage/DownloadUrl.java
@@ -159,7 +159,7 @@ public String buildURL() throws QiniuException {
             }
         }
         if (!StringUtils.isNullOrEmpty(keyAndStyle)) {
-            request.addPathSegment("/" + keyAndStyle);
+            request.addPathSegment(keyAndStyle);
         }
         didSetKeyForUrl(request);