diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadClient.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadClient.java index 4f80a7083d..35591bec33 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadClient.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadClient.java @@ -16,7 +16,6 @@ package com.google.cloud.storage; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadRequest; import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadResponse; @@ -38,9 +37,8 @@ * low-level interface for creating and managing multipart uploads. * * @see Multipart Uploads - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi @InternalExtensionOnly public abstract class MultipartUploadClient { @@ -51,9 +49,8 @@ public abstract class MultipartUploadClient { * * @param request The request object containing the details for creating the multipart upload. * @return A {@link CreateMultipartUploadResponse} object containing the upload ID. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public abstract CreateMultipartUploadResponse createMultipartUpload( CreateMultipartUploadRequest request); @@ -62,9 +59,8 @@ public abstract CreateMultipartUploadResponse createMultipartUpload( * * @param listPartsRequest The request object containing the details for listing the parts. * @return A {@link ListPartsResponse} object containing the list of parts. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public abstract ListPartsResponse listParts(ListPartsRequest listPartsRequest); /** @@ -72,9 +68,8 @@ public abstract CreateMultipartUploadResponse createMultipartUpload( * * @param request The request object containing the details for aborting the multipart upload. * @return An {@link AbortMultipartUploadResponse} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public abstract AbortMultipartUploadResponse abortMultipartUpload( AbortMultipartUploadRequest request); @@ -84,9 +79,8 @@ public abstract AbortMultipartUploadResponse abortMultipartUpload( * @param request The request object containing the details for completing the multipart upload. * @return A {@link CompleteMultipartUploadResponse} object containing information about the * completed upload. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public abstract CompleteMultipartUploadResponse completeMultipartUpload( CompleteMultipartUploadRequest request); @@ -96,9 +90,8 @@ public abstract CompleteMultipartUploadResponse completeMultipartUpload( * @param request The request object containing the details for uploading the part. * @param requestBody The content of the part to upload. * @return An {@link UploadPartResponse} object containing the ETag of the uploaded part. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public abstract UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requestBody); /** @@ -106,9 +99,8 @@ public abstract CompleteMultipartUploadResponse completeMultipartUpload( * * @param request The request object containing the details for listing the multipart uploads. * @return A {@link ListMultipartUploadsResponse} object containing the list of multipart uploads. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public abstract ListMultipartUploadsResponse listMultipartUploads( ListMultipartUploadsRequest request); @@ -117,9 +109,8 @@ public abstract ListMultipartUploadsResponse listMultipartUploads( * * @param config The configuration for the client. * @return A new {@link MultipartUploadClient} instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static MultipartUploadClient create(MultipartUploadSettings config) { HttpStorageOptions options = config.getOptions(); return new MultipartUploadClientImpl( diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadSettings.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadSettings.java index a4130929ab..c3ccd049e2 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadSettings.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadSettings.java @@ -15,14 +15,11 @@ */ package com.google.cloud.storage; -import com.google.api.core.BetaApi; - /** * Settings for configuring the {@link MultipartUploadClient}. * *

This class is for internal use only and is not intended for public consumption. */ -@BetaApi public final class MultipartUploadSettings { private final HttpStorageOptions options; @@ -35,7 +32,6 @@ private MultipartUploadSettings(HttpStorageOptions options) { * * @return The {@link HttpStorageOptions}. */ - @BetaApi public HttpStorageOptions getOptions() { return options; } @@ -47,7 +43,6 @@ public HttpStorageOptions getOptions() { * @param options The {@link HttpStorageOptions} to use. * @return A new {@code MultipartUploadSettings} instance. */ - @BetaApi public static MultipartUploadSettings of(HttpStorageOptions options) { return new MultipartUploadSettings(options); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java index a14cb173a5..6dfbff2ecc 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java @@ -16,7 +16,6 @@ package com.google.cloud.storage; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,7 +29,6 @@ * @see https://cloud.google.com/storage/docs/multipart-uploads#upload_parts */ -@BetaApi @InternalExtensionOnly public final class RequestBody { @@ -45,25 +43,21 @@ RewindableContent getContent() { } /** Create a new empty RequestBody. */ - @BetaApi public static RequestBody empty() { return new RequestBody(RewindableContent.empty()); } /** Create a new RequestBody from the given {@link ByteBuffer}s. */ - @BetaApi public static RequestBody of(ByteBuffer... buffers) { return new RequestBody(RewindableContent.of(buffers)); } /** Create a new RequestBody from the given {@link ByteBuffer}s. */ - @BetaApi public static RequestBody of(ByteBuffer[] srcs, int srcsOffset, int srcsLength) { return new RequestBody(RewindableContent.of(srcs, srcsOffset, srcsLength)); } /** Create a new RequestBody from the given {@link Path}. */ - @BetaApi public static RequestBody of(Path path) throws IOException { return new RequestBody(RewindableContent.of(path)); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadRequest.java index 8dddf99d1d..8e98c4f865 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadRequest.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadRequest.java @@ -15,15 +15,12 @@ */ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; - /** * Represents a request to abort a multipart upload. This request is used to stop an in-progress * multipart upload, deleting any previously uploaded parts. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class AbortMultipartUploadRequest { private final String bucket; private final String key; @@ -41,9 +38,8 @@ private AbortMultipartUploadRequest(Builder builder) { * Returns the name of the bucket in which the multipart upload is stored. * * @return The bucket name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -52,9 +48,8 @@ public String bucket() { * Returns the name of the object that is being uploaded. * * @return The object name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -63,9 +58,8 @@ public String key() { * Returns the upload ID of the multipart upload to abort. * * @return The upload ID. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -76,9 +70,8 @@ public String uploadId() { * @return the user-project. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String userProject() { return userProject; } @@ -87,9 +80,8 @@ public String userProject() { * Returns a new builder for creating {@link AbortMultipartUploadRequest} instances. * * @return A new {@link Builder}. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -97,9 +89,8 @@ public static Builder builder() { /** * A builder for creating {@link AbortMultipartUploadRequest} instances. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private String bucket; private String key; @@ -113,9 +104,8 @@ private Builder() {} * * @param bucket The bucket name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -126,9 +116,8 @@ public Builder bucket(String bucket) { * * @param key The object name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -139,9 +128,8 @@ public Builder key(String key) { * * @param uploadId The upload ID. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -154,9 +142,8 @@ public Builder uploadId(String uploadId) { * @return This builder. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder userProject(String userProject) { this.userProject = userProject; return this; @@ -166,9 +153,8 @@ public Builder userProject(String userProject) { * Builds a new {@link AbortMultipartUploadRequest} instance. * * @return A new {@link AbortMultipartUploadRequest}. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public AbortMultipartUploadRequest build() { return new AbortMultipartUploadRequest(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadResponse.java index 050bb68f73..c95ad03957 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadResponse.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/AbortMultipartUploadResponse.java @@ -15,13 +15,13 @@ */ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** * Represents a response to an abort multipart upload request. This class is currently empty as the * abort operation does not return any specific data in its response body. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi +@JacksonXmlRootElement(localName = "AbortMultipartUploadResponse") public final class AbortMultipartUploadResponse {} diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadRequest.java index 4f7a6a4cb0..6dafbcacba 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadRequest.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadRequest.java @@ -16,16 +16,14 @@ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; /** * Represents a request to complete a multipart upload. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class CompleteMultipartUploadRequest { private final String bucket; @@ -46,9 +44,8 @@ private CompleteMultipartUploadRequest(Builder builder) { * Returns the bucket name. * * @return The bucket name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -57,9 +54,8 @@ public String bucket() { * Returns the object name. * * @return The object name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -68,9 +64,8 @@ public String key() { * Returns the upload ID of the multipart upload. * * @return The upload ID. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -79,9 +74,8 @@ public String uploadId() { * Returns the {@link CompletedMultipartUpload} payload for this request. * * @return The {@link CompletedMultipartUpload} payload. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CompletedMultipartUpload multipartUpload() { return multipartUpload; } @@ -92,9 +86,8 @@ public CompletedMultipartUpload multipartUpload() { * @return the user-project. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String userProject() { return userProject; } @@ -135,9 +128,8 @@ public String toString() { * Creates a new builder for {@link CompleteMultipartUploadRequest}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -145,9 +137,8 @@ public static Builder builder() { /** * Builder for {@link CompleteMultipartUploadRequest}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private String bucket; private String key; @@ -162,9 +153,8 @@ private Builder() {} * * @param bucket The bucket name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -175,9 +165,8 @@ public Builder bucket(String bucket) { * * @param key The object name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -188,9 +177,8 @@ public Builder key(String key) { * * @param uploadId The upload ID. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -201,9 +189,8 @@ public Builder uploadId(String uploadId) { * * @param completedMultipartUpload The {@link CompletedMultipartUpload} payload. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder multipartUpload(CompletedMultipartUpload completedMultipartUpload) { this.multipartUpload = completedMultipartUpload; return this; @@ -216,9 +203,8 @@ public Builder multipartUpload(CompletedMultipartUpload completedMultipartUpload * @return This builder. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder userProject(String userProject) { this.userProject = userProject; return this; @@ -228,9 +214,8 @@ public Builder userProject(String userProject) { * Builds the {@link CompleteMultipartUploadRequest} object. * * @return The new {@link CompleteMultipartUploadRequest} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CompleteMultipartUploadRequest build() { return new CompleteMultipartUploadRequest(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadResponse.java index 52d16dad6d..78fb27432f 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadResponse.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompleteMultipartUploadResponse.java @@ -19,16 +19,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; /** * Represents the response from a completed multipart upload. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi @JsonDeserialize(builder = CompleteMultipartUploadResponse.Builder.class) public final class CompleteMultipartUploadResponse { @@ -50,9 +48,8 @@ private CompleteMultipartUploadResponse(Builder builder) { * Returns the URL of the completed object. * * @return The URL of the completed object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("Location") public String location() { return location; @@ -62,9 +59,8 @@ public String location() { * Returns the bucket name. * * @return The bucket name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("Bucket") public String bucket() { return bucket; @@ -74,9 +70,8 @@ public String bucket() { * Returns the object name. * * @return The object name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("Key") public String key() { return key; @@ -86,9 +81,8 @@ public String key() { * Returns the ETag of the completed object. * * @return The ETag of the completed object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("ETag") public String etag() { return etag; @@ -98,9 +92,8 @@ public String etag() { * Returns the CRC32C checksum of the completed object. * * @return The CRC32C checksum of the completed object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String crc32c() { return crc32c; } @@ -141,9 +134,8 @@ public String toString() { * Creates a new builder for {@link CompleteMultipartUploadResponse}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -151,9 +143,8 @@ public static Builder builder() { /** * Builder for {@link CompleteMultipartUploadResponse}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonPOJOBuilder(buildMethodName = "build") public static class Builder { private String location; @@ -169,9 +160,8 @@ private Builder() {} * * @param location The URL of the completed object. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("Location") public Builder location(String location) { this.location = location; @@ -183,9 +173,8 @@ public Builder location(String location) { * * @param bucket The bucket name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("Bucket") public Builder bucket(String bucket) { this.bucket = bucket; @@ -197,9 +186,8 @@ public Builder bucket(String bucket) { * * @param key The object name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("Key") public Builder key(String key) { this.key = key; @@ -211,9 +199,8 @@ public Builder key(String key) { * * @param etag The ETag of the completed object. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi @JsonProperty("ETag") public Builder etag(String etag) { this.etag = etag; @@ -225,9 +212,8 @@ public Builder etag(String etag) { * * @param crc32c The CRC32C checksum of the completed object. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder crc32c(String crc32c) { this.crc32c = crc32c; return this; @@ -237,9 +223,8 @@ public Builder crc32c(String crc32c) { * Builds the {@link CompleteMultipartUploadResponse} object. * * @return The new {@link CompleteMultipartUploadResponse} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CompleteMultipartUploadResponse build() { return new CompleteMultipartUploadResponse(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedMultipartUpload.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedMultipartUpload.java index 0d008bf5fc..8724534316 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedMultipartUpload.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedMultipartUpload.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.List; import java.util.Objects; @@ -29,7 +28,6 @@ * * @since 2.60.0 This new api is in preview and is subject to breaking changes. */ -@BetaApi @JacksonXmlRootElement(localName = "CompleteMultipartUpload") public class CompletedMultipartUpload { @@ -45,9 +43,8 @@ private CompletedMultipartUpload(Builder builder) { * Returns the list of completed parts for this multipart upload. * * @return The list of completed parts. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public List parts() { return completedPartList; } @@ -78,9 +75,8 @@ public String toString() { * Creates a new builder for {@link CompletedMultipartUpload}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -88,9 +84,8 @@ public static Builder builder() { /** * Builder for {@link CompletedMultipartUpload}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private List parts; @@ -101,9 +96,8 @@ private Builder() {} * * @param completedPartList The list of completed parts. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder parts(List completedPartList) { this.parts = completedPartList; return this; @@ -113,9 +107,8 @@ public Builder parts(List completedPartList) { * Builds the {@link CompletedMultipartUpload} object. * * @return The new {@link CompletedMultipartUpload} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CompletedMultipartUpload build() { return new CompletedMultipartUpload(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedPart.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedPart.java index 8be7ded883..0db0099878 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedPart.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CompletedPart.java @@ -16,14 +16,12 @@ package com.google.cloud.storage.multipartupload.model; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.google.api.core.BetaApi; /** * Represents a completed part of a multipart upload. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class CompletedPart { @JacksonXmlProperty(localName = "PartNumber") @@ -41,9 +39,8 @@ private CompletedPart(int partNumber, String eTag) { * Creates a new builder for {@link CompletedPart}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -52,9 +49,8 @@ public static Builder builder() { * Returns the part number of this completed part. * * @return The part number. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public int partNumber() { return partNumber; } @@ -63,9 +59,8 @@ public int partNumber() { * Returns the ETag of this completed part. * * @return The ETag. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String eTag() { return eTag; } @@ -73,9 +68,8 @@ public String eTag() { /** * Builder for {@link CompletedPart}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private int partNumber; private String etag; @@ -85,9 +79,8 @@ public static class Builder { * * @param partNumber The part number. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder partNumber(int partNumber) { this.partNumber = partNumber; return this; @@ -98,9 +91,8 @@ public Builder partNumber(int partNumber) { * * @param etag The ETag. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder eTag(String etag) { this.etag = etag; return this; @@ -110,9 +102,8 @@ public Builder eTag(String etag) { * Builds the {@link CompletedPart} object. * * @return The new {@link CompletedPart} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CompletedPart build() { return new CompletedPart(partNumber, etag); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest.java index 4b58c6ec55..f46b69ae23 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadRequest.java @@ -16,7 +16,6 @@ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; import com.google.cloud.storage.Storage.PredefinedAcl; import com.google.cloud.storage.StorageClass; import com.google.common.base.MoreObjects; @@ -28,9 +27,8 @@ * Represents a request to initiate a multipart upload. This class holds all the necessary * information to create a new multipart upload session. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class CreateMultipartUploadRequest { private final String bucket; private final String key; @@ -70,9 +68,8 @@ private CreateMultipartUploadRequest(Builder builder) { * Returns the name of the bucket to which the object is being uploaded. * * @return The bucket name - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -82,9 +79,8 @@ public String bucket() { * * @see Object Naming * @return The object name - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -93,9 +89,8 @@ public String key() { * Returns a canned ACL to apply to the object. * * @return The canned ACL - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public PredefinedAcl cannedAcl() { return cannedAcl; } @@ -104,9 +99,8 @@ public PredefinedAcl cannedAcl() { * Returns the MIME type of the data you are uploading. * * @return The Content-Type - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String contentType() { return contentType; } @@ -115,9 +109,8 @@ public String contentType() { * Returns the presentational information about how the object data is to be transmitted. * * @return The Content-Disposition - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String contentDisposition() { return contentDisposition; } @@ -126,9 +119,8 @@ public String contentDisposition() { * Returns the compression algorithm that was used to compress the data being uploaded. * * @return The Content-Encoding - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String contentEncoding() { return contentEncoding; } @@ -137,9 +129,8 @@ public String contentEncoding() { * Returns the language code of the content. * * @return The Content-Language - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String contentLanguage() { return contentLanguage; } @@ -149,9 +140,8 @@ public String contentLanguage() { * accessible. * * @return The Cache-Control - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String cacheControl() { return cacheControl; } @@ -160,9 +150,8 @@ public String cacheControl() { * Returns the custom metadata of the object. * * @return The custom metadata - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Map metadata() { return metadata; } @@ -171,9 +160,8 @@ public Map metadata() { * Returns the storage class for the object. * * @return The Storage-Class - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public StorageClass storageClass() { return storageClass; } @@ -182,9 +170,8 @@ public StorageClass storageClass() { * Returns a user-specified date and time. * * @return The custom time - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public OffsetDateTime customTime() { return customTime; } @@ -193,9 +180,8 @@ public OffsetDateTime customTime() { * Returns the customer-managed encryption key to use to encrypt the object. * * @return The Cloud KMS key - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String kmsKeyName() { return kmsKeyName; } @@ -204,9 +190,8 @@ public String kmsKeyName() { * Returns the mode of the object's retention configuration. * * @return The object lock mode - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public ObjectLockMode objectLockMode() { return objectLockMode; } @@ -215,9 +200,8 @@ public ObjectLockMode objectLockMode() { * Returns the date that determines the time until which the object is retained as immutable. * * @return The object lock retention until date - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public OffsetDateTime objectLockRetainUntilDate() { return objectLockRetainUntilDate; } @@ -226,7 +210,7 @@ public OffsetDateTime objectLockRetainUntilDate() { * Returns the project to be billed for charges associated with this request. * * @return The user project - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ public String userProject() { return userProject; @@ -303,9 +287,8 @@ public String toString() { * Returns a new {@link Builder} for creating a {@link CreateMultipartUploadRequest}. * * @return a new builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -313,9 +296,8 @@ public static Builder builder() { /** * A builder for {@link CreateMultipartUploadRequest}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static final class Builder { private String bucket; private String key; @@ -340,9 +322,8 @@ private Builder() {} * * @param bucket The bucket name * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -354,9 +335,8 @@ public Builder bucket(String bucket) { * @see Object Naming * @param key The object name * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -367,9 +347,8 @@ public Builder key(String key) { * * @param cannedAcl The canned ACL * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder cannedAcl(PredefinedAcl cannedAcl) { this.cannedAcl = cannedAcl; return this; @@ -380,9 +359,8 @@ public Builder cannedAcl(PredefinedAcl cannedAcl) { * * @param contentType The Content-Type * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder contentType(String contentType) { this.contentType = contentType; return this; @@ -393,9 +371,8 @@ public Builder contentType(String contentType) { * * @param contentDisposition The content disposition for the object. * @return this builder - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder contentDisposition(String contentDisposition) { this.contentDisposition = contentDisposition; return this; @@ -406,9 +383,8 @@ public Builder contentDisposition(String contentDisposition) { * * @param contentEncoding The content encoding for the object. * @return this builder - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder contentEncoding(String contentEncoding) { this.contentEncoding = contentEncoding; return this; @@ -419,9 +395,8 @@ public Builder contentEncoding(String contentEncoding) { * * @param contentLanguage The content language for the object. * @return this builder - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder contentLanguage(String contentLanguage) { this.contentLanguage = contentLanguage; return this; @@ -432,9 +407,8 @@ public Builder contentLanguage(String contentLanguage) { * * @param cacheControl The cache control settings for the object. * @return this builder - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder cacheControl(String cacheControl) { this.cacheControl = cacheControl; return this; @@ -445,9 +419,8 @@ public Builder cacheControl(String cacheControl) { * * @param metadata The custom metadata * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder metadata(Map metadata) { this.metadata = metadata; return this; @@ -459,9 +432,8 @@ public Builder metadata(Map metadata) { * * @param storageClass The Storage-Class * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder storageClass(StorageClass storageClass) { this.storageClass = storageClass; return this; @@ -472,9 +444,8 @@ public Builder storageClass(StorageClass storageClass) { * * @param customTime The custom time * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder customTime(OffsetDateTime customTime) { this.customTime = customTime; return this; @@ -487,9 +458,8 @@ public Builder customTime(OffsetDateTime customTime) { * * @param kmsKeyName The Cloud KMS key * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder kmsKeyName(String kmsKeyName) { this.kmsKeyName = kmsKeyName; return this; @@ -501,9 +471,8 @@ public Builder kmsKeyName(String kmsKeyName) { * * @param objectLockMode The object lock mode * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder objectLockMode(ObjectLockMode objectLockMode) { this.objectLockMode = objectLockMode; return this; @@ -514,9 +483,8 @@ public Builder objectLockMode(ObjectLockMode objectLockMode) { * * @param objectLockRetainUntilDate The object lock retention until date * @return this builder - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder objectLockRetainUntilDate(OffsetDateTime objectLockRetainUntilDate) { this.objectLockRetainUntilDate = objectLockRetainUntilDate; return this; @@ -527,9 +495,8 @@ public Builder objectLockRetainUntilDate(OffsetDateTime objectLockRetainUntilDat * * @param userProject The project ID to bill for this request. * @return this builder - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder userProject(String userProject) { this.userProject = userProject; return this; @@ -539,9 +506,8 @@ public Builder userProject(String userProject) { * Creates a new {@link CreateMultipartUploadRequest} object. * * @return a new {@link CreateMultipartUploadRequest} object - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CreateMultipartUploadRequest build() { return new CreateMultipartUploadRequest(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadResponse.java index 87afb7fd62..1fddd47f62 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadResponse.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/CreateMultipartUploadResponse.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; @@ -26,10 +25,9 @@ * Represents the response from a CreateMultipartUpload request. This class encapsulates the details * of the initiated multipart upload, including the bucket, key, and the unique upload ID. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ @JacksonXmlRootElement(localName = "InitiateMultipartUploadResult") -@BetaApi public final class CreateMultipartUploadResponse { @JacksonXmlProperty(localName = "Bucket") @@ -53,9 +51,8 @@ private CreateMultipartUploadResponse(Builder builder) { * Returns the name of the bucket where the multipart upload was initiated. * * @return The bucket name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -64,9 +61,8 @@ public String bucket() { * Returns the key (object name) for which the multipart upload was initiated. * * @return The object key. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -76,9 +72,8 @@ public String key() { * subsequent requests related to this upload (e.g., uploading parts, completing the upload). * * @return The upload ID. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -115,9 +110,8 @@ public String toString() { * Creates a new builder for {@link CreateMultipartUploadResponse}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -125,9 +119,8 @@ public static Builder builder() { /** * A builder for {@link CreateMultipartUploadResponse} objects. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static final class Builder { private String bucket; private String key; @@ -140,9 +133,8 @@ private Builder() {} * * @param bucket The bucket name. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -153,9 +145,8 @@ public Builder bucket(String bucket) { * * @param key The object key. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -166,9 +157,8 @@ public Builder key(String key) { * * @param uploadId The upload ID. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -178,9 +168,8 @@ public Builder uploadId(String uploadId) { * Builds a new {@link CreateMultipartUploadResponse} object. * * @return A new {@link CreateMultipartUploadResponse} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public CreateMultipartUploadResponse build() { return new CreateMultipartUploadResponse(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsRequest.java index 17e1a924dd..ab55c2bacb 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsRequest.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsRequest.java @@ -16,7 +16,6 @@ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; @@ -25,9 +24,8 @@ * * @see Listing * multipart uploads - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ -@BetaApi public final class ListMultipartUploadsRequest { private final String bucket; @@ -62,9 +60,8 @@ private ListMultipartUploadsRequest( * The bucket to list multipart uploads from. * * @return The bucket name. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String bucket() { return bucket; } @@ -73,9 +70,8 @@ public String bucket() { * Character used to group keys. * * @return The delimiter. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String delimiter() { return delimiter; } @@ -84,9 +80,8 @@ public String delimiter() { * The encoding type used by Cloud Storage to encode object names in the response. * * @return The encoding type. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String encodingType() { return encodingType; } @@ -96,9 +91,8 @@ public String encodingType() { * should begin. * * @return The key marker. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String keyMarker() { return keyMarker; } @@ -107,9 +101,8 @@ public String keyMarker() { * The maximum number of multipart uploads to return. * * @return The maximum number of uploads. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Integer maxUploads() { return maxUploads; } @@ -118,9 +111,8 @@ public Integer maxUploads() { * Filters results to multipart uploads whose keys begin with this prefix. * * @return The prefix. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String prefix() { return prefix; } @@ -130,9 +122,8 @@ public String prefix() { * begin. * * @return The upload ID marker. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String uploadIdMarker() { return uploadIdMarker; } @@ -143,9 +134,8 @@ public String uploadIdMarker() { * @return the user-project. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String userProject() { return userProject; } @@ -200,9 +190,8 @@ public String toString() { * Returns a new builder for this request. * * @return A new builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -210,9 +199,8 @@ public static Builder builder() { /** * A builder for {@link ListMultipartUploadsRequest}. * - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public static final class Builder { private String bucket; private String delimiter; @@ -230,9 +218,8 @@ private Builder() {} * * @param bucket The bucket name. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -243,9 +230,8 @@ public Builder bucket(String bucket) { * * @param delimiter The delimiter. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder delimiter(String delimiter) { this.delimiter = delimiter; return this; @@ -256,9 +242,8 @@ public Builder delimiter(String delimiter) { * * @param encodingType The encoding type. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder encodingType(String encodingType) { this.encodingType = encodingType; return this; @@ -269,9 +254,8 @@ public Builder encodingType(String encodingType) { * * @param keyMarker The key marker. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder keyMarker(String keyMarker) { this.keyMarker = keyMarker; return this; @@ -282,9 +266,8 @@ public Builder keyMarker(String keyMarker) { * * @param maxUploads The maximum number of uploads. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder maxUploads(Integer maxUploads) { this.maxUploads = maxUploads; return this; @@ -295,9 +278,8 @@ public Builder maxUploads(Integer maxUploads) { * * @param prefix The prefix. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder prefix(String prefix) { this.prefix = prefix; return this; @@ -308,9 +290,8 @@ public Builder prefix(String prefix) { * * @param uploadIdMarker The upload ID marker. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder uploadIdMarker(String uploadIdMarker) { this.uploadIdMarker = uploadIdMarker; return this; @@ -323,9 +304,8 @@ public Builder uploadIdMarker(String uploadIdMarker) { * @return This builder. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder userProject(String userProject) { this.userProject = userProject; return this; @@ -335,9 +315,8 @@ public Builder userProject(String userProject) { * Builds the request. * * @return The built request. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public ListMultipartUploadsRequest build() { return new ListMultipartUploadsRequest( bucket, diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsResponse.java index d43184bc15..7007845271 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsResponse.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListMultipartUploadsResponse.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import java.util.ArrayList; @@ -31,9 +30,8 @@ * * @see Listing * multipart uploads - * @since 2.60.1 This new api is in preview and is subject to breaking changes. + * @since 2.60.1 */ -@BetaApi public final class ListMultipartUploadsResponse { @JacksonXmlElementWrapper(useWrapping = false) @@ -116,9 +114,8 @@ private ListMultipartUploadsResponse( * The list of multipart uploads. * * @return The list of multipart uploads. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public ImmutableList uploads() { return uploads == null ? ImmutableList.of() : ImmutableList.copyOf(uploads); } @@ -127,9 +124,8 @@ public ImmutableList uploads() { * The bucket that contains the multipart uploads. * * @return The bucket name. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String bucket() { return bucket; } @@ -138,9 +134,8 @@ public String bucket() { * The delimiter applied to the request. * * @return The delimiter applied to the request. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String delimiter() { return delimiter; } @@ -149,9 +144,8 @@ public String delimiter() { * The encoding type used by Cloud Storage to encode object names in the response. * * @return The encoding type. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String encodingType() { return encodingType; } @@ -160,9 +154,8 @@ public String encodingType() { * The key at or after which the listing began. * * @return The key marker. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String keyMarker() { return keyMarker; } @@ -171,9 +164,8 @@ public String keyMarker() { * The upload ID at or after which the listing began. * * @return The upload ID marker. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String uploadIdMarker() { return uploadIdMarker; } @@ -182,9 +174,8 @@ public String uploadIdMarker() { * The key after which listing should begin. * * @return The key after which listing should begin. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String nextKeyMarker() { return nextKeyMarker; } @@ -193,9 +184,8 @@ public String nextKeyMarker() { * The upload ID after which listing should begin. * * @return The upload ID after which listing should begin. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String nextUploadIdMarker() { return nextUploadIdMarker; } @@ -204,9 +194,8 @@ public String nextUploadIdMarker() { * The maximum number of uploads to return. * * @return The maximum number of uploads. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public int maxUploads() { return maxUploads; } @@ -215,9 +204,8 @@ public int maxUploads() { * The prefix applied to the request. * * @return The prefix applied to the request. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String prefix() { return prefix; } @@ -226,9 +214,8 @@ public String prefix() { * A flag indicating whether or not the returned results are truncated. * * @return A flag indicating whether or not the returned results are truncated. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public boolean truncated() { return isTruncated; } @@ -237,9 +224,8 @@ public boolean truncated() { * If you specify a delimiter in the request, this element is returned. * * @return The common prefixes. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public ImmutableList commonPrefixes() { if (commonPrefixes == null) { return ImmutableList.of(); @@ -309,9 +295,8 @@ public String toString() { * Returns a new builder for this response. * * @return A new builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -324,9 +309,8 @@ static class CommonPrefixHelper { /** * A builder for {@link ListMultipartUploadsResponse}. * - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public static final class Builder { private ImmutableList uploads; private String bucket; @@ -350,7 +334,6 @@ private Builder() {} * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder uploads(ImmutableList uploads) { this.uploads = uploads; return this; @@ -363,7 +346,6 @@ public Builder uploads(ImmutableList uploads) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -376,7 +358,6 @@ public Builder bucket(String bucket) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder delimiter(String delimiter) { this.delimiter = delimiter; return this; @@ -389,7 +370,6 @@ public Builder delimiter(String delimiter) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder encodingType(String encodingType) { this.encodingType = encodingType; return this; @@ -402,7 +382,6 @@ public Builder encodingType(String encodingType) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder keyMarker(String keyMarker) { this.keyMarker = keyMarker; return this; @@ -415,7 +394,6 @@ public Builder keyMarker(String keyMarker) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder uploadIdMarker(String uploadIdMarker) { this.uploadIdMarker = uploadIdMarker; return this; @@ -428,7 +406,6 @@ public Builder uploadIdMarker(String uploadIdMarker) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder nextKeyMarker(String nextKeyMarker) { this.nextKeyMarker = nextKeyMarker; return this; @@ -441,7 +418,6 @@ public Builder nextKeyMarker(String nextKeyMarker) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder nextUploadIdMarker(String nextUploadIdMarker) { this.nextUploadIdMarker = nextUploadIdMarker; return this; @@ -454,7 +430,6 @@ public Builder nextUploadIdMarker(String nextUploadIdMarker) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder maxUploads(int maxUploads) { this.maxUploads = maxUploads; return this; @@ -467,7 +442,6 @@ public Builder maxUploads(int maxUploads) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder prefix(String prefix) { this.prefix = prefix; return this; @@ -480,7 +454,6 @@ public Builder prefix(String prefix) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder truncated(boolean isTruncated) { this.isTruncated = isTruncated; return this; @@ -493,7 +466,6 @@ public Builder truncated(boolean isTruncated) { * @return This builder. * @since 2.61.0 This new api is in preview. */ - @BetaApi public Builder commonPrefixes(ImmutableList commonPrefixes) { this.commonPrefixes = commonPrefixes; return this; @@ -503,9 +475,8 @@ public Builder commonPrefixes(ImmutableList commonPrefixes) { * Builds the response. * * @return The built response. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public ListMultipartUploadsResponse build() { return new ListMultipartUploadsResponse( uploads, diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsRequest.java index 871f1778ac..96aa4a3cd8 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsRequest.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsRequest.java @@ -16,16 +16,14 @@ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; /** * Represents a request to list the parts of a multipart upload. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class ListPartsRequest { private final String bucket; @@ -52,9 +50,8 @@ private ListPartsRequest(Builder builder) { * Returns the bucket name. * * @return the bucket name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -63,9 +60,8 @@ public String bucket() { * Returns the object name. * * @return the object name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -74,9 +70,8 @@ public String key() { * Returns the upload ID. * * @return the upload ID. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -85,9 +80,8 @@ public String uploadId() { * Returns the maximum number of parts to return. * * @return the maximum number of parts to return. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Integer maxParts() { return maxParts; } @@ -96,9 +90,8 @@ public Integer maxParts() { * Returns the part number marker. * * @return the part number marker. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Integer partNumberMarker() { return partNumberMarker; } @@ -109,9 +102,8 @@ public Integer partNumberMarker() { * @return the user-project. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String userProject() { return userProject; } @@ -154,9 +146,8 @@ public String toString() { * Returns a new builder for this class. * * @return a new builder for this class. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -164,9 +155,8 @@ public static Builder builder() { /** * A builder for {@link ListPartsRequest}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private String bucket; private String key; @@ -182,9 +172,8 @@ private Builder() {} * * @param bucket the bucket name. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -195,9 +184,8 @@ public Builder bucket(String bucket) { * * @param key the object name. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -208,9 +196,8 @@ public Builder key(String key) { * * @param uploadId the upload ID. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -221,9 +208,8 @@ public Builder uploadId(String uploadId) { * * @param maxParts the maximum number of parts to return. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder maxParts(Integer maxParts) { this.maxParts = maxParts; return this; @@ -234,9 +220,8 @@ public Builder maxParts(Integer maxParts) { * * @param partNumberMarker the part number marker. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder partNumberMarker(Integer partNumberMarker) { this.partNumberMarker = partNumberMarker; return this; @@ -249,9 +234,8 @@ public Builder partNumberMarker(Integer partNumberMarker) { * @return This builder. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder userProject(String userProject) { this.userProject = userProject; return this; @@ -261,9 +245,8 @@ public Builder userProject(String userProject) { * Builds a new {@link ListPartsRequest} object. * * @return a new {@link ListPartsRequest} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public ListPartsRequest build() { return new ListPartsRequest(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsResponse.java index b9625a4c50..4e66b0471d 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsResponse.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ListPartsResponse.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.google.api.core.BetaApi; import com.google.cloud.storage.StorageClass; import com.google.common.base.MoreObjects; import java.util.List; @@ -28,9 +27,8 @@ /** * Represents a response to a list parts request. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class ListPartsResponse { @JacksonXmlProperty(localName = "Bucket") @@ -80,9 +78,8 @@ private ListPartsResponse(Builder builder) { * Creates a new {@code Builder} for {@code ListPartsResponse} objects. * * @return A new {@code Builder} instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -91,9 +88,8 @@ public static Builder builder() { * Returns the bucket name. * * @return the bucket name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -102,9 +98,8 @@ public String bucket() { * Returns the object name. * * @return the object name. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -113,9 +108,8 @@ public String key() { * Returns the upload ID. * * @return the upload ID. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -124,9 +118,8 @@ public String uploadId() { * Returns the part number marker. * * @return the part number marker. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public int partNumberMarker() { return partNumberMarker; } @@ -135,9 +128,8 @@ public int partNumberMarker() { * Returns the next part number marker. * * @return the next part number marker. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public int nextPartNumberMarker() { return nextPartNumberMarker; } @@ -146,9 +138,8 @@ public int nextPartNumberMarker() { * Returns the maximum number of parts to return. * * @return the maximum number of parts to return. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public int maxParts() { return maxParts; } @@ -157,9 +148,8 @@ public int maxParts() { * Returns true if the response is truncated. * * @return true if the response is truncated. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public boolean truncated() { return isTruncated; } @@ -168,9 +158,8 @@ public boolean truncated() { * Returns the storage class of the object. * * @return the storage class of the object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public StorageClass storageClass() { return storageClass; } @@ -179,9 +168,8 @@ public StorageClass storageClass() { * Returns the list of parts. * * @return the list of parts. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public List parts() { return parts; } @@ -238,9 +226,8 @@ public String toString() { /** * Builder for {@code ListPartsResponse}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static final class Builder { private String bucket; private String key; @@ -259,9 +246,8 @@ private Builder() {} * * @param bucket The bucket name. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -272,9 +258,8 @@ public Builder bucket(String bucket) { * * @param key The object name. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -285,9 +270,8 @@ public Builder key(String key) { * * @param uploadId The upload ID. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -298,9 +282,8 @@ public Builder uploadId(String uploadId) { * * @param partNumberMarker The part number marker. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder partNumberMarker(int partNumberMarker) { this.partNumberMarker = partNumberMarker; return this; @@ -311,9 +294,8 @@ public Builder partNumberMarker(int partNumberMarker) { * * @param nextPartNumberMarker The next part number marker. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder nextPartNumberMarker(int nextPartNumberMarker) { this.nextPartNumberMarker = nextPartNumberMarker; return this; @@ -324,9 +306,8 @@ public Builder nextPartNumberMarker(int nextPartNumberMarker) { * * @param maxParts The maximum number of parts to return. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder maxParts(int maxParts) { this.maxParts = maxParts; return this; @@ -337,9 +318,8 @@ public Builder maxParts(int maxParts) { * * @param isTruncated True if the response is truncated, false otherwise. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder truncated(boolean isTruncated) { this.isTruncated = isTruncated; return this; @@ -350,9 +330,8 @@ public Builder truncated(boolean isTruncated) { * * @param storageClass The storage class of the object. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder storageClass(StorageClass storageClass) { this.storageClass = storageClass; return this; @@ -363,9 +342,8 @@ public Builder storageClass(StorageClass storageClass) { * * @param parts The list of parts. * @return The builder instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder parts(List parts) { this.parts = parts; return this; @@ -375,9 +353,8 @@ public Builder parts(List parts) { * Builds a {@code ListPartsResponse} object. * * @return A new {@code ListPartsResponse} instance. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public ListPartsResponse build() { return new ListPartsResponse(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/MultipartUpload.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/MultipartUpload.java index 26a44fb2f0..0abe9cbdc9 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/MultipartUpload.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/MultipartUpload.java @@ -17,7 +17,6 @@ package com.google.cloud.storage.multipartupload.model; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.google.api.core.BetaApi; import com.google.cloud.storage.StorageClass; import com.google.common.base.MoreObjects; import java.time.OffsetDateTime; @@ -26,9 +25,8 @@ /** * Represents a multipart upload that is in progress. * - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ -@BetaApi public final class MultipartUpload { @JacksonXmlProperty(localName = "Key") @@ -57,9 +55,8 @@ private MultipartUpload( * The object name for which the multipart upload was initiated. * * @return The object name. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String key() { return key; } @@ -68,9 +65,8 @@ public String key() { * The ID of the multipart upload. * * @return The upload ID. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -79,9 +75,8 @@ public String uploadId() { * The storage class of the object. * * @return The storage class. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public StorageClass storageClass() { return storageClass; } @@ -90,9 +85,8 @@ public StorageClass storageClass() { * The date and time at which the multipart upload was initiated. * * @return The initiation date and time. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public OffsetDateTime initiated() { return initiated; } @@ -131,9 +125,8 @@ public String toString() { * Returns a new builder for this multipart upload. * * @return A new builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public static Builder newBuilder() { return new Builder(); } @@ -141,9 +134,8 @@ public static Builder newBuilder() { /** * A builder for {@link MultipartUpload}. * - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public static final class Builder { private String key; private String uploadId; @@ -157,9 +149,8 @@ private Builder() {} * * @param key The object name. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -170,9 +161,8 @@ public Builder key(String key) { * * @param uploadId The upload ID. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -183,9 +173,8 @@ public Builder uploadId(String uploadId) { * * @param storageClass The storage class. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder storageClass(StorageClass storageClass) { this.storageClass = storageClass; return this; @@ -196,9 +185,8 @@ public Builder storageClass(StorageClass storageClass) { * * @param initiated The initiation date and time. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder initiated(OffsetDateTime initiated) { this.initiated = initiated; return this; @@ -208,9 +196,8 @@ public Builder initiated(OffsetDateTime initiated) { * Builds the multipart upload. * * @return The built multipart upload. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public MultipartUpload build() { return new MultipartUpload(key, uploadId, storageClass, initiated); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ObjectLockMode.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ObjectLockMode.java index da70a9130b..54ec1da6af 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ObjectLockMode.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/ObjectLockMode.java @@ -16,7 +16,6 @@ package com.google.cloud.storage.multipartupload.model; import com.google.api.core.ApiFunction; -import com.google.api.core.BetaApi; import com.google.cloud.StringEnumType; import com.google.cloud.StringEnumValue; @@ -25,9 +24,8 @@ * href="https://cloud.google.com/storage/docs/object-lock">https://cloud.google.com/storage/docs/object-lock * for details. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class ObjectLockMode extends StringEnumValue { private static final long serialVersionUID = -1882734434792102329L; @@ -45,26 +43,25 @@ private ObjectLockMode(String constant) { * href="https://cloud.google.com/storage/docs/object-lock">https://cloud.google.com/storage/docs/object-lock * for details. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static final ObjectLockMode GOVERNANCE = type.createAndRegister("GOVERNANCE"); + public static final ObjectLockMode GOVERNANCE = type.createAndRegister("GOVERNANCE"); /** * Compliance mode. See https://cloud.google.com/storage/docs/object-lock * for details. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static final ObjectLockMode COMPLIANCE = type.createAndRegister("COMPLIANCE"); + public static final ObjectLockMode COMPLIANCE = type.createAndRegister("COMPLIANCE"); /** * Get the ObjectLockMode for the given String constant, and throw an exception if the constant is * not recognized. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static ObjectLockMode valueOfStrict(String constant) { return type.valueOfStrict(constant); } @@ -72,9 +69,8 @@ public static ObjectLockMode valueOfStrict(String constant) { /** * Get the ObjectLockMode for the given String constant, and allow unrecognized values. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static ObjectLockMode valueOf(String constant) { return type.valueOf(constant); } @@ -82,9 +78,8 @@ public static ObjectLockMode valueOf(String constant) { /** * Return the known values for ObjectLockMode. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static ObjectLockMode[] values() { return type.values(); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/Part.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/Part.java index 6309316c7d..8daa787448 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/Part.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/Part.java @@ -17,7 +17,6 @@ package com.google.cloud.storage.multipartupload.model; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.time.OffsetDateTime; import java.util.Objects; @@ -25,9 +24,8 @@ /** * Represents a part of a multipart upload. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class Part { @JacksonXmlProperty(localName = "PartNumber") @@ -56,9 +54,8 @@ private Part(Builder builder) { * Returns the part number. * * @return the part number. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public int partNumber() { return partNumber; } @@ -67,9 +64,8 @@ public int partNumber() { * Returns the ETag of the part. * * @return the ETag of the part. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String eTag() { return eTag; } @@ -78,9 +74,8 @@ public String eTag() { * Returns the size of the part. * * @return the size of the part. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public long size() { return size; } @@ -89,9 +84,8 @@ public long size() { * Returns the last modified time of the part. * * @return the last modified time of the part. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public OffsetDateTime lastModified() { return lastModified; } @@ -100,9 +94,8 @@ public OffsetDateTime lastModified() { * Returns a new builder for this class. * * @return a new builder for this class. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -140,9 +133,8 @@ public String toString() { /** * A builder for {@link Part}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static final class Builder { private int partNumber; private String eTag; @@ -156,9 +148,8 @@ private Builder() {} * * @param partNumber the part number. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder partNumber(int partNumber) { this.partNumber = partNumber; return this; @@ -169,9 +160,8 @@ public Builder partNumber(int partNumber) { * * @param eTag the ETag of the part. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder eTag(String eTag) { this.eTag = eTag; return this; @@ -182,9 +172,8 @@ public Builder eTag(String eTag) { * * @param size the size of the part. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder size(long size) { this.size = size; return this; @@ -195,9 +184,8 @@ public Builder size(long size) { * * @param lastModified the last modified time of the part. * @return this builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder lastModified(OffsetDateTime lastModified) { this.lastModified = lastModified; return this; @@ -207,9 +195,8 @@ public Builder lastModified(OffsetDateTime lastModified) { * Builds a new {@link Part} object. * * @return a new {@link Part} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Part build() { return new Part(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartRequest.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartRequest.java index 714afc9013..d063511c6b 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartRequest.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartRequest.java @@ -16,7 +16,6 @@ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; import org.checkerframework.checker.nullness.qual.Nullable; @@ -25,9 +24,8 @@ * An object to represent an upload part request. An upload part request is used to upload a single * part of a multipart upload. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class UploadPartRequest { private final String bucket; @@ -50,9 +48,8 @@ private UploadPartRequest(Builder builder) { * Returns the bucket to upload the part to. * * @return The bucket to upload the part to. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String bucket() { return bucket; } @@ -61,9 +58,8 @@ public String bucket() { * Returns the key of the object to upload the part to. * * @return The key of the object to upload the part to. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String key() { return key; } @@ -72,9 +68,8 @@ public String key() { * Returns the part number of the part to upload. * * @return The part number of the part to upload. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public int partNumber() { return partNumber; } @@ -83,9 +78,8 @@ public int partNumber() { * Returns the upload ID of the multipart upload. * * @return The upload ID of the multipart upload. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String uploadId() { return uploadId; } @@ -94,9 +88,8 @@ public String uploadId() { * Returns the CRC32C checksum of the part to upload. * * @return The CRC32C checksum of the part to upload. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi @Nullable public String crc32c() { return crc32c; @@ -108,9 +101,8 @@ public String crc32c() { * @return the user-project. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String userProject() { return userProject; } @@ -153,9 +145,8 @@ public String toString() { * Returns a new builder for an {@link UploadPartRequest}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -163,9 +154,8 @@ public static Builder builder() { /** * A builder for {@link UploadPartRequest}. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private String bucket; private String key; @@ -181,9 +171,8 @@ private Builder() {} * * @param bucket The bucket to upload the part to. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder bucket(String bucket) { this.bucket = bucket; return this; @@ -194,9 +183,8 @@ public Builder bucket(String bucket) { * * @param key The key of the object to upload the part to. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder key(String key) { this.key = key; return this; @@ -207,9 +195,8 @@ public Builder key(String key) { * * @param partNumber The part number of the part to upload. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder partNumber(int partNumber) { this.partNumber = partNumber; return this; @@ -220,9 +207,8 @@ public Builder partNumber(int partNumber) { * * @param uploadId The upload ID of the multipart upload. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder uploadId(String uploadId) { this.uploadId = uploadId; return this; @@ -233,9 +219,8 @@ public Builder uploadId(String uploadId) { * * @param crc32c The CRC32C checksum of the part to upload. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder crc32c(@Nullable String crc32c) { this.crc32c = crc32c; return this; @@ -248,9 +233,8 @@ public Builder crc32c(@Nullable String crc32c) { * @return This builder. * @see x-goog-user-project - * @since 2.61 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder userProject(String userProject) { this.userProject = userProject; return this; @@ -260,9 +244,8 @@ public Builder userProject(String userProject) { * Builds the {@link UploadPartRequest}. * * @return The built {@link UploadPartRequest}. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public UploadPartRequest build() { return new UploadPartRequest(this); } diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartResponse.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartResponse.java index 93646041f7..97d9e4276f 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartResponse.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/multipartupload/model/UploadPartResponse.java @@ -16,7 +16,6 @@ package com.google.cloud.storage.multipartupload.model; -import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.util.Objects; @@ -24,9 +23,8 @@ * Represents the response from uploading a part in a multipart upload. It contains the ETag and * checksums of the uploaded part. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ -@BetaApi public final class UploadPartResponse { private final String eTag; @@ -43,9 +41,8 @@ private UploadPartResponse(Builder builder) { * Returns the ETag of the uploaded part. * * @return The ETag. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String eTag() { return eTag; } @@ -54,9 +51,8 @@ public String eTag() { * Returns the MD5 hash of the uploaded part. * * @return The MD5 hash. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public String md5() { return md5; } @@ -65,9 +61,8 @@ public String md5() { * Returns the CRC32C checksum of the uploaded part. * * @return The CRC32C checksum. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public String crc32c() { return crc32c; } @@ -104,9 +99,8 @@ public String toString() { * Creates a new builder for creating an {@code UploadPartResponse}. * * @return A new builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static Builder builder() { return new Builder(); } @@ -114,9 +108,8 @@ public static Builder builder() { /** * A builder for creating {@code UploadPartResponse} instances. * - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public static class Builder { private String etag; private String md5; @@ -129,9 +122,8 @@ private Builder() {} * * @param etag The ETag. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder eTag(String etag) { this.etag = etag; return this; @@ -142,9 +134,8 @@ public Builder eTag(String etag) { * * @param md5 The MD5 hash. * @return This builder. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public Builder md5(String md5) { this.md5 = md5; return this; @@ -155,9 +146,8 @@ public Builder md5(String md5) { * * @param crc32c The CRC32C checksum. * @return This builder. - * @since 2.61.0 This new api is in preview and is subject to breaking changes. + * @since 2.61.0 */ - @BetaApi public Builder crc32c(String crc32c) { this.crc32c = crc32c; return this; @@ -167,9 +157,8 @@ public Builder crc32c(String crc32c) { * Builds the {@code UploadPartResponse} object. * * @return The built {@code UploadPartResponse} object. - * @since 2.60.0 This new api is in preview and is subject to breaking changes. + * @since 2.60.0 */ - @BetaApi public UploadPartResponse build() { return new UploadPartResponse(this); }