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

Author: yangsen

.github/workflows/ci-test.yml

@@ -1,11 +1,5 @@
 name: Java CI with Gradle
-on:
-  push:
-    paths-ignore:
-      - '**.md'
-  pull_request:
-    paths-ignore:
-      - '**.md'
+on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,8 +16,9 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java_version }}
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/generate-docs.yml

@@ -0,0 +1,54 @@
+name: Deploy static content to Pages
+
+on:
+  push:
+    tags:
+    - 'v*'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Generate Docs
+        run: |
+          rm -rf build/docs
+          mkdir -p build/docs
+          ./gradlew apiJavadocs -d
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: build/docs/javadoc
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

README.md

@@ -3,6 +3,7 @@
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
 [![Build Status](https://travis-ci.org/qiniu/java-sdk.svg)](https://travis-ci.org/qiniu/java-sdk)
 [![GitHub release](https://img.shields.io/github/v/tag/qiniu/java-sdk.svg?label=release)](https://github.com/qiniu/java-sdk/releases)
+[![Docs](https://img.shields.io/github/v/tag/qiniu/java-sdk.svg?label=docs&color=yellow)](https://qiniu.github.io/java-sdk/)
 [![Coverage Status](https://codecov.io/gh/qiniu/java-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/qiniu/java-sdk)
 [![Latest Stable Version](https://img.shields.io/maven-central/v/com.qiniu/qiniu-java-sdk.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.qiniu%22%20AND%20a%3A%22qiniu-java-sdk%22)
 ## 安装
@@ -43,7 +44,7 @@ Auth auth = Auth.create(accessKey, secretKey);
 String token = auth.uploadToken(bucketName);
 String key = "file save key";
 Response r = uploadManager.put("hello world".getBytes(), key, token);
-   
+
 // 分片上传 v2
 import com.qiniu.storage.UploadManager;
 import com.qiniu.util.Auth;

build.gradle

@@ -50,6 +50,16 @@ task getHomeDir {
 
 apply plugin: 'checkstyle'
 
+task apiJavadocs(type: Javadoc) {
+  source = sourceSets.main.allJava
+  classpath = sourceSets.main.runtimeClasspath
+  title = "七牛 Java SDK API 文档"
+  options {
+    memberLevel = JavadocMemberLevel.PUBLIC
+    setEncoding 'UTF-8'
+    setWindowTitle "七牛 Java SDK API 文档"
+  }
+}
 
 def versionName() {
     String config = getProjectDir().getPath() + '/src/main/java/com/qiniu/common/Constants.java'

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip

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

@@ -26,7 +26,7 @@ class AutoRegion extends Region {
      */
     private Client client;
 
-    private AutoRegion(){
+    private AutoRegion() {
     }
 
     AutoRegion(String ucServer) {

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

@@ -50,8 +50,8 @@ private Response uploadWithRegionRetry() throws QiniuException {
             }
 
             // context 过期，不需要切换 region
-            if (response != null && response.isContextExpiredError() ||
-                    exception != null && exception.response != null && exception.response.isContextExpiredError()) {
+            if (response != null && response.isContextExpiredError()
+                    || exception != null && exception.response != null && exception.response.isContextExpiredError()) {
                 continue;
             }
 

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

@@ -5,6 +5,8 @@
 import com.qiniu.http.Response;
 
 class Retry {
+    private Retry() {
+    }
 
     static boolean shouldUploadAgain(Response response, QiniuException exception) {
         Response checkResponse = response;