From 4ce5e884e0a9cc97affd6076846276f9c81ce78b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 04:18:32 +0000 Subject: [PATCH] fix: update gapic-generator-java with mock service generation fixes (#13) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: https://github.com/googleapis/googleapis/commit/917e7f21cb1dc062744c6694437cdd46219f28cb Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9 --- .../main/java/com/google/cloud/batch/v1/BatchServiceClient.java | 2 ++ .../java/com/google/cloud/batch/v1/BatchServiceClientTest.java | 2 -- .../java/com/google/{iam => cloud/batch}/v1/MockIAMPolicy.java | 2 +- .../com/google/{iam => cloud/batch}/v1/MockIAMPolicyImpl.java | 2 +- .../com/google/cloud/{location => batch/v1}/MockLocations.java | 2 +- .../google/cloud/{location => batch/v1}/MockLocationsImpl.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename google-cloud-batch/src/test/java/com/google/{iam => cloud/batch}/v1/MockIAMPolicy.java (97%) rename google-cloud-batch/src/test/java/com/google/{iam => cloud/batch}/v1/MockIAMPolicyImpl.java (97%) rename google-cloud-batch/src/test/java/com/google/cloud/{location => batch/v1}/MockLocations.java (97%) rename google-cloud-batch/src/test/java/com/google/cloud/{location => batch/v1}/MockLocationsImpl.java (97%) diff --git a/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java b/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java index 13fe161..b0232ea 100644 --- a/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java +++ b/google-cloud-batch/src/main/java/com/google/cloud/batch/v1/BatchServiceClient.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient; import com.google.api.gax.longrunning.OperationFuture; @@ -189,6 +190,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() { * Returns the OperationsClient that can be used to query the status of a long-running operation * returned by another API method call. */ + @BetaApi public final OperationsClient getHttpJsonOperationsClient() { return httpJsonOperationsClient; } diff --git a/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java index 2f12156..931d122 100644 --- a/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java +++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/BatchServiceClientTest.java @@ -27,9 +27,7 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; -import com.google.cloud.location.MockLocations; import com.google.common.collect.Lists; -import com.google.iam.v1.MockIAMPolicy; import com.google.longrunning.Operation; import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; diff --git a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicy.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicy.java similarity index 97% rename from google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicy.java rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicy.java index 3d78598..db84032 100644 --- a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicy.java +++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.iam.v1; +package com.google.cloud.batch.v1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; diff --git a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicyImpl.java similarity index 97% rename from google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicyImpl.java index 070cdbc..530cf4e 100644 --- a/google-cloud-batch/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java +++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockIAMPolicyImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.iam.v1; +package com.google.cloud.batch.v1; import com.google.api.core.BetaApi; import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase; diff --git a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocations.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocations.java similarity index 97% rename from google-cloud-batch/src/test/java/com/google/cloud/location/MockLocations.java rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocations.java index 8ce43ed..75984c9 100644 --- a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocations.java +++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.location; +package com.google.cloud.batch.v1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; diff --git a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocationsImpl.java b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocationsImpl.java similarity index 97% rename from google-cloud-batch/src/test/java/com/google/cloud/location/MockLocationsImpl.java rename to google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocationsImpl.java index 344350e..859767b 100644 --- a/google-cloud-batch/src/test/java/com/google/cloud/location/MockLocationsImpl.java +++ b/google-cloud-batch/src/test/java/com/google/cloud/batch/v1/MockLocationsImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.location; +package com.google.cloud.batch.v1; import com.google.api.core.BetaApi; import com.google.cloud.location.LocationsGrpc.LocationsImplBase;