change path add segment

YangSen-qn · YangSen-qn · commit c087705311ee · 2024-05-29T14:04:40.000+08:00
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 &#19981;&#21253;&#21547;&#24038;&#36793;&#30340; /, &#25130;&#25481;&#24038;&#36793;&#31532;&#19968;&#20010; /
+                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 &#32452;&#35013; query &#26102;&#30340;&#24322;&#24120;&#65292;&#19968;&#33324;&#20026;&#32570;&#22833;&#24517;&#35201;&#21442;&#25968;&#30340;&#24322;&#24120;
          */
         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);
 

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,8 @@ protected void buildQuery() throws QiniuException {`
`87`	`87`
`88`	`88`	`@Override`
`89`	`89`	`protected void buildPath() throws QiniuException {`
`90`		`- addPathSegment("/v4");`
`91`		`- addPathSegment("/query");`
	`90`	`+ addPathSegment("v4");`
	`91`	`+ addPathSegment("query");`
`92`	`92`	`super.buildPath();`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ protected void buildPath() throws QiniuException {`
`135`	`135`	`ApiUtils.throwInvalidRequestParamException("block size");`
`136`	`136`	`}`
`137`	`137`
`138`		`- addPathSegment("/mkblk");`
`139`		`- addPathSegment("/" + blockSize);`
	`138`	`+ addPathSegment("mkblk");`
	`139`	`+ addPathSegment("" + blockSize);`
`140`	`140`	`super.buildPath();`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -171,35 +171,35 @@ protected void buildPath() throws QiniuException {`
`171`	`171`	`ApiUtils.throwInvalidRequestParamException("file size");`
`172`	`172`	`}`
`173`	`173`
`174`		`- addPathSegment("/mkfile");`
`175`		`- addPathSegment("/" + fileSize);`
	`174`	`+ addPathSegment("mkfile");`
	`175`	`+ addPathSegment("" + fileSize);`
`176`	`176`
`177`	`177`	`if (!StringUtils.isNullOrEmpty(fileMimeType)) {`
`178`		`- addPathSegment("/mimeType");`
`179`		`- addPathSegment("/" + UrlSafeBase64.encodeToString(fileMimeType));`
	`178`	`+ addPathSegment("mimeType");`
	`179`	`+ addPathSegment(UrlSafeBase64.encodeToString(fileMimeType));`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`if (!StringUtils.isNullOrEmpty(fileName)) {`
`183`		`- addPathSegment("/fname");`
`184`		`- addPathSegment("/" + UrlSafeBase64.encodeToString(fileName));`
	`183`	`+ addPathSegment("fname");`
	`184`	`+ addPathSegment(UrlSafeBase64.encodeToString(fileName));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`if (key != null) {`
`188`		`- addPathSegment("/key");`
`189`		`- addPathSegment("/" + UrlSafeBase64.encodeToString(key));`
	`188`	`+ addPathSegment("key");`
	`189`	`+ addPathSegment(UrlSafeBase64.encodeToString(key));`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`if (params != null && !params.isEmpty()) {`
`193`	`193`	`for (String key : params.keySet()) {`
`194`		`- addPathSegment("/" + key);`
`195`		`- addPathSegment("/" + UrlSafeBase64.encodeToString("" + params.get(key)));`
	`194`	`+ addPathSegment(key);`
	`195`	`+ addPathSegment(UrlSafeBase64.encodeToString("" + params.get(key)));`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`if (metaDataParam != null && !metaDataParam.isEmpty()) {`
`200`	`200`	`for (String key : metaDataParam.keySet()) {`
`201`		`- addPathSegment("/" + key);`
`202`		`- addPathSegment("/" + UrlSafeBase64.encodeToString("" + metaDataParam.get(key)));`
	`201`	`+ addPathSegment(key);`
	`202`	`+ addPathSegment(UrlSafeBase64.encodeToString("" + metaDataParam.get(key)));`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,9 @@ protected void buildPath() throws QiniuException {`
`140`	`140`	`ApiUtils.throwInvalidRequestParamException("block last context");`
`141`	`141`	`}`
`142`	`142`
`143`		`- addPathSegment("/bput");`
`144`		`- addPathSegment("/" + blockLastContext);`
`145`		`- addPathSegment("/" + chunkOffset);`
	`143`	`+ addPathSegment("bput");`
	`144`	`+ addPathSegment(blockLastContext);`
	`145`	`+ addPathSegment("" + chunkOffset);`
`146`	`146`	`super.buildPath();`
`147`	`147`	`}`
`148`	`148`
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,12 @@ protected void buildPath() throws QiniuException {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`String bucket = token.getBucket();`
`116`		`- addPathSegment("/buckets");`
`117`		`- addPathSegment("/" + bucket);`
`118`		`- addPathSegment("/objects");`
`119`		`- addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));`
`120`		`- addPathSegment("/uploads");`
`121`		`- addPathSegment("/" + uploadId);`
	`116`	`+ addPathSegment("buckets");`
	`117`	`+ addPathSegment(bucket);`
	`118`	`+ addPathSegment("objects");`
	`119`	`+ addPathSegment(ApiUtils.resumeV2EncodeKey(key));`
	`120`	`+ addPathSegment("uploads");`
	`121`	`+ addPathSegment(uploadId);`
`122`	`122`	`super.buildPath();`
`123`	`123`	`}`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,11 @@ protected void buildPath() throws QiniuException {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`String bucket = getUploadToken().getBucket();`
`108`		`- addPathSegment("/buckets");`
`109`		`- addPathSegment("/" + bucket);`
`110`		`- addPathSegment("/objects");`
`111`		`- addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));`
`112`		`- addPathSegment("/uploads");`
	`108`	`+ addPathSegment("buckets");`
	`109`	`+ addPathSegment(bucket);`
	`110`	`+ addPathSegment("objects");`
	`111`	`+ addPathSegment(ApiUtils.resumeV2EncodeKey(key));`
	`112`	`+ addPathSegment("uploads");`
`113`	`113`	`super.buildPath();`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,12 +152,12 @@ protected void buildPath() throws QiniuException {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`String bucket = token.getBucket();`
`155`		`- addPathSegment("/buckets");`
`156`		`- addPathSegment("/" + bucket);`
`157`		`- addPathSegment("/objects");`
`158`		`- addPathSegment("/" + ApiUtils.resumeV2EncodeKey(key));`
`159`		`- addPathSegment("/uploads");`
`160`		`- addPathSegment("/" + uploadId);`
	`155`	`+ addPathSegment("buckets");`
	`156`	`+ addPathSegment(bucket);`
	`157`	`+ addPathSegment("objects");`
	`158`	`+ addPathSegment(ApiUtils.resumeV2EncodeKey(key));`
	`159`	`+ addPathSegment("uploads");`
	`160`	`+ addPathSegment(uploadId);`
`161`	`161`	`super.buildPath();`
`162`	`162`	`}`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public String buildURL() throws QiniuException {`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`if (!StringUtils.isNullOrEmpty(keyAndStyle)) {`
`162`		`- request.addPathSegment("/" + keyAndStyle);`
	`162`	`+ request.addPathSegment(keyAndStyle);`
`163`	`163`	`}`
`164`	`164`	`didSetKeyForUrl(request);`
`165`	`165`