From 33794246597006f20636ea3e90fd9fae4597844a Mon Sep 17 00:00:00 2001 From: Alice Li Date: Wed, 31 Jan 2024 09:30:36 -0500 Subject: [PATCH 1/2] (do not merge): testing branch for request id autopopulation --- .../v2/stub/GrpcStorageControlStub.java | 85 ++++++++++++++----- pom.xml | 16 +++- 2 files changed, 79 insertions(+), 22 deletions(-) diff --git a/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java b/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java index bd0c7b3202..1b89ab4fc8 100644 --- a/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java +++ b/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java @@ -27,6 +27,7 @@ import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; import com.google.api.pathtemplate.PathTemplate; +import com.google.common.base.Strings; import com.google.longrunning.Operation; import com.google.longrunning.stub.GrpcOperationsStub; import com.google.protobuf.Empty; @@ -43,6 +44,8 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -80,32 +83,32 @@ public class GrpcStorageControlStub extends StorageControlStub { private static final MethodDescriptor listFoldersMethodDescriptor = - MethodDescriptor.newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName("google.storage.control.v2.StorageControl/ListFolders") - .setRequestMarshaller(ProtoUtils.marshaller(ListFoldersRequest.getDefaultInstance())) - .setResponseMarshaller( - ProtoUtils.marshaller(ListFoldersResponse.getDefaultInstance())) - .build(); + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.storage.control.v2.StorageControl/ListFolders") + .setRequestMarshaller(ProtoUtils.marshaller(ListFoldersRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(ListFoldersResponse.getDefaultInstance())) + .build(); private static final MethodDescriptor renameFolderMethodDescriptor = - MethodDescriptor.newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName("google.storage.control.v2.StorageControl/RenameFolder") - .setRequestMarshaller(ProtoUtils.marshaller(RenameFolderRequest.getDefaultInstance())) - .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) - .build(); + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.storage.control.v2.StorageControl/RenameFolder") + .setRequestMarshaller(ProtoUtils.marshaller(RenameFolderRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .build(); private static final MethodDescriptor getStorageLayoutMethodDescriptor = - MethodDescriptor.newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName("google.storage.control.v2.StorageControl/GetStorageLayout") - .setRequestMarshaller( - ProtoUtils.marshaller(GetStorageLayoutRequest.getDefaultInstance())) - .setResponseMarshaller(ProtoUtils.marshaller(StorageLayout.getDefaultInstance())) - .build(); + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.storage.control.v2.StorageControl/GetStorageLayout") + .setRequestMarshaller( + ProtoUtils.marshaller(GetStorageLayoutRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(StorageLayout.getDefaultInstance())) + .build(); private final UnaryCallable createFolderCallable; private final UnaryCallable deleteFolderCallable; @@ -184,6 +187,14 @@ protected GrpcStorageControlStub( builder.add(request.getParent(), "bucket", CREATE_FOLDER_0_PATH_TEMPLATE); return builder.build(); }) + .setRequestMutator( + request -> { + CreateFolderRequest.Builder requestBuilder = request.toBuilder(); + if (Strings.isNullOrEmpty(request.getRequestId())) { + requestBuilder.setRequestId(UUID.randomUUID().toString()); + } + return requestBuilder.build(); + }) .build(); GrpcCallSettings deleteFolderTransportSettings = GrpcCallSettings.newBuilder() @@ -194,6 +205,14 @@ protected GrpcStorageControlStub( builder.add(request.getName(), "bucket", DELETE_FOLDER_0_PATH_TEMPLATE); return builder.build(); }) + .setRequestMutator( + request -> { + DeleteFolderRequest.Builder requestBuilder = request.toBuilder(); + if (Strings.isNullOrEmpty(request.getRequestId())) { + requestBuilder.setRequestId(UUID.randomUUID().toString()); + } + return requestBuilder.build(); + }) .build(); GrpcCallSettings getFolderTransportSettings = GrpcCallSettings.newBuilder() @@ -204,6 +223,14 @@ protected GrpcStorageControlStub( builder.add(request.getName(), "bucket", GET_FOLDER_0_PATH_TEMPLATE); return builder.build(); }) + .setRequestMutator( + request -> { + GetFolderRequest.Builder requestBuilder = request.toBuilder(); + if (Strings.isNullOrEmpty(request.getRequestId())) { + requestBuilder.setRequestId(UUID.randomUUID().toString()); + } + return requestBuilder.build(); + }) .build(); GrpcCallSettings listFoldersTransportSettings = GrpcCallSettings.newBuilder() @@ -224,6 +251,14 @@ protected GrpcStorageControlStub( builder.add(request.getName(), "bucket", RENAME_FOLDER_0_PATH_TEMPLATE); return builder.build(); }) + .setRequestMutator( + request -> { + RenameFolderRequest.Builder requestBuilder = request.toBuilder(); + if (Strings.isNullOrEmpty(request.getRequestId())) { + requestBuilder.setRequestId(UUID.randomUUID().toString()); + } + return requestBuilder.build(); + }) .build(); GrpcCallSettings getStorageLayoutTransportSettings = GrpcCallSettings.newBuilder() @@ -234,6 +269,14 @@ protected GrpcStorageControlStub( builder.add(request.getName(), "bucket", GET_STORAGE_LAYOUT_0_PATH_TEMPLATE); return builder.build(); }) + .setRequestMutator( + request -> { + GetStorageLayoutRequest.Builder requestBuilder = request.toBuilder(); + if (Strings.isNullOrEmpty(request.getRequestId())) { + requestBuilder.setRequestId(UUID.randomUUID().toString()); + } + return requestBuilder.build(); + }) .build(); this.createFolderCallable = @@ -304,7 +347,7 @@ public UnaryCallable renameFolderCallable() { @Override public OperationCallable - renameFolderOperationCallable() { + renameFolderOperationCallable() { return renameFolderOperationCallable; } diff --git a/pom.xml b/pom.xml index 000d885c06..9ee7b35e30 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,21 @@ - + + com.google.api + gax + 2.41.1-SNAPSHOT + + + com.google.api + gax-grpc + 2.41.1-SNAPSHOT + + + com.google.api + gax-httpjson + 2.41.1-SNAPSHOT + com.google.cloud google-cloud-storage From 779be8f3e6833491ba0cec8719586db6417109f8 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 31 Jan 2024 14:35:51 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.md | 8 ++-- .../v2/stub/GrpcStorageControlStub.java | 43 +++++++++---------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 8b1749f8e8..ad4d6d61c0 100644 --- a/README.md +++ b/README.md @@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.30.0') +implementation platform('com.google.cloud:libraries-bom:26.31.0') implementation 'com.google.cloud:google-cloud-storage' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-storage:2.32.0' +implementation 'com.google.cloud:google-cloud-storage:2.32.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.32.0" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.32.1" ``` @@ -428,7 +428,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-storage/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-storage.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-storage/2.32.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-storage/2.32.1 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java b/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java index 1b89ab4fc8..6e630f3bf4 100644 --- a/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java +++ b/google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java @@ -44,7 +44,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -83,32 +82,32 @@ public class GrpcStorageControlStub extends StorageControlStub { private static final MethodDescriptor listFoldersMethodDescriptor = - MethodDescriptor.newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName("google.storage.control.v2.StorageControl/ListFolders") - .setRequestMarshaller(ProtoUtils.marshaller(ListFoldersRequest.getDefaultInstance())) - .setResponseMarshaller( - ProtoUtils.marshaller(ListFoldersResponse.getDefaultInstance())) - .build(); + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.storage.control.v2.StorageControl/ListFolders") + .setRequestMarshaller(ProtoUtils.marshaller(ListFoldersRequest.getDefaultInstance())) + .setResponseMarshaller( + ProtoUtils.marshaller(ListFoldersResponse.getDefaultInstance())) + .build(); private static final MethodDescriptor renameFolderMethodDescriptor = - MethodDescriptor.newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName("google.storage.control.v2.StorageControl/RenameFolder") - .setRequestMarshaller(ProtoUtils.marshaller(RenameFolderRequest.getDefaultInstance())) - .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) - .build(); + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.storage.control.v2.StorageControl/RenameFolder") + .setRequestMarshaller(ProtoUtils.marshaller(RenameFolderRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance())) + .build(); private static final MethodDescriptor getStorageLayoutMethodDescriptor = - MethodDescriptor.newBuilder() - .setType(MethodDescriptor.MethodType.UNARY) - .setFullMethodName("google.storage.control.v2.StorageControl/GetStorageLayout") - .setRequestMarshaller( - ProtoUtils.marshaller(GetStorageLayoutRequest.getDefaultInstance())) - .setResponseMarshaller(ProtoUtils.marshaller(StorageLayout.getDefaultInstance())) - .build(); + MethodDescriptor.newBuilder() + .setType(MethodDescriptor.MethodType.UNARY) + .setFullMethodName("google.storage.control.v2.StorageControl/GetStorageLayout") + .setRequestMarshaller( + ProtoUtils.marshaller(GetStorageLayoutRequest.getDefaultInstance())) + .setResponseMarshaller(ProtoUtils.marshaller(StorageLayout.getDefaultInstance())) + .build(); private final UnaryCallable createFolderCallable; private final UnaryCallable deleteFolderCallable; @@ -347,7 +346,7 @@ public UnaryCallable renameFolderCallable() { @Override public OperationCallable - renameFolderOperationCallable() { + renameFolderOperationCallable() { return renameFolderOperationCallable; }