diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 8e259d1a36..f5359bf1f3 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-storage.git", - "sha": "444a8da44e9a80b806b5880a55d2628e3d5f25ef" + "sha": "c93896a5007b48753809de806ddaf6c8df6e9d56" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "943bb78606d035001123030067dffcc34f4645f2" + "sha": "352f25621c28d2fa0784984ea0ed5ea697aa1525" } } ] diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index f372a616a6..5a3622186b 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -38,8 +38,8 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -q -DskipTests=true -NAME=google-cloud-storage -VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) +export NAME=google-cloud-storage +export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs mvn site -B -q @@ -59,7 +59,8 @@ python3 -m docuploader upload . \ popd -# V2 +# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. + mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" pushd target/devsite/reference diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b229f9f02..f1e877c68e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [1.113.6](https://www.github.com/googleapis/java-storage/compare/v1.113.5...v1.113.6) (2020-12-10) + + +### Bug Fixes + +* content-length missing in offset request ([#647](https://www.github.com/googleapis/java-storage/issues/647)) ([3cd3815](https://www.github.com/googleapis/java-storage/commit/3cd3815c62603d05d4c571ba1affeaf91e4d8040)) + + +### Dependencies + +* update kms.version to v0.87.3 ([#646](https://www.github.com/googleapis/java-storage/issues/646)) ([c93896a](https://www.github.com/googleapis/java-storage/commit/c93896a5007b48753809de806ddaf6c8df6e9d56)) + ### [1.113.5](https://www.github.com/googleapis/java-storage/compare/v1.113.4...v1.113.5) (2020-12-07) diff --git a/README.md b/README.md index 5f4a8f99e2..c612f721bb 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-storage:1.113.4' +compile 'com.google.cloud:google-cloud-storage:1.113.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.113.4" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.113.5" ``` ## Authentication @@ -254,6 +254,8 @@ Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3] Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4] Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] +Java is a registered trademark of Oracle and/or its affiliates. + [product-docs]: https://cloud.google.com/storage [javadocs]: https://googleapis.dev/java/google-cloud-storage/latest/index.html [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-storage/java7.svg diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index 2d1d3cde25..a666f33180 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 1.113.5 + 1.113.6 jar Google Cloud Storage https://github.com/googleapis/java-storage @@ -12,11 +12,11 @@ com.google.cloud google-cloud-storage-parent - 1.113.5 + 1.113.6 google-cloud-storage - 0.87.2 + 0.87.3 diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java index faba82b1de..abdfa33ca6 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java @@ -24,6 +24,7 @@ import com.google.api.client.googleapis.batch.json.JsonBatchCallback; import com.google.api.client.googleapis.json.GoogleJsonError; import com.google.api.client.http.ByteArrayContent; +import com.google.api.client.http.EmptyContent; import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpHeaders; import com.google.api.client.http.HttpRequest; @@ -751,7 +752,8 @@ public void write( public long getCurrentUploadOffset(String uploadId) { try { GenericUrl url = new GenericUrl(uploadId); - HttpRequest httpRequest = storage.getRequestFactory().buildPutRequest(url, null); + HttpRequest httpRequest = + storage.getRequestFactory().buildPutRequest(url, new EmptyContent()); httpRequest.getHeaders().setContentRange("bytes */*"); // Turn off automatic redirects. @@ -763,7 +765,6 @@ public long getCurrentUploadOffset(String uploadId) { try { response = httpRequest.execute(); int code = response.getStatusCode(); - String message = response.getStatusMessage(); if (code == 201 || code == 200) { throw new StorageException(0, "Resumable upload is already complete."); } @@ -776,11 +777,17 @@ public long getCurrentUploadOffset(String uploadId) { if (code == 308 && ex.getHeaders().getRange() == null) { // No progress has been made. return 0; - } else { + } else if (code == 308 && ex.getHeaders().getRange() != null) { // API returns last byte received offset String range = ex.getHeaders().getRange(); // Return next byte offset by adding 1 to last byte received offset return Long.parseLong(range.substring(range.indexOf("-") + 1)) + 1; + } else { + // Not certain what went wrong + StringBuilder sb = new StringBuilder(); + sb.append("Not sure what occurred. Here's debugging information:\n"); + sb.append("Response:\n").append(ex.toString()).append("\n\n"); + throw new StorageException(0, sb.toString()); } } finally { if (response != null) { diff --git a/pom.xml b/pom.xml index fa1150643e..b979edbfe5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-storage-parent pom - 1.113.5 + 1.113.6 Storage Parent https://github.com/googleapis/java-storage diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 430731608e..8beb633382 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-storage - 1.113.4 + 1.113.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index fad6ae5b16..3d20e1b0b7 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-storage - 1.113.4 + 1.113.5 diff --git a/synth.metadata b/synth.metadata index 2369df01fa..c2b242f11a 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-storage.git", - "sha": "c1d1ece5abb23fd4766115e9d4a0310553625c4b" + "sha": "af5390239ffd1e157f066a1009b7bb18fa6264ec" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "943bb78606d035001123030067dffcc34f4645f2" + "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" } } ], diff --git a/versions.txt b/versions.txt index 0d19142572..177f1c9c47 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-storage:1.113.5:1.113.5 \ No newline at end of file +google-cloud-storage:1.113.6:1.113.6 \ No newline at end of file