Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: googleapis/java-storage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e4ad8c10204818d9ac994f79991e78494f605942
Choose a base ref
..
head repository: googleapis/java-storage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8bfc3f000f9df6163a8e40ca4dcc6d59efab59e8
Choose a head ref
6 changes: 3 additions & 3 deletions google-cloud-storage-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -89,17 +89,17 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage-control</artifactId>
<version>2.37.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
<version>2.37.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-storage-control-v2</artifactId>
<version>2.37.1-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-control-v2:current} -->
<version>2.37.1-beta-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-control-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-storage-control-v2</artifactId>
<version>2.37.1-alpha-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-control-v2:current} -->
<version>2.37.1-beta-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-control-v2:current} -->
</dependency>
</dependencies>
</dependencyManagement>
2 changes: 1 addition & 1 deletion google-cloud-storage-control/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage-control</artifactId>
<version>2.37.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
<version>2.37.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
<name>google-cloud-storage-control</name>
<description>GRPC library for google-cloud-storage-control</description>
<parent>
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@

import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
import com.google.api.gax.rpc.ApiExceptions;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
@@ -34,7 +33,6 @@
*
* @see Builder
*/
@BetaApi
public final class DownloadJob {

@NonNull private final List<ApiFuture<DownloadResult>> downloadResults;
@@ -55,7 +53,6 @@ private DownloadJob(
*
* @see Builder#setDownloadResults(List)
*/
@BetaApi
public @NonNull List<DownloadResult> getDownloadResults() {
return ApiExceptions.callAndTranslateApiException(ApiFutures.allAsList(downloadResults));
}
@@ -65,7 +62,6 @@ private DownloadJob(
*
* @see Builder#setParallelDownloadConfig(ParallelDownloadConfig)
*/
@BetaApi
public @NonNull ParallelDownloadConfig getParallelDownloadConfig() {
return parallelDownloadConfig;
}
@@ -96,7 +92,6 @@ public String toString() {
.toString();
}

@BetaApi
public static Builder newBuilder() {
return new Builder();
}
@@ -106,7 +101,6 @@ public static Builder newBuilder() {
*
* @see DownloadJob
*/
@BetaApi
public static final class Builder {

private @NonNull List<ApiFuture<DownloadResult>> downloadResults;
@@ -122,7 +116,6 @@ private Builder() {
* @return the instance of the Builder with DownloadResults modified.
* @see DownloadJob#getDownloadResults()
*/
@BetaApi
public Builder setDownloadResults(@NonNull List<ApiFuture<DownloadResult>> downloadResults) {
this.downloadResults = ImmutableList.copyOf(downloadResults);
return this;
@@ -134,7 +127,6 @@ public Builder setDownloadResults(@NonNull List<ApiFuture<DownloadResult>> downl
* @return the instance of the Builder with ParallelDownloadConfig modified.
* @see DownloadJob#getParallelDownloadConfig()
*/
@BetaApi
public Builder setParallelDownloadConfig(
@NonNull ParallelDownloadConfig parallelDownloadConfig) {
this.parallelDownloadConfig = parallelDownloadConfig;
@@ -146,7 +138,6 @@ public Builder setParallelDownloadConfig(
*
* @return {@link DownloadJob}
*/
@BetaApi
public DownloadJob build() {
checkNotNull(downloadResults);
checkNotNull(parallelDownloadConfig);
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;

import com.google.api.core.BetaApi;
import com.google.cloud.storage.BlobInfo;
import com.google.common.base.MoreObjects;
import java.nio.file.Path;
@@ -33,7 +32,6 @@
*
* @see Builder
*/
@BetaApi
public final class DownloadResult {
static final Comparator<DownloadResult> COMPARATOR =
Comparator.comparingInt(dr -> dr.getStatus().ordinal());
@@ -59,7 +57,6 @@ private DownloadResult(
*
* @see Builder#setInput(BlobInfo)
*/
@BetaApi
public @NonNull BlobInfo getInput() {
return input;
}
@@ -70,7 +67,6 @@ private DownloadResult(
*
* @see Builder#setOutputDestination(Path)
*/
@BetaApi
public @NonNull Path getOutputDestination() {
checkState(
status == TransferStatus.SUCCESS,
@@ -85,7 +81,6 @@ private DownloadResult(
* @see TransferStatus
* @see Builder#setStatus(TransferStatus)
*/
@BetaApi
public @NonNull TransferStatus getStatus() {
return status;
}
@@ -97,7 +92,6 @@ private DownloadResult(
*
* @see Builder#setException(Exception)
*/
@BetaApi
public @NonNull Exception getException() {
checkState(
status == TransferStatus.FAILED_TO_FINISH || status == TransferStatus.FAILED_TO_START,
@@ -136,7 +130,6 @@ public String toString() {
.toString();
}

@BetaApi
public static Builder newBuilder(@NonNull BlobInfo blobInfo, @NonNull TransferStatus status) {
return new Builder(blobInfo, status);
}
@@ -146,7 +139,6 @@ public static Builder newBuilder(@NonNull BlobInfo blobInfo, @NonNull TransferSt
*
* @see DownloadResult
*/
@BetaApi
public static final class Builder {

private @NonNull BlobInfo input;
@@ -165,7 +157,6 @@ private Builder(@NonNull BlobInfo input, @NonNull TransferStatus status) {
* @see DownloadResult#getInput()
* @return the instance of the Builder with the value for input modified.
*/
@BetaApi
public Builder setInput(@NonNull BlobInfo input) {
this.input = input;
return this;
@@ -178,7 +169,6 @@ public Builder setInput(@NonNull BlobInfo input) {
* @see DownloadResult#getOutputDestination()
* @return the instance of the Builder with the value for outputDestination modified.
*/
@BetaApi
public Builder setOutputDestination(@NonNull Path outputDestination) {
this.outputDestination = outputDestination;
return this;
@@ -190,7 +180,6 @@ public Builder setOutputDestination(@NonNull Path outputDestination) {
* @see TransferStatus
* @return the instance of the Builder with the value for status modified.
*/
@BetaApi
public Builder setStatus(@NonNull TransferStatus status) {
this.status = status;
return this;
@@ -204,7 +193,6 @@ public Builder setStatus(@NonNull TransferStatus status) {
* @see DownloadResult#getException()
* @return the instance of the Builder with the value for exception modified.
*/
@BetaApi
public Builder setException(@NonNull Exception exception) {
this.exception = exception;
return this;
@@ -215,7 +203,6 @@ public Builder setException(@NonNull Exception exception) {
*
* @return {@link DownloadResult}
*/
@BetaApi
public DownloadResult build() {
checkNotNull(input);
checkNotNull(status);
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.api.core.BetaApi;
import com.google.cloud.storage.Storage.BlobSourceOption;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
@@ -33,7 +32,6 @@
*
* @see Builder
*/
@BetaApi
public final class ParallelDownloadConfig {

@NonNull private final String stripPrefix;
@@ -57,7 +55,6 @@ private ParallelDownloadConfig(
*
* @see Builder#setStripPrefix(String)
*/
@BetaApi
public @NonNull String getStripPrefix() {
return stripPrefix;
}
@@ -67,7 +64,6 @@ private ParallelDownloadConfig(
*
* @see Builder#setDownloadDirectory(Path)
*/
@BetaApi
public @NonNull Path getDownloadDirectory() {
return downloadDirectory;
}
@@ -77,7 +73,6 @@ private ParallelDownloadConfig(
*
* @see Builder#setBucketName(String)
*/
@BetaApi
public @NonNull String getBucketName() {
return bucketName;
}
@@ -88,7 +83,6 @@ private ParallelDownloadConfig(
*
* @see Builder#setOptionsPerRequest(List)
*/
@BetaApi
public @NonNull List<BlobSourceOption> getOptionsPerRequest() {
return optionsPerRequest;
}
@@ -128,12 +122,10 @@ public String toString() {
*
* @see ParallelDownloadConfig
*/
@BetaApi
public static Builder newBuilder() {
return new Builder();
}

@BetaApi
public static final class Builder {

@NonNull private String stripPrefix;
@@ -155,7 +147,6 @@ private Builder() {
* @return the builder instance with the value for stripPrefix modified.
* @see ParallelDownloadConfig#getStripPrefix()
*/
@BetaApi
public Builder setStripPrefix(String stripPrefix) {
this.stripPrefix = stripPrefix;
return this;
@@ -167,7 +158,6 @@ public Builder setStripPrefix(String stripPrefix) {
* @return the builder instance with the value for downloadDirectory modified.
* @see ParallelDownloadConfig#getDownloadDirectory()
*/
@BetaApi
public Builder setDownloadDirectory(Path downloadDirectory) {
this.downloadDirectory = downloadDirectory;
return this;
@@ -179,7 +169,6 @@ public Builder setDownloadDirectory(Path downloadDirectory) {
* @return the builder instance with the value for bucketName modified.
* @see ParallelDownloadConfig#getBucketName()
*/
@BetaApi
public Builder setBucketName(String bucketName) {
this.bucketName = bucketName;
return this;
@@ -192,7 +181,6 @@ public Builder setBucketName(String bucketName) {
* @return the builder instance with the value for OptionsPerRequest modified.
* @see ParallelDownloadConfig#getOptionsPerRequest()
*/
@BetaApi
public Builder setOptionsPerRequest(List<BlobSourceOption> optionsPerRequest) {
this.optionsPerRequest = ImmutableList.copyOf(optionsPerRequest);
return this;
@@ -203,7 +191,6 @@ public Builder setOptionsPerRequest(List<BlobSourceOption> optionsPerRequest) {
*
* @return {@link ParallelDownloadConfig}
*/
@BetaApi
public ParallelDownloadConfig build() {
checkNotNull(bucketName);
checkNotNull(stripPrefix);
Loading