diff --git a/gapic-google-cloud-storage-v2/pom.xml b/gapic-google-cloud-storage-v2/pom.xml index 7f5b4d6ce..d907cc36b 100644 --- a/gapic-google-cloud-storage-v2/pom.xml +++ b/gapic-google-cloud-storage-v2/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api.grpc gapic-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT gapic-google-cloud-storage-v2 GRPC library for gapic-google-cloud-storage-v2 diff --git a/google-cloud-storage-bom/pom.xml b/google-cloud-storage-bom/pom.xml index 018750cdf..310ded086 100644 --- a/google-cloud-storage-bom/pom.xml +++ b/google-cloud-storage-bom/pom.xml @@ -74,17 +74,17 @@ com.google.api.grpc gapic-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT com.google.api.grpc proto-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT com.google.cloud diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java index c6ea7a2ce..b84fcef6a 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.api.core.BetaApi; import com.google.auth.ServiceAccountSigner; import com.google.auth.ServiceAccountSigner.SigningException; import com.google.cloud.ReadChannel; @@ -168,7 +167,6 @@ public static BlobSourceOption shouldReturnRawInputStream(boolean shouldReturnRa * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobSourceOption[] dedupe(BlobSourceOption... os) { return Option.dedupe(BlobSourceOption[]::new, os); } @@ -180,7 +178,6 @@ public static BlobSourceOption[] dedupe(BlobSourceOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobSourceOption[] dedupe( Collection collection, BlobSourceOption... os) { return Option.dedupe(BlobSourceOption[]::new, collection, os); @@ -193,7 +190,6 @@ public static BlobSourceOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobSourceOption[] dedupe(BlobSourceOption[] array, BlobSourceOption... os) { return Option.dedupe(BlobSourceOption[]::new, array, os); } @@ -1228,9 +1224,8 @@ public final int hashCode() { /** * Drop the held {@link Storage} instance. * - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi public BlobInfo asBlobInfo() { return this.toBuilder().infoBuilder.build(); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java index 0587bb0b2..6aa7aaec9 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.api.core.BetaApi; import com.google.api.gax.paging.Page; import com.google.cloud.storage.Acl.Entity; import com.google.cloud.storage.Storage.BlobGetOption; @@ -103,7 +102,6 @@ public static BucketSourceOption userProject(@NonNull String userProject) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BucketSourceOption[] dedupe(BucketSourceOption... os) { return Option.dedupe(BucketSourceOption[]::new, os); } @@ -115,7 +113,6 @@ public static BucketSourceOption[] dedupe(BucketSourceOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketSourceOption[] dedupe( Collection collection, BucketSourceOption... os) { return Option.dedupe(BucketSourceOption[]::new, collection, os); @@ -128,7 +125,6 @@ public static BucketSourceOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketSourceOption[] dedupe( BucketSourceOption[] array, BucketSourceOption... os) { return Option.dedupe(BucketSourceOption[]::new, array, os); @@ -286,7 +282,6 @@ public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlocke * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobTargetOption[] dedupe(BlobTargetOption... os) { return Option.dedupe(BlobTargetOption[]::new, os); } @@ -298,7 +293,6 @@ public static BlobTargetOption[] dedupe(BlobTargetOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobTargetOption[] dedupe( Collection collection, BlobTargetOption... os) { return Option.dedupe(BlobTargetOption[]::new, collection, os); @@ -311,7 +305,6 @@ public static BlobTargetOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobTargetOption[] dedupe(BlobTargetOption[] array, BlobTargetOption... os) { return Option.dedupe(BlobTargetOption[]::new, array, os); } @@ -449,7 +442,6 @@ public static BlobWriteOption userProject(@NonNull String userProject) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobWriteOption[] dedupe(BlobWriteOption... os) { return Option.dedupe(BlobWriteOption[]::new, os); } @@ -461,7 +453,6 @@ public static BlobWriteOption[] dedupe(BlobWriteOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobWriteOption[] dedupe( Collection collection, BlobWriteOption... os) { return Option.dedupe(BlobWriteOption[]::new, collection, os); @@ -474,7 +465,6 @@ public static BlobWriteOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobWriteOption[] dedupe(BlobWriteOption[] array, BlobWriteOption... os) { return Option.dedupe(BlobWriteOption[]::new, array, os); } @@ -1541,9 +1531,8 @@ public final int hashCode() { /** * Drop the held {@link Storage} instance. * - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi public BucketInfo asBucketInfo() { return this.toBuilder().infoBuilder.build(); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java index 6dff8996e..d0003c711 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageImpl.java @@ -135,7 +135,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; -@BetaApi final class GrpcStorageImpl extends BaseService implements Storage, StorageInternal { diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java index 10d706698..7a833fdee 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java @@ -99,8 +99,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.threeten.bp.Duration; -/** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ -@BetaApi +/** @since 2.14.0 */ @TransportCompatibility(Transport.GRPC) public final class GrpcStorageOptions extends StorageOptions implements Retrying.RetryingDependencies { @@ -347,8 +346,7 @@ private Tuple> resolveSettingsAndOpts() throw return Tuple.of(builder.build(), defaultOpts); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder toBuilder() { return new GrpcStorageOptions.Builder(this); @@ -384,20 +382,17 @@ public boolean equals(Object o) { && this.baseEquals(that); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public static GrpcStorageOptions.Builder newBuilder() { return new GrpcStorageOptions.Builder().setHost(DEFAULT_HOST); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public static GrpcStorageOptions getDefaultInstance() { return newBuilder().build(); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public static GrpcStorageOptions.GrpcStorageDefaults defaults() { return GrpcStorageOptions.GrpcStorageDefaults.INSTANCE; } @@ -413,8 +408,7 @@ protected boolean shouldRefreshService(Storage cachedService) { return super.shouldRefreshService(cachedService); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public static final class Builder extends StorageOptions.Builder { private StorageRetryStrategy storageRetryStrategy; @@ -448,9 +442,8 @@ public static final class Builder extends StorageOptions.Builder { * * @param terminationAwaitDuration a non-null Duration to use * @return the builder - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi public Builder setTerminationAwaitDuration(Duration terminationAwaitDuration) { this.terminationAwaitDuration = requireNonNull(terminationAwaitDuration, "terminationAwaitDuration must be non null"); @@ -464,9 +457,8 @@ public Builder setTerminationAwaitDuration(Duration terminationAwaitDuration) { * underlying code will translate the normal {@code https://storage.googleapis.com:443} into the * proper Direct Google Access URI for you. * - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi public GrpcStorageOptions.Builder setAttemptDirectPath(boolean attemptDirectPath) { this.attemptDirectPath = attemptDirectPath; return this; @@ -476,9 +468,8 @@ public GrpcStorageOptions.Builder setAttemptDirectPath(boolean attemptDirectPath * Monitoring. To disable metric reporting, set this to false. True by default. Emitting metrics * is free and requires minimal CPU and memory. * - * @since 2.41.0 This new api is in preview and is subject to breaking changes. + * @since 2.41.0 */ - @BetaApi public GrpcStorageOptions.Builder setEnableGrpcClientMetrics(boolean enableGrpcClientMetrics) { this.enableGrpcClientMetrics = enableGrpcClientMetrics; if (enableGrpcClientMetrics) { @@ -487,8 +478,7 @@ public GrpcStorageOptions.Builder setEnableGrpcClientMetrics(boolean enableGrpcC return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setTransportOptions(TransportOptions transportOptions) { if (!(transportOptions instanceof GrpcTransportOptions)) { @@ -504,9 +494,8 @@ public GrpcStorageOptions.Builder setTransportOptions(TransportOptions transport * @param storageRetryStrategy a non-null storageRetryStrategy to use * @return the builder * @see StorageRetryStrategy#getDefaultStorageRetryStrategy() - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi public GrpcStorageOptions.Builder setStorageRetryStrategy( StorageRetryStrategy storageRetryStrategy) { this.storageRetryStrategy = @@ -519,8 +508,7 @@ protected GrpcStorageOptions.Builder self() { return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setServiceFactory( ServiceFactory serviceFactory) { @@ -528,48 +516,42 @@ public GrpcStorageOptions.Builder setServiceFactory( return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setClock(ApiClock clock) { super.setClock(clock); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setProjectId(String projectId) { super.setProjectId(projectId); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setHost(String host) { super.setHost(host); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setCredentials(Credentials credentials) { super.setCredentials(credentials); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setRetrySettings(RetrySettings retrySettings) { super.setRetrySettings(retrySettings); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setServiceRpcFactory( ServiceRpcFactory serviceRpcFactory) { @@ -577,32 +559,28 @@ public GrpcStorageOptions.Builder setServiceRpcFactory( "GrpcStorageOptions does not support setting a custom instance of ServiceRpcFactory"); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setHeaderProvider(HeaderProvider headerProvider) { super.setHeaderProvider(headerProvider); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setClientLibToken(String clientLibToken) { super.setClientLibToken(clientLibToken); return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions.Builder setQuotaProjectId(String quotaProjectId) { super.setQuotaProjectId(quotaProjectId); return this; } - /** @since 2.22.3 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.22.3 */ public GrpcStorageOptions.Builder setGrpcInterceptorProvider( @NonNull GrpcInterceptorProvider grpcInterceptorProvider) { requireNonNull(grpcInterceptorProvider, "grpcInterceptorProvider must be non null"); @@ -628,8 +606,7 @@ public GrpcStorageOptions.Builder setBlobWriteSessionConfig( return this; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcStorageOptions build() { GrpcStorageOptions options = new GrpcStorageOptions(this, defaults()); @@ -642,8 +619,7 @@ public GrpcStorageOptions build() { } } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public static final class GrpcStorageDefaults extends StorageDefaults { static final GrpcStorageDefaults INSTANCE = new GrpcStorageOptions.GrpcStorageDefaults(); static final StorageFactory STORAGE_FACTORY = new GrpcStorageFactory(); @@ -653,59 +629,50 @@ public static final class GrpcStorageDefaults extends StorageDefaults { private GrpcStorageDefaults() {} - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public StorageFactory getDefaultServiceFactory() { return STORAGE_FACTORY; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public StorageRpcFactory getDefaultRpcFactory() { return STORAGE_RPC_FACTORY; } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ @Override public GrpcTransportOptions getDefaultTransportOptions() { return GrpcTransportOptions.newBuilder().build(); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public StorageRetryStrategy getStorageRetryStrategy() { return StorageRetryStrategy.getDefaultStorageRetryStrategy(); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public Duration getTerminationAwaitDuration() { return Duration.ofMinutes(1); } - /** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.14.0 */ public boolean isAttemptDirectPath() { return true; } - /** @since 2.41.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.41.0 */ public boolean isEnableGrpcClientMetrics() { return true; } - /** @since 2.22.3 This new api is in preview and is subject to breaking changes. */ - @BetaApi + /** @since 2.22.3 */ public GrpcInterceptorProvider grpcInterceptorProvider() { return INTERCEPTOR_PROVIDER; } /** @since 2.26.0 This new api is in preview and is subject to breaking changes. */ - @BetaApi public BlobWriteSessionConfig getDefaultStorageWriterConfig() { return BlobWriteSessionConfigs.getDefault(); } @@ -721,10 +688,9 @@ public BlobWriteSessionConfig getDefaultStorageWriterConfig() { * * @see GrpcStorageOptions#defaults() * @see GrpcStorageOptions.GrpcStorageDefaults#getDefaultServiceFactory() - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ @InternalApi - @BetaApi public static class GrpcStorageFactory implements StorageFactory { /** @@ -740,13 +706,12 @@ public static class GrpcStorageFactory implements StorageFactory { * @deprecated instead use {@link * GrpcStorageOptions.GrpcStorageDefaults#getDefaultServiceFactory() * GrpcStorageOptions.defaults().getDefaultServiceFactory()} - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ // this class needs to be public due to ServiceOptions forName'ing it in it's readObject method @InternalApi @Deprecated @SuppressWarnings("DeprecatedIsStillUsed") - @BetaApi public GrpcStorageFactory() {} @Override @@ -803,10 +768,9 @@ public Storage create(StorageOptions options) { * * @see GrpcStorageOptions#defaults() * @see GrpcStorageOptions.GrpcStorageDefaults#getDefaultRpcFactory() - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ @InternalApi - @BetaApi @Deprecated public static class GrpcStorageRpcFactory implements StorageRpcFactory { @@ -822,13 +786,12 @@ public static class GrpcStorageRpcFactory implements StorageRpcFactory { * @see GrpcStorageOptions.GrpcStorageDefaults#getDefaultRpcFactory() * @deprecated instead use {@link GrpcStorageOptions.GrpcStorageDefaults#getDefaultRpcFactory() * GrpcStorageOptions.defaults().getDefaultRpcFactory()} - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ // this class needs to be public due to ServiceOptions forName'ing it in it's readObject method @InternalApi @Deprecated @SuppressWarnings("DeprecatedIsStillUsed") - @BetaApi public GrpcStorageRpcFactory() {} @Override diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java index 9f6781f6c..a14bad424 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java @@ -46,8 +46,7 @@ import java.util.Set; import org.checkerframework.checker.nullness.qual.NonNull; -/** @since 2.14.0 This new api is in preview and is subject to breaking changes. */ -@BetaApi +/** @since 2.14.0 */ @TransportCompatibility(Transport.HTTP) // non-final because of mocking frameworks public class HttpStorageOptions extends StorageOptions { diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java index 0729b4722..8b719396a 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java @@ -473,7 +473,6 @@ public static BucketTargetOption projection(@NonNull String projection) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BucketTargetOption[] dedupe(BucketTargetOption... os) { return Option.dedupe(BucketTargetOption[]::new, os); } @@ -548,7 +547,6 @@ public static BucketSourceOption requestedPolicyVersion(long version) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BucketSourceOption[] dedupe(BucketSourceOption... os) { return Option.dedupe(BucketSourceOption[]::new, os); } @@ -560,7 +558,6 @@ public static BucketSourceOption[] dedupe(BucketSourceOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketSourceOption[] dedupe( Collection collection, BucketSourceOption... os) { return Option.dedupe(BucketSourceOption[]::new, collection, os); @@ -573,7 +570,6 @@ public static BucketSourceOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketSourceOption[] dedupe( BucketSourceOption[] array, BucketSourceOption... os) { return Option.dedupe(BucketSourceOption[]::new, array, os); @@ -639,7 +635,6 @@ public static ListHmacKeysOption projectId(@NonNull String projectId) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static ListHmacKeysOption[] dedupe(ListHmacKeysOption... os) { return Option.dedupe(ListHmacKeysOption[]::new, os); } @@ -651,7 +646,6 @@ public static ListHmacKeysOption[] dedupe(ListHmacKeysOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static ListHmacKeysOption[] dedupe( Collection collection, ListHmacKeysOption... os) { return Option.dedupe(ListHmacKeysOption[]::new, collection, os); @@ -664,7 +658,6 @@ public static ListHmacKeysOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static ListHmacKeysOption[] dedupe( ListHmacKeysOption[] array, ListHmacKeysOption... os) { return Option.dedupe(ListHmacKeysOption[]::new, array, os); @@ -700,7 +693,6 @@ public static CreateHmacKeyOption projectId(@NonNull String projectId) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static CreateHmacKeyOption[] dedupe(CreateHmacKeyOption... os) { return Option.dedupe(CreateHmacKeyOption[]::new, os); } @@ -712,7 +704,6 @@ public static CreateHmacKeyOption[] dedupe(CreateHmacKeyOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static CreateHmacKeyOption[] dedupe( Collection collection, CreateHmacKeyOption... os) { return Option.dedupe(CreateHmacKeyOption[]::new, collection, os); @@ -725,7 +716,6 @@ public static CreateHmacKeyOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static CreateHmacKeyOption[] dedupe( CreateHmacKeyOption[] array, CreateHmacKeyOption... os) { return Option.dedupe(CreateHmacKeyOption[]::new, array, os); @@ -760,7 +750,6 @@ public static GetHmacKeyOption projectId(@NonNull String projectId) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static GetHmacKeyOption[] dedupe(GetHmacKeyOption... os) { return Option.dedupe(GetHmacKeyOption[]::new, os); } @@ -772,7 +761,6 @@ public static GetHmacKeyOption[] dedupe(GetHmacKeyOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static GetHmacKeyOption[] dedupe( Collection collection, GetHmacKeyOption... os) { return Option.dedupe(GetHmacKeyOption[]::new, collection, os); @@ -785,7 +773,6 @@ public static GetHmacKeyOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static GetHmacKeyOption[] dedupe(GetHmacKeyOption[] array, GetHmacKeyOption... os) { return Option.dedupe(GetHmacKeyOption[]::new, array, os); } @@ -810,7 +797,6 @@ public static DeleteHmacKeyOption userProject(@NonNull String userProject) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static DeleteHmacKeyOption[] dedupe(DeleteHmacKeyOption... os) { return Option.dedupe(DeleteHmacKeyOption[]::new, os); } @@ -822,7 +808,6 @@ public static DeleteHmacKeyOption[] dedupe(DeleteHmacKeyOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static DeleteHmacKeyOption[] dedupe( Collection collection, DeleteHmacKeyOption... os) { return Option.dedupe(DeleteHmacKeyOption[]::new, collection, os); @@ -835,7 +820,6 @@ public static DeleteHmacKeyOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static DeleteHmacKeyOption[] dedupe( DeleteHmacKeyOption[] array, DeleteHmacKeyOption... os) { return Option.dedupe(DeleteHmacKeyOption[]::new, array, os); @@ -861,7 +845,6 @@ public static UpdateHmacKeyOption userProject(@NonNull String userProject) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static UpdateHmacKeyOption[] dedupe(UpdateHmacKeyOption... os) { return Option.dedupe(UpdateHmacKeyOption[]::new, os); } @@ -873,7 +856,6 @@ public static UpdateHmacKeyOption[] dedupe(UpdateHmacKeyOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static UpdateHmacKeyOption[] dedupe( Collection collection, UpdateHmacKeyOption... os) { return Option.dedupe(UpdateHmacKeyOption[]::new, collection, os); @@ -886,7 +868,6 @@ public static UpdateHmacKeyOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static UpdateHmacKeyOption[] dedupe( UpdateHmacKeyOption[] array, UpdateHmacKeyOption... os) { return Option.dedupe(UpdateHmacKeyOption[]::new, array, os); @@ -950,7 +931,6 @@ public static BucketGetOption fields(BucketField... fields) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BucketGetOption[] dedupe(BucketGetOption... os) { return Option.dedupe(BucketGetOption[]::new, os); } @@ -962,7 +942,6 @@ public static BucketGetOption[] dedupe(BucketGetOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketGetOption[] dedupe( Collection collection, BucketGetOption... os) { return Option.dedupe(BucketGetOption[]::new, collection, os); @@ -975,7 +954,6 @@ public static BucketGetOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketGetOption[] dedupe(BucketGetOption[] array, BucketGetOption... os) { return Option.dedupe(BucketGetOption[]::new, array, os); } @@ -1144,7 +1122,6 @@ public static BlobTargetOption overrideUnlockedRetention(boolean overrideUnlocke * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobTargetOption[] dedupe(BlobTargetOption... os) { return Option.dedupe(BlobTargetOption[]::new, os); } @@ -1156,7 +1133,6 @@ public static BlobTargetOption[] dedupe(BlobTargetOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobTargetOption[] dedupe( Collection collection, BlobTargetOption... os) { return Option.dedupe(BlobTargetOption[]::new, collection, os); @@ -1169,7 +1145,6 @@ public static BlobTargetOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobTargetOption[] dedupe(BlobTargetOption[] array, BlobTargetOption... os) { return Option.dedupe(BlobTargetOption[]::new, array, os); } @@ -1373,7 +1348,6 @@ public static BlobWriteOption expectedObjectSize(long objectContentSize) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobWriteOption[] dedupe(BlobWriteOption... os) { return Option.dedupe(BlobWriteOption[]::new, os); } @@ -1385,7 +1359,6 @@ public static BlobWriteOption[] dedupe(BlobWriteOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobWriteOption[] dedupe( Collection collection, BlobWriteOption... os) { return Option.dedupe(BlobWriteOption[]::new, collection, os); @@ -1398,7 +1371,6 @@ public static BlobWriteOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobWriteOption[] dedupe(BlobWriteOption[] array, BlobWriteOption... os) { return Option.dedupe(BlobWriteOption[]::new, array, os); } @@ -1520,7 +1492,6 @@ public static BlobSourceOption shouldReturnRawInputStream(boolean shouldReturnRa * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobSourceOption[] dedupe(BlobSourceOption... os) { return Option.dedupe(BlobSourceOption[]::new, os); } @@ -1532,7 +1503,6 @@ public static BlobSourceOption[] dedupe(BlobSourceOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobSourceOption[] dedupe( Collection collection, BlobSourceOption... os) { return Option.dedupe(BlobSourceOption[]::new, collection, os); @@ -1545,7 +1515,6 @@ public static BlobSourceOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobSourceOption[] dedupe(BlobSourceOption[] array, BlobSourceOption... os) { return Option.dedupe(BlobSourceOption[]::new, array, os); } @@ -1691,7 +1660,6 @@ public static BlobGetOption softDeleted(boolean softDeleted) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobGetOption[] dedupe(BlobGetOption... os) { return Option.dedupe(BlobGetOption[]::new, os); } @@ -1703,7 +1671,6 @@ public static BlobGetOption[] dedupe(BlobGetOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobGetOption[] dedupe( Collection collection, BlobGetOption... os) { return Option.dedupe(BlobGetOption[]::new, collection, os); @@ -1716,7 +1683,6 @@ public static BlobGetOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobGetOption[] dedupe(BlobGetOption[] array, BlobGetOption... os) { return Option.dedupe(BlobGetOption[]::new, array, os); } @@ -1838,7 +1804,6 @@ public static BucketListOption fields(BucketField... fields) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BucketListOption[] dedupe(BucketListOption... os) { return Option.dedupe(BucketListOption[]::new, os); } @@ -1850,7 +1815,6 @@ public static BucketListOption[] dedupe(BucketListOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketListOption[] dedupe( Collection collection, BucketListOption... os) { return Option.dedupe(BucketListOption[]::new, collection, os); @@ -1863,7 +1827,6 @@ public static BucketListOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BucketListOption[] dedupe(BucketListOption[] array, BucketListOption... os) { return Option.dedupe(BucketListOption[]::new, array, os); } @@ -1956,7 +1919,7 @@ public static BlobListOption endOffset(@NonNull String endOffset) { * Objects */ @BetaApi - @TransportCompatibility({Transport.HTTP}) + @TransportCompatibility({Transport.HTTP, Transport.GRPC}) public static BlobListOption matchGlob(@NonNull String glob) { return new BlobListOption(UnifiedOpts.matchGlob(glob)); } @@ -2018,7 +1981,6 @@ public static BlobListOption softDeleted(boolean softDeleted) { * Deduplicate any options which are the same parameter. The value which comes last in {@code * os} will be the value included in the return. */ - @BetaApi public static BlobListOption[] dedupe(BlobListOption... os) { return Option.dedupe(BlobListOption[]::new, os); } @@ -2030,7 +1992,6 @@ public static BlobListOption[] dedupe(BlobListOption... os) { * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobListOption[] dedupe( Collection collection, BlobListOption... os) { return Option.dedupe(BlobListOption[]::new, collection, os); @@ -2043,7 +2004,6 @@ public static BlobListOption[] dedupe( * in the return. All options from {@code os} will override their counterparts in {@code * collection}. */ - @BetaApi public static BlobListOption[] dedupe(BlobListOption[] array, BlobListOption... os) { return Option.dedupe(BlobListOption[]::new, array, os); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java index ab32532ae..81d787f76 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java @@ -181,9 +181,8 @@ public static StorageOptions.Builder newBuilder() { /** * Builder factory method which will create a JSON over HTTP specific instance of storage options. * - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi @TransportCompatibility(Transport.HTTP) public static HttpStorageOptions.Builder http() { return HttpStorageOptions.newBuilder(); @@ -194,9 +193,8 @@ public static HttpStorageOptions.Builder http() { * *

Google Cloud Storage is in Private Preview for a gRPC centric transport. * - * @since 2.14.0 This new api is in preview and is subject to breaking changes. + * @since 2.14.0 */ - @BetaApi @TransportCompatibility(Transport.GRPC) public static GrpcStorageOptions.Builder grpc() { return GrpcStorageOptions.newBuilder(); diff --git a/grpc-google-cloud-storage-v2/pom.xml b/grpc-google-cloud-storage-v2/pom.xml index 7ec0789fa..42a9b8321 100644 --- a/grpc-google-cloud-storage-v2/pom.xml +++ b/grpc-google-cloud-storage-v2/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT grpc-google-cloud-storage-v2 GRPC library for grpc-google-cloud-storage-v2 diff --git a/pom.xml b/pom.xml index 75dd128c7..992857448 100644 --- a/pom.xml +++ b/pom.xml @@ -156,17 +156,17 @@ com.google.api.grpc proto-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT com.google.api.grpc gapic-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT com.google.api.grpc diff --git a/proto-google-cloud-storage-v2/pom.xml b/proto-google-cloud-storage-v2/pom.xml index d2d24cd70..d6f01ef3b 100644 --- a/proto-google-cloud-storage-v2/pom.xml +++ b/proto-google-cloud-storage-v2/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api.grpc proto-google-cloud-storage-v2 - 2.43.3-beta-SNAPSHOT + 2.43.3-SNAPSHOT proto-google-cloud-storage-v2 PROTO library for proto-google-cloud-storage-v2 diff --git a/versions.txt b/versions.txt index 63f8e1ff5..47bf39092 100644 --- a/versions.txt +++ b/versions.txt @@ -2,9 +2,9 @@ # module:released-version:current-version google-cloud-storage:2.43.2:2.43.3-SNAPSHOT -gapic-google-cloud-storage-v2:2.43.2-beta:2.43.3-beta-SNAPSHOT -grpc-google-cloud-storage-v2:2.43.2-beta:2.43.3-beta-SNAPSHOT -proto-google-cloud-storage-v2:2.43.2-beta:2.43.3-beta-SNAPSHOT +gapic-google-cloud-storage-v2:2.43.2-beta:2.43.3-SNAPSHOT +grpc-google-cloud-storage-v2:2.43.2-beta:2.43.3-SNAPSHOT +proto-google-cloud-storage-v2:2.43.2-beta:2.43.3-SNAPSHOT google-cloud-storage-control:2.43.2:2.43.3-SNAPSHOT proto-google-cloud-storage-control-v2:2.43.2:2.43.3-SNAPSHOT grpc-google-cloud-storage-control-v2:2.43.2:2.43.3-SNAPSHOT