Merge branch 'master' of YangSen-qn:qiniu/java-sdk

qiniu · May 15, 2024 · 1d09325 · 1d09325
2 parents ddb92a8 + 8d3cc04
commit 1d09325
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 63 deletions.
diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml
@@ -0,0 +1,19 @@
+name: Java SDK Version Check
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+jobs:
+  linux:
+    name: Version Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
+      - name: Check
+        run: |
+          set -e
+          grep -qF "## ${RELEASE_VERSION}" CHANGELOG.md
+          grep -qF "public static final String VERSION = \"${RELEASE_VERSION}\";" src/main/java/com/qiniu/common/Constants.java
diff --git a/src/main/java/com/qiniu/storage/Api.java b/src/main/java/com/qiniu/storage/Api.java
@@ -506,7 +506,7 @@ public String getPath() throws QiniuException {
          * @throws QiniuException 组装 query 时的异常，一般为缺失必要参数的异常
          */
         protected void buildPath() throws QiniuException {
-            path = "/" + StringUtils.join(pathSegments, "/");
+            path = StringUtils.join(pathSegments, "");
         }
 
 

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
@@ -90,11 +90,11 @@ public DownloadUrl setFop(String fop) {
      * 配置 style【可选】
      * 如果觉得 fop 这样的形式够冗长，还可以为这些串行的 fop 集合定义一个友好别名。如此一来，就可以用友好URL风格进行访问，这个别名就是 style 。
      * eg:
-     *     对 userBucket 的 fop（imageView2/2/w/320/h/480） 使用 style 的方式, 分隔符为 "-"
-     *     使用 qrsctl 命令定义 style: （qrsctl separator [bucket] [styleSeparator]）
-     *     qrsctl separator userBucket -
-     *     定义数据处理的别名为 aliasName: (qrsctl style [bucket] [aliasName] [fop])
-     *     qrsctl style userBucket iphone imageView2/2/w/320/h/480
+     * 对 userBucket 的 fop（imageView2/2/w/320/h/480） 使用 style 的方式, 分隔符为 "-"
+     * 使用 qrsctl 命令定义 style: （qrsctl separator [bucket] [styleSeparator]）
+     * qrsctl separator userBucket -
+     * 定义数据处理的别名为 aliasName: (qrsctl style [bucket] [aliasName] [fop])
+     * qrsctl style userBucket iphone imageView2/2/w/320/h/480
      * <p>
      * <a href="https://developer.qiniu.com/dora/6217/directions-for-use-pfop"> 相关链接 </a>
      *
@@ -159,7 +159,7 @@ public String buildURL() throws QiniuException {
             }
         }
         if (!StringUtils.isNullOrEmpty(keyAndStyle)) {
-            request.addPathSegment(keyAndStyle);
+            request.addPathSegment("/" + keyAndStyle);
         }
         didSetKeyForUrl(request);
 

diff --git a/src/test/java/test/com/qiniu/storage/DownloadUrlTest.java b/src/test/java/test/com/qiniu/storage/DownloadUrlTest.java
@@ -10,14 +10,14 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import test.com.qiniu.TestConfig;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
+
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -80,8 +80,11 @@ public void testSpecialKey() {
             String encodeKey = keys.get(key);
             try {
                 String url = new DownloadUrl(domain, false, key).buildURL();
-                String exceptUrl = "http://" + domain + "/" + encodeKey;
-                assertEquals(exceptUrl, url, "url:" + url + " exceptUrl:" + exceptUrl);
+                String exceptUrl = "http://" + domain;
+                if (!key.isEmpty()) {
+                    exceptUrl += "/" + encodeKey;
+                }
+                assertEquals(exceptUrl, url, "key:" + key);
             } catch (QiniuException e) {
                 fail(e.error());
             }