From 8cb34cec429b48ed95e0a73a89ba978d2995a778 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:19 +0000
Subject: [PATCH] fix: update gapic-generator-java with mock service generation
 fixes (#809)

- [ ] 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
---
 .../java/com/google/cloud/kms/v1/EkmServiceClientTest.java | 1 -
 .../cloud/kms/v1/KeyManagementServiceClientTest.java       | 1 -
 .../com/google/{iam => cloud/kms}/v1/MockIAMPolicy.java    | 2 +-
 .../google/{iam => cloud/kms}/v1/MockIAMPolicyImpl.java    | 7 ++++++-
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename google-cloud-kms/src/test/java/com/google/{iam => cloud/kms}/v1/MockIAMPolicy.java (97%)
 rename google-cloud-kms/src/test/java/com/google/{iam => cloud/kms}/v1/MockIAMPolicyImpl.java (94%)

diff --git a/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/EkmServiceClientTest.java b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/EkmServiceClientTest.java
index 7fe2ae68..715cfb3d 100644
--- a/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/EkmServiceClientTest.java
+++ b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/EkmServiceClientTest.java
@@ -30,7 +30,6 @@
 import com.google.iam.v1.Binding;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.GetPolicyOptions;
-import com.google.iam.v1.MockIAMPolicy;
 import com.google.iam.v1.Policy;
 import com.google.iam.v1.SetIamPolicyRequest;
 import com.google.iam.v1.TestIamPermissionsRequest;
diff --git a/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java
index abea220c..7c81ebd8 100644
--- a/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java
+++ b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java
@@ -34,7 +34,6 @@
 import com.google.iam.v1.Binding;
 import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.GetPolicyOptions;
-import com.google.iam.v1.MockIAMPolicy;
 import com.google.iam.v1.Policy;
 import com.google.iam.v1.SetIamPolicyRequest;
 import com.google.iam.v1.TestIamPermissionsRequest;
diff --git a/google-cloud-kms/src/test/java/com/google/iam/v1/MockIAMPolicy.java b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java
similarity index 97%
rename from google-cloud-kms/src/test/java/com/google/iam/v1/MockIAMPolicy.java
rename to google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java
index 3d785982..829e78d2 100644
--- a/google-cloud-kms/src/test/java/com/google/iam/v1/MockIAMPolicy.java
+++ b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.iam.v1;
+package com.google.cloud.kms.v1;
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.grpc.testing.MockGrpcService;
diff --git a/google-cloud-kms/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java
similarity index 94%
rename from google-cloud-kms/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java
rename to google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java
index 4c1f9e24..1decba21 100644
--- a/google-cloud-kms/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java
+++ b/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java
@@ -14,10 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.iam.v1;
+package com.google.cloud.kms.v1;
 
 import com.google.api.core.BetaApi;
+import com.google.iam.v1.GetIamPolicyRequest;
 import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase;
+import com.google.iam.v1.Policy;
+import com.google.iam.v1.SetIamPolicyRequest;
+import com.google.iam.v1.TestIamPermissionsRequest;
+import com.google.iam.v1.TestIamPermissionsResponse;
 import com.google.protobuf.AbstractMessage;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;