diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index 3902db5521a4..e4cac66dc802 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -108,13 +108,13 @@ io.grpc grpc-stub - 1.18.0 + 1.19.0 compile io.grpc grpc-protobuf - 1.18.0 + 1.19.0 compile diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index ac469fa8e7d6..15ba2fe45909 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -168,7 +168,7 @@ com.google.api gax-bom - 1.42.0 + 1.43.0 pom import diff --git a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetService.java b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetService.java index 168e2653a5ef..bdebd9d782b8 100644 --- a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetService.java +++ b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockAssetService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetServiceImpl.java b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetServiceImpl.java index 1e7886048c79..dfc5a34afeec 100644 --- a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetServiceImpl.java +++ b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.asset.v1.AssetServiceGrpc.AssetServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockAssetServiceImpl extends AssetServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockAssetServiceImpl() { @@ -36,15 +36,15 @@ public MockAssetServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetService.java b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetService.java index 58a4e1a37c4b..b8679515ebdd 100644 --- a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetService.java +++ b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockAssetService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetServiceImpl.java b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetServiceImpl.java index 5d16139a86b7..9ee35ed3772e 100644 --- a/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetServiceImpl.java +++ b/google-cloud-clients/google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/MockAssetServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.asset.v1beta1.AssetServiceGrpc.AssetServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockAssetServiceImpl extends AssetServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockAssetServiceImpl() { @@ -36,15 +36,15 @@ public MockAssetServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/AutoMlClientTest.java b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/AutoMlClientTest.java index 027d500dc8a7..7108005b06ed 100644 --- a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/AutoMlClientTest.java +++ b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/AutoMlClientTest.java @@ -29,9 +29,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -105,7 +105,7 @@ public void createDatasetTest() { Dataset actualResponse = client.createDataset(parent, dataset); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateDatasetRequest actualRequest = (CreateDatasetRequest) actualRequests.get(0); @@ -153,7 +153,7 @@ public void getDatasetTest() { Dataset actualResponse = client.getDataset(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDatasetRequest actualRequest = (GetDatasetRequest) actualRequests.get(0); @@ -201,7 +201,7 @@ public void listDatasetsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getDatasetsList().get(0), resources.get(0)); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDatasetsRequest actualRequest = (ListDatasetsRequest) actualRequests.get(0); @@ -245,7 +245,7 @@ public void deleteDatasetTest() throws Exception { Empty actualResponse = client.deleteDatasetAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteDatasetRequest actualRequest = (DeleteDatasetRequest) actualRequests.get(0); @@ -292,7 +292,7 @@ public void importDataTest() throws Exception { Empty actualResponse = client.importDataAsync(name, inputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportDataRequest actualRequest = (ImportDataRequest) actualRequests.get(0); @@ -341,7 +341,7 @@ public void exportDataTest() throws Exception { Empty actualResponse = client.exportDataAsync(name, outputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); ExportDataRequest actualRequest = (ExportDataRequest) actualRequests.get(0); @@ -398,7 +398,7 @@ public void createModelTest() throws Exception { Model actualResponse = client.createModelAsync(parent, model).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateModelRequest actualRequest = (CreateModelRequest) actualRequests.get(0); @@ -448,7 +448,7 @@ public void getModelTest() { Model actualResponse = client.getModel(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetModelRequest actualRequest = (GetModelRequest) actualRequests.get(0); @@ -493,7 +493,7 @@ public void listModelsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getModelList().get(0), resources.get(0)); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListModelsRequest actualRequest = (ListModelsRequest) actualRequests.get(0); @@ -537,7 +537,7 @@ public void deleteModelTest() throws Exception { Empty actualResponse = client.deleteModelAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteModelRequest actualRequest = (DeleteModelRequest) actualRequests.get(0); @@ -579,7 +579,7 @@ public void deployModelTest() { Operation actualResponse = client.deployModel(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeployModelRequest actualRequest = (DeployModelRequest) actualRequests.get(0); @@ -619,7 +619,7 @@ public void undeployModelTest() { Operation actualResponse = client.undeployModel(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); UndeployModelRequest actualRequest = (UndeployModelRequest) actualRequests.get(0); @@ -666,7 +666,7 @@ public void getModelEvaluationTest() { ModelEvaluation actualResponse = client.getModelEvaluation(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetModelEvaluationRequest actualRequest = (GetModelEvaluationRequest) actualRequests.get(0); @@ -715,7 +715,7 @@ public void listModelEvaluationsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getModelEvaluationList().get(0), resources.get(0)); - List actualRequests = mockAutoMl.getRequests(); + List actualRequests = mockAutoMl.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListModelEvaluationsRequest actualRequest = (ListModelEvaluationsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMl.java b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMl.java index 054a5903ec18..437b73f32461 100644 --- a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMl.java +++ b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockAutoMl() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMlImpl.java b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMlImpl.java index 599561502780..29d7f4f90e81 100644 --- a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMlImpl.java +++ b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockAutoMlImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.automl.v1beta1.AutoMlGrpc.AutoMlImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockAutoMlImpl extends AutoMlImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockAutoMlImpl() { @@ -36,15 +36,15 @@ public MockAutoMlImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionService.java b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionService.java index cd080009f545..2212a6984789 100644 --- a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionService.java +++ b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockPredictionService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionServiceImpl.java b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionServiceImpl.java index 9110ce63d3ae..15cac5d61843 100644 --- a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionServiceImpl.java +++ b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/MockPredictionServiceImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.automl.v1beta1.PredictionServiceGrpc.PredictionServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockPredictionServiceImpl extends PredictionServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockPredictionServiceImpl() { @@ -35,15 +35,15 @@ public MockPredictionServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/PredictionServiceClientTest.java b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/PredictionServiceClientTest.java index 95779ad96767..dcbdf844f180 100644 --- a/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/PredictionServiceClientTest.java +++ b/google-cloud-clients/google-cloud-automl/src/test/java/com/google/cloud/automl/v1beta1/PredictionServiceClientTest.java @@ -22,7 +22,7 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -90,7 +90,7 @@ public void predictTest() { PredictResponse actualResponse = client.predict(name, payload, params); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockPredictionService.getRequests(); + List actualRequests = mockPredictionService.getRequests(); Assert.assertEquals(1, actualRequests.size()); PredictRequest actualRequest = (PredictRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java index 257218c3e79e..232081cf3217 100644 --- a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java +++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceClientTest.java @@ -28,9 +28,9 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Timestamp; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -119,7 +119,7 @@ public void getDataSourceTest() { DataSource actualResponse = client.getDataSource(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDataSourceRequest actualRequest = (GetDataSourceRequest) actualRequests.get(0); @@ -167,7 +167,7 @@ public void listDataSourcesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getDataSourcesList().get(0), resources.get(0)); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDataSourcesRequest actualRequest = (ListDataSourcesRequest) actualRequests.get(0); @@ -226,7 +226,7 @@ public void createTransferConfigTest() { TransferConfig actualResponse = client.createTransferConfig(parent, transferConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTransferConfigRequest actualRequest = (CreateTransferConfigRequest) actualRequests.get(0); @@ -287,7 +287,7 @@ public void updateTransferConfigTest() { TransferConfig actualResponse = client.updateTransferConfig(transferConfig, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateTransferConfigRequest actualRequest = (UpdateTransferConfigRequest) actualRequests.get(0); @@ -326,7 +326,7 @@ public void deleteTransferConfigTest() { client.deleteTransferConfig(name); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTransferConfigRequest actualRequest = (DeleteTransferConfigRequest) actualRequests.get(0); @@ -384,7 +384,7 @@ public void getTransferConfigTest() { TransferConfig actualResponse = client.getTransferConfig(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTransferConfigRequest actualRequest = (GetTransferConfigRequest) actualRequests.get(0); @@ -432,7 +432,7 @@ public void listTransferConfigsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTransferConfigsList().get(0), resources.get(0)); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTransferConfigsRequest actualRequest = (ListTransferConfigsRequest) actualRequests.get(0); @@ -474,7 +474,7 @@ public void scheduleTransferRunsTest() { client.scheduleTransferRuns(parent, startTime, endTime); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ScheduleTransferRunsRequest actualRequest = (ScheduleTransferRunsRequest) actualRequests.get(0); @@ -528,7 +528,7 @@ public void getTransferRunTest() { TransferRun actualResponse = client.getTransferRun(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTransferRunRequest actualRequest = (GetTransferRunRequest) actualRequests.get(0); @@ -565,7 +565,7 @@ public void deleteTransferRunTest() { client.deleteTransferRun(name); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTransferRunRequest actualRequest = (DeleteTransferRunRequest) actualRequests.get(0); @@ -613,7 +613,7 @@ public void listTransferRunsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTransferRunsList().get(0), resources.get(0)); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTransferRunsRequest actualRequest = (ListTransferRunsRequest) actualRequests.get(0); @@ -661,7 +661,7 @@ public void listTransferLogsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTransferMessagesList().get(0), resources.get(0)); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTransferLogsRequest actualRequest = (ListTransferLogsRequest) actualRequests.get(0); @@ -701,7 +701,7 @@ public void checkValidCredsTest() { CheckValidCredsResponse actualResponse = client.checkValidCreds(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDataTransferService.getRequests(); + List actualRequests = mockDataTransferService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CheckValidCredsRequest actualRequest = (CheckValidCredsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java index 8f411af79425..f36aabbe0a24 100644 --- a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java +++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockDataTransferService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java index be5e7f172b15..e35e7e6728f4 100644 --- a/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java +++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/src/test/java/com/google/cloud/bigquery/datatransfer/v1/MockDataTransferServiceImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceGrpc.DataTransferServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockDataTransferServiceImpl extends DataTransferServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockDataTransferServiceImpl() { @@ -36,15 +36,15 @@ public MockDataTransferServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java index 84b11657531c..a3f42fee7ddb 100644 --- a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java +++ b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BaseBigQueryStorageClientTest.java @@ -37,8 +37,8 @@ import com.google.cloud.bigquery.storage.v1beta1.Storage.Stream; import com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition; import com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -103,7 +103,7 @@ public void createReadSessionTest() { ReadSession actualResponse = client.createReadSession(tableReference, parent, requestedStreams); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateReadSessionRequest actualRequest = (CreateReadSessionRequest) actualRequests.get(0); @@ -189,7 +189,7 @@ public void batchCreateReadSessionStreamsTest() { client.batchCreateReadSessionStreams(session, requestedStreams); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateReadSessionStreamsRequest actualRequest = (BatchCreateReadSessionStreamsRequest) actualRequests.get(0); @@ -229,7 +229,7 @@ public void finalizeStreamTest() { client.finalizeStream(stream); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); FinalizeStreamRequest actualRequest = (FinalizeStreamRequest) actualRequests.get(0); @@ -267,7 +267,7 @@ public void splitReadStreamTest() { SplitReadStreamResponse actualResponse = client.splitReadStream(originalStream); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); SplitReadStreamRequest actualRequest = (SplitReadStreamRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BigQueryStorageClientTest.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BigQueryStorageClientTest.java index a50a4c9e8fb2..17d2a646ab39 100644 --- a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BigQueryStorageClientTest.java +++ b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BigQueryStorageClientTest.java @@ -37,8 +37,8 @@ import com.google.cloud.bigquery.storage.v1beta1.Storage.Stream; import com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition; import com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -102,7 +102,7 @@ public void createReadSessionTest() { ReadSession actualResponse = client.createReadSession(tableReference, parent, requestedStreams); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateReadSessionRequest actualRequest = (CreateReadSessionRequest) actualRequests.get(0); @@ -188,7 +188,7 @@ public void batchCreateReadSessionStreamsTest() { client.batchCreateReadSessionStreams(session, requestedStreams); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateReadSessionStreamsRequest actualRequest = (BatchCreateReadSessionStreamsRequest) actualRequests.get(0); @@ -228,7 +228,7 @@ public void finalizeStreamTest() { client.finalizeStream(stream); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); FinalizeStreamRequest actualRequest = (FinalizeStreamRequest) actualRequests.get(0); @@ -266,7 +266,7 @@ public void splitReadStreamTest() { SplitReadStreamResponse actualResponse = client.splitReadStream(originalStream); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigQueryStorage.getRequests(); + List actualRequests = mockBigQueryStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); SplitReadStreamRequest actualRequest = (SplitReadStreamRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorage.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorage.java index 33652826d3ff..8048178a4a0c 100644 --- a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorage.java +++ b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorage.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockBigQueryStorage() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorageImpl.java b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorageImpl.java index 3b912800334e..0cb8ae917769 100644 --- a/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorageImpl.java +++ b/google-cloud-clients/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/MockBigQueryStorageImpl.java @@ -26,8 +26,8 @@ import com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession; import com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamRequest; import com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -37,7 +37,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockBigQueryStorageImpl extends BigQueryStorageImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockBigQueryStorageImpl() { @@ -45,15 +45,15 @@ public MockBigQueryStorageImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java index 3e0fad89198c..3f3a76d73eee 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java @@ -57,11 +57,11 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -143,7 +143,7 @@ public void createInstanceTest() throws Exception { client.createInstanceAsync(parent, instanceId, instance, clusters).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateInstanceRequest actualRequest = (CreateInstanceRequest) actualRequests.get(0); @@ -192,7 +192,7 @@ public void getInstanceTest() { Instance actualResponse = client.getInstance(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceRequest actualRequest = (GetInstanceRequest) actualRequests.get(0); @@ -232,7 +232,7 @@ public void listInstancesTest() { ListInstancesResponse actualResponse = client.listInstances(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListInstancesRequest actualRequest = (ListInstancesRequest) actualRequests.get(0); @@ -280,7 +280,7 @@ public void partialUpdateInstanceTest() throws Exception { Instance actualResponse = client.partialUpdateInstanceAsync(instance, updateMask).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); PartialUpdateInstanceRequest actualRequest = (PartialUpdateInstanceRequest) actualRequests.get(0); @@ -322,7 +322,7 @@ public void deleteInstanceTest() { client.deleteInstance(name); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteInstanceRequest actualRequest = (DeleteInstanceRequest) actualRequests.get(0); @@ -376,7 +376,7 @@ public void createClusterTest() throws Exception { Cluster actualResponse = client.createClusterAsync(parent, clusterId, cluster).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateClusterRequest actualRequest = (CreateClusterRequest) actualRequests.get(0); @@ -428,7 +428,7 @@ public void getClusterTest() { Cluster actualResponse = client.getCluster(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetClusterRequest actualRequest = (GetClusterRequest) actualRequests.get(0); @@ -468,7 +468,7 @@ public void listClustersTest() { ListClustersResponse actualResponse = client.listClusters(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListClustersRequest actualRequest = (ListClustersRequest) actualRequests.get(0); @@ -505,7 +505,7 @@ public void deleteClusterTest() { client.deleteCluster(name); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0); @@ -549,7 +549,7 @@ public void createAppProfileTest() { AppProfile actualResponse = client.createAppProfile(parent, appProfileId, appProfile); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateAppProfileRequest actualRequest = (CreateAppProfileRequest) actualRequests.get(0); @@ -595,7 +595,7 @@ public void getAppProfileTest() { AppProfile actualResponse = client.getAppProfile(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetAppProfileRequest actualRequest = (GetAppProfileRequest) actualRequests.get(0); @@ -643,7 +643,7 @@ public void listAppProfilesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getAppProfilesList().get(0), resources.get(0)); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListAppProfilesRequest actualRequest = (ListAppProfilesRequest) actualRequests.get(0); @@ -692,7 +692,7 @@ public void updateAppProfileTest() throws Exception { AppProfile actualResponse = client.updateAppProfileAsync(appProfile, updateMask).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateAppProfileRequest actualRequest = (UpdateAppProfileRequest) actualRequests.get(0); @@ -733,7 +733,7 @@ public void deleteAppProfileTest() { client.deleteAppProfile(name); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteAppProfileRequest actualRequest = (DeleteAppProfileRequest) actualRequests.get(0); @@ -773,7 +773,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(formattedResource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -814,7 +814,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(formattedResource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -856,7 +856,7 @@ public void testIamPermissionsTest() { client.testIamPermissions(formattedResource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableInstanceAdmin.getRequests(); + List actualRequests = mockBigtableInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java index c06b5be5e736..f521afa80a63 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java @@ -50,9 +50,9 @@ import com.google.bigtable.admin.v2.TableName; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -122,7 +122,7 @@ public void createTableTest() { Table actualResponse = client.createTable(parent, tableId, table); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTableRequest actualRequest = (CreateTableRequest) actualRequests.get(0); @@ -175,7 +175,7 @@ public void createTableFromSnapshotTest() throws Exception { client.createTableFromSnapshotAsync(parent, tableId, sourceSnapshot).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTableFromSnapshotRequest actualRequest = (CreateTableFromSnapshotRequest) actualRequests.get(0); @@ -231,7 +231,7 @@ public void listTablesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTablesList().get(0), resources.get(0)); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTablesRequest actualRequest = (ListTablesRequest) actualRequests.get(0); @@ -270,7 +270,7 @@ public void getTableTest() { Table actualResponse = client.getTable(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTableRequest actualRequest = (GetTableRequest) actualRequests.get(0); @@ -307,7 +307,7 @@ public void deleteTableTest() { client.deleteTable(name); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTableRequest actualRequest = (DeleteTableRequest) actualRequests.get(0); @@ -347,7 +347,7 @@ public void modifyColumnFamiliesTest() { Table actualResponse = client.modifyColumnFamilies(name, modifications); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyColumnFamiliesRequest actualRequest = (ModifyColumnFamiliesRequest) actualRequests.get(0); @@ -389,7 +389,7 @@ public void generateConsistencyTokenTest() { GenerateConsistencyTokenResponse actualResponse = client.generateConsistencyToken(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GenerateConsistencyTokenRequest actualRequest = (GenerateConsistencyTokenRequest) actualRequests.get(0); @@ -431,7 +431,7 @@ public void checkConsistencyTest() { CheckConsistencyResponse actualResponse = client.checkConsistency(name, consistencyToken); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CheckConsistencyRequest actualRequest = (CheckConsistencyRequest) actualRequests.get(0); @@ -489,7 +489,7 @@ public void snapshotTableTest() throws Exception { client.snapshotTableAsync(name, cluster, snapshotId, description).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); SnapshotTableRequest actualRequest = (SnapshotTableRequest) actualRequests.get(0); @@ -544,7 +544,7 @@ public void getSnapshotTest() { Snapshot actualResponse = client.getSnapshot(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = (GetSnapshotRequest) actualRequests.get(0); @@ -592,7 +592,7 @@ public void listSnapshotsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSnapshotsRequest actualRequest = (ListSnapshotsRequest) actualRequests.get(0); @@ -629,7 +629,7 @@ public void deleteSnapshotTest() { client.deleteSnapshot(name); - List actualRequests = mockBigtableTableAdmin.getRequests(); + List actualRequests = mockBigtableTableAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = (DeleteSnapshotRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java index c0deb0911485..66f3c7f34be2 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdmin.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockBigtableInstanceAdmin() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java index ea150b73fc54..e13d054d80ea 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableInstanceAdminImpl.java @@ -43,8 +43,8 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -54,7 +54,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockBigtableInstanceAdminImpl extends BigtableInstanceAdminImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockBigtableInstanceAdminImpl() { @@ -62,15 +62,15 @@ public MockBigtableInstanceAdminImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java index b5463e256798..28c79e21a7c1 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdmin.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockBigtableTableAdmin() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java index ab3442d67bfc..f2a2f1c39359 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/MockBigtableTableAdminImpl.java @@ -37,8 +37,8 @@ import com.google.bigtable.admin.v2.SnapshotTableRequest; import com.google.bigtable.admin.v2.Table; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -48,7 +48,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockBigtableTableAdminImpl extends BigtableTableAdminImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockBigtableTableAdminImpl() { @@ -56,15 +56,15 @@ public MockBigtableTableAdminImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java index 278720a9aaa8..b42279ebc2ff 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java @@ -41,8 +41,8 @@ import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; import com.google.bigtable.v2.TableName; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -200,7 +200,7 @@ public void mutateRowTest() { MutateRowResponse actualResponse = client.mutateRow(tableName, rowKey, mutations); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); MutateRowRequest actualRequest = (MutateRowRequest) actualRequests.get(0); @@ -302,7 +302,7 @@ public void checkAndMutateRowTest() { client.checkAndMutateRow(tableName, rowKey, predicateFilter, trueMutations, falseMutations); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); CheckAndMutateRowRequest actualRequest = (CheckAndMutateRowRequest) actualRequests.get(0); @@ -350,7 +350,7 @@ public void readModifyWriteRowTest() { ReadModifyWriteRowResponse actualResponse = client.readModifyWriteRow(tableName, rowKey, rules); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); ReadModifyWriteRowRequest actualRequest = (ReadModifyWriteRowRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java index 50f786a69ce3..74fd84e27253 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtable.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockBigtable() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java index 7b0503563cfe..91fb92829272 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java @@ -29,7 +29,7 @@ import com.google.bigtable.v2.ReadRowsResponse; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -39,7 +39,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockBigtableImpl extends BigtableImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockBigtableImpl() { @@ -47,15 +47,15 @@ public MockBigtableImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java index cab2395881f5..6951a49cf147 100644 --- a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java +++ b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java @@ -57,8 +57,8 @@ import com.google.container.v1.StartIPRotationRequest; import com.google.container.v1.UpdateClusterRequest; import com.google.container.v1.UpdateMasterRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -121,7 +121,7 @@ public void listClustersTest() { ListClustersResponse actualResponse = client.listClusters(projectId, zone); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListClustersRequest actualRequest = (ListClustersRequest) actualRequests.get(0); @@ -211,7 +211,7 @@ public void getClusterTest() { Cluster actualResponse = client.getCluster(projectId, zone, clusterId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetClusterRequest actualRequest = (GetClusterRequest) actualRequests.get(0); @@ -275,7 +275,7 @@ public void createClusterTest() { Operation actualResponse = client.createCluster(projectId, zone, cluster); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateClusterRequest actualRequest = (CreateClusterRequest) actualRequests.get(0); @@ -340,7 +340,7 @@ public void updateClusterTest() { Operation actualResponse = client.updateCluster(projectId, zone, clusterId, update); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateClusterRequest actualRequest = (UpdateClusterRequest) actualRequests.get(0); @@ -407,7 +407,7 @@ public void setLoggingServiceTest() { Operation actualResponse = client.setLoggingService(projectId, zone, clusterId, loggingService); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetLoggingServiceRequest actualRequest = (SetLoggingServiceRequest) actualRequests.get(0); @@ -475,7 +475,7 @@ public void setMonitoringServiceTest() { client.setMonitoringService(projectId, zone, clusterId, monitoringService); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetMonitoringServiceRequest actualRequest = (SetMonitoringServiceRequest) actualRequests.get(0); @@ -542,7 +542,7 @@ public void setAddonsConfigTest() { Operation actualResponse = client.setAddonsConfig(projectId, zone, clusterId, addonsConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetAddonsConfigRequest actualRequest = (SetAddonsConfigRequest) actualRequests.get(0); @@ -609,7 +609,7 @@ public void setLocationsTest() { Operation actualResponse = client.setLocations(projectId, zone, clusterId, locations); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetLocationsRequest actualRequest = (SetLocationsRequest) actualRequests.get(0); @@ -676,7 +676,7 @@ public void updateMasterTest() { Operation actualResponse = client.updateMaster(projectId, zone, clusterId, masterVersion); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateMasterRequest actualRequest = (UpdateMasterRequest) actualRequests.get(0); @@ -742,7 +742,7 @@ public void deleteClusterTest() { Operation actualResponse = client.deleteCluster(projectId, zone, clusterId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0); @@ -785,7 +785,7 @@ public void listOperationsTest() { ListOperationsResponse actualResponse = client.listOperations(projectId, zone); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListOperationsRequest actualRequest = (ListOperationsRequest) actualRequests.get(0); @@ -847,7 +847,7 @@ public void getOperationTest() { Operation actualResponse = client.getOperation(projectId, zone, operationId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetOperationRequest actualRequest = (GetOperationRequest) actualRequests.get(0); @@ -890,7 +890,7 @@ public void cancelOperationTest() { client.cancelOperation(projectId, zone, operationId); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); CancelOperationRequest actualRequest = (CancelOperationRequest) actualRequests.get(0); @@ -939,7 +939,7 @@ public void getServerConfigTest() { ServerConfig actualResponse = client.getServerConfig(projectId, zone); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetServerConfigRequest actualRequest = (GetServerConfigRequest) actualRequests.get(0); @@ -981,7 +981,7 @@ public void listNodePoolsTest() { ListNodePoolsResponse actualResponse = client.listNodePools(projectId, zone, clusterId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNodePoolsRequest actualRequest = (ListNodePoolsRequest) actualRequests.get(0); @@ -1038,7 +1038,7 @@ public void getNodePoolTest() { NodePool actualResponse = client.getNodePool(projectId, zone, clusterId, nodePoolId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetNodePoolRequest actualRequest = (GetNodePoolRequest) actualRequests.get(0); @@ -1105,7 +1105,7 @@ public void createNodePoolTest() { Operation actualResponse = client.createNodePool(projectId, zone, clusterId, nodePool); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateNodePoolRequest actualRequest = (CreateNodePoolRequest) actualRequests.get(0); @@ -1172,7 +1172,7 @@ public void deleteNodePoolTest() { Operation actualResponse = client.deleteNodePool(projectId, zone, clusterId, nodePoolId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteNodePoolRequest actualRequest = (DeleteNodePoolRequest) actualRequests.get(0); @@ -1240,7 +1240,7 @@ public void rollbackNodePoolUpgradeTest() { client.rollbackNodePoolUpgrade(projectId, zone, clusterId, nodePoolId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); RollbackNodePoolUpgradeRequest actualRequest = (RollbackNodePoolUpgradeRequest) actualRequests.get(0); @@ -1308,7 +1308,7 @@ public void setLegacyAbacTest() { Operation actualResponse = client.setLegacyAbac(projectId, zone, clusterId, enabled); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetLegacyAbacRequest actualRequest = (SetLegacyAbacRequest) actualRequests.get(0); @@ -1374,7 +1374,7 @@ public void startIPRotationTest() { Operation actualResponse = client.startIPRotation(projectId, zone, clusterId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); StartIPRotationRequest actualRequest = (StartIPRotationRequest) actualRequests.get(0); @@ -1438,7 +1438,7 @@ public void completeIPRotationTest() { Operation actualResponse = client.completeIPRotation(projectId, zone, clusterId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); CompleteIPRotationRequest actualRequest = (CompleteIPRotationRequest) actualRequests.get(0); @@ -1503,7 +1503,7 @@ public void setNetworkPolicyTest() { Operation actualResponse = client.setNetworkPolicy(projectId, zone, clusterId, networkPolicy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetNetworkPolicyRequest actualRequest = (SetNetworkPolicyRequest) actualRequests.get(0); @@ -1571,7 +1571,7 @@ public void setMaintenancePolicyTest() { client.setMaintenancePolicy(projectId, zone, clusterId, maintenancePolicy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterManager.getRequests(); + List actualRequests = mockClusterManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetMaintenancePolicyRequest actualRequest = (SetMaintenancePolicyRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java index 76f2c7b8ba4b..eb9968590057 100644 --- a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java +++ b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManager.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockClusterManager() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java index b1ad3f7b494a..4a08324e0d2e 100644 --- a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java +++ b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/MockClusterManagerImpl.java @@ -54,8 +54,8 @@ import com.google.container.v1.UpdateClusterRequest; import com.google.container.v1.UpdateMasterRequest; import com.google.container.v1.UpdateNodePoolRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -65,7 +65,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockClusterManagerImpl extends ClusterManagerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockClusterManagerImpl() { @@ -73,15 +73,15 @@ public MockClusterManagerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1ClientTest.java b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1ClientTest.java index c0954db534f8..1e59d65d327c 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1ClientTest.java +++ b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/ContainerAnalysisV1Beta1ClientTest.java @@ -40,8 +40,8 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -110,7 +110,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); + List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -152,7 +152,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); + List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -191,7 +191,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); + List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); @@ -239,7 +239,7 @@ public void getScanConfigTest() { ScanConfig actualResponse = client.getScanConfig(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); + List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetScanConfigRequest actualRequest = (GetScanConfigRequest) actualRequests.get(0); @@ -288,7 +288,7 @@ public void listScanConfigsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getScanConfigsList().get(0), resources.get(0)); - List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); + List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListScanConfigsRequest actualRequest = (ListScanConfigsRequest) actualRequests.get(0); @@ -337,7 +337,7 @@ public void updateScanConfigTest() { ScanConfig actualResponse = client.updateScanConfig(name, scanConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); + List actualRequests = mockContainerAnalysisV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateScanConfigRequest actualRequest = (UpdateScanConfigRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1ClientTest.java b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1ClientTest.java index 85ae0d77e340..dc76f01c2150 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1ClientTest.java +++ b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/GrafeasV1Beta1ClientTest.java @@ -30,9 +30,9 @@ import com.google.containeranalysis.v1beta1.NoteName; import com.google.containeranalysis.v1beta1.OccurrenceName; import com.google.containeranalysis.v1beta1.ProjectName; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grafeas.v1beta1.BatchCreateNotesRequest; import io.grafeas.v1beta1.BatchCreateNotesResponse; import io.grafeas.v1beta1.BatchCreateOccurrencesRequest; @@ -131,7 +131,7 @@ public void getOccurrenceTest() { Occurrence actualResponse = client.getOccurrence(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetOccurrenceRequest actualRequest = (GetOccurrenceRequest) actualRequests.get(0); @@ -180,7 +180,7 @@ public void listOccurrencesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getOccurrencesList().get(0), resources.get(0)); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListOccurrencesRequest actualRequest = (ListOccurrencesRequest) actualRequests.get(0); @@ -219,7 +219,7 @@ public void deleteOccurrenceTest() { client.deleteOccurrence(name); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteOccurrenceRequest actualRequest = (DeleteOccurrenceRequest) actualRequests.get(0); @@ -266,7 +266,7 @@ public void createOccurrenceTest() { Occurrence actualResponse = client.createOccurrence(parent, occurrence); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateOccurrenceRequest actualRequest = (CreateOccurrenceRequest) actualRequests.get(0); @@ -309,7 +309,7 @@ public void batchCreateOccurrencesTest() { client.batchCreateOccurrences(parent, occurrences); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateOccurrencesRequest actualRequest = (BatchCreateOccurrencesRequest) actualRequests.get(0); @@ -360,7 +360,7 @@ public void updateOccurrenceTest() { Occurrence actualResponse = client.updateOccurrence(name, occurrence, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateOccurrenceRequest actualRequest = (UpdateOccurrenceRequest) actualRequests.get(0); @@ -410,7 +410,7 @@ public void getOccurrenceNoteTest() { Note actualResponse = client.getOccurrenceNote(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetOccurrenceNoteRequest actualRequest = (GetOccurrenceNoteRequest) actualRequests.get(0); @@ -456,7 +456,7 @@ public void getNoteTest() { Note actualResponse = client.getNote(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetNoteRequest actualRequest = (GetNoteRequest) actualRequests.get(0); @@ -502,7 +502,7 @@ public void listNotesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getNotesList().get(0), resources.get(0)); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNotesRequest actualRequest = (ListNotesRequest) actualRequests.get(0); @@ -541,7 +541,7 @@ public void deleteNoteTest() { client.deleteNote(name); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteNoteRequest actualRequest = (DeleteNoteRequest) actualRequests.get(0); @@ -589,7 +589,7 @@ public void createNoteTest() { Note actualResponse = client.createNote(parent, noteId, note); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateNoteRequest actualRequest = (CreateNoteRequest) actualRequests.get(0); @@ -632,7 +632,7 @@ public void batchCreateNotesTest() { BatchCreateNotesResponse actualResponse = client.batchCreateNotes(parent, notes); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateNotesRequest actualRequest = (BatchCreateNotesRequest) actualRequests.get(0); @@ -682,7 +682,7 @@ public void updateNoteTest() { Note actualResponse = client.updateNote(name, note, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateNoteRequest actualRequest = (UpdateNoteRequest) actualRequests.get(0); @@ -735,7 +735,7 @@ public void listNoteOccurrencesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getOccurrencesList().get(0), resources.get(0)); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNoteOccurrencesRequest actualRequest = (ListNoteOccurrencesRequest) actualRequests.get(0); @@ -778,7 +778,7 @@ public void getVulnerabilityOccurrencesSummaryTest() { client.getVulnerabilityOccurrencesSummary(parent, filter); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGrafeasV1Beta1.getRequests(); + List actualRequests = mockGrafeasV1Beta1.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetVulnerabilityOccurrencesSummaryRequest actualRequest = (GetVulnerabilityOccurrencesSummaryRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1.java b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1.java index d72e871e21ee..f7e15dcbdd19 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1.java +++ b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockContainerAnalysisV1Beta1() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1Impl.java b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1Impl.java index 925224a6107c..3f1737138551 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1Impl.java +++ b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockContainerAnalysisV1Beta1Impl.java @@ -27,7 +27,7 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -37,7 +37,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockContainerAnalysisV1Beta1Impl extends ContainerAnalysisV1Beta1ImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockContainerAnalysisV1Beta1Impl() { @@ -45,15 +45,15 @@ public MockContainerAnalysisV1Beta1Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1.java b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1.java index e0ff516ee193..a7019124dc66 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1.java +++ b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockGrafeasV1Beta1() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1Impl.java b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1Impl.java index c5d3158e910d..72ea141763f3 100644 --- a/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1Impl.java +++ b/google-cloud-clients/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1beta1/MockGrafeasV1Beta1Impl.java @@ -16,8 +16,8 @@ package com.google.cloud.devtools.containeranalysis.v1beta1; import com.google.api.core.BetaApi; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grafeas.v1beta1.BatchCreateNotesRequest; import io.grafeas.v1beta1.BatchCreateNotesResponse; import io.grafeas.v1beta1.BatchCreateOccurrencesRequest; @@ -51,7 +51,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockGrafeasV1Beta1Impl extends GrafeasV1Beta1ImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockGrafeasV1Beta1Impl() { @@ -59,15 +59,15 @@ public MockGrafeasV1Beta1Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java index 49460a5ed039..257c11618e7c 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/ClusterControllerClientTest.java @@ -27,10 +27,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -115,7 +115,7 @@ public void createClusterTest() throws Exception { Cluster actualResponse = client.createClusterAsync(projectId, region, cluster).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateClusterRequest actualRequest = (CreateClusterRequest) actualRequests.get(0); @@ -178,7 +178,7 @@ public void updateClusterTest() throws Exception { client.updateClusterAsync(projectId, region, clusterName, cluster, updateMask).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateClusterRequest actualRequest = (UpdateClusterRequest) actualRequests.get(0); @@ -234,7 +234,7 @@ public void deleteClusterTest() throws Exception { Empty actualResponse = client.deleteClusterAsync(projectId, region, clusterName).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0); @@ -288,7 +288,7 @@ public void getClusterTest() { Cluster actualResponse = client.getCluster(projectId, region, clusterName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetClusterRequest actualRequest = (GetClusterRequest) actualRequests.get(0); @@ -341,7 +341,7 @@ public void listClustersTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getClustersList().get(0), resources.get(0)); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListClustersRequest actualRequest = (ListClustersRequest) actualRequests.get(0); @@ -393,7 +393,7 @@ public void listClustersTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getClustersList().get(0), resources.get(0)); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListClustersRequest actualRequest = (ListClustersRequest) actualRequests.get(0); @@ -443,7 +443,7 @@ public void diagnoseClusterTest() throws Exception { Empty actualResponse = client.diagnoseClusterAsync(projectId, region, clusterName).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); DiagnoseClusterRequest actualRequest = (DiagnoseClusterRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java index 487f2e1349dd..c2c1ba666660 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/JobControllerClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -104,7 +104,7 @@ public void submitJobTest() { Job actualResponse = client.submitJob(projectId, region, job); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); SubmitJobRequest actualRequest = (SubmitJobRequest) actualRequests.get(0); @@ -156,7 +156,7 @@ public void getJobTest() { Job actualResponse = client.getJob(projectId, region, jobId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetJobRequest actualRequest = (GetJobRequest) actualRequests.get(0); @@ -206,7 +206,7 @@ public void listJobsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -255,7 +255,7 @@ public void listJobsTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -307,7 +307,7 @@ public void cancelJobTest() { Job actualResponse = client.cancelJob(projectId, region, jobId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); CancelJobRequest actualRequest = (CancelJobRequest) actualRequests.get(0); @@ -350,7 +350,7 @@ public void deleteJobTest() { client.deleteJob(projectId, region, jobId); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java index 40cde7ed8996..f1bd57fd28c0 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterController.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockClusterController() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java index 36d0a2d775eb..7781c102a25d 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockClusterControllerImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dataproc.v1.ClusterControllerGrpc.ClusterControllerImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockClusterControllerImpl extends ClusterControllerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockClusterControllerImpl() { @@ -36,15 +36,15 @@ public MockClusterControllerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java index b5423e4e4768..41dd9d0191cf 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobController.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockJobController() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java index 85461331f40e..233d57a537f3 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockJobControllerImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dataproc.v1.JobControllerGrpc.JobControllerImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockJobControllerImpl extends JobControllerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockJobControllerImpl() { @@ -36,15 +36,15 @@ public MockJobControllerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateService.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateService.java index 837e0a03b3c5..16701dd89fac 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateService.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockWorkflowTemplateService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateServiceImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateServiceImpl.java index 63c62c10d581..82fad23e48aa 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateServiceImpl.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/MockWorkflowTemplateServiceImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dataproc.v1.WorkflowTemplateServiceGrpc.WorkflowTemplateServiceImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockWorkflowTemplateServiceImpl extends WorkflowTemplateServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockWorkflowTemplateServiceImpl() { @@ -37,15 +37,15 @@ public MockWorkflowTemplateServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClientTest.java index f7a992e05b52..b7c68aa7c3e0 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClientTest.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -110,7 +110,7 @@ public void createWorkflowTemplateTest() { WorkflowTemplate actualResponse = client.createWorkflowTemplate(parent, template); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateWorkflowTemplateRequest actualRequest = (CreateWorkflowTemplateRequest) actualRequests.get(0); @@ -161,7 +161,7 @@ public void getWorkflowTemplateTest() { WorkflowTemplate actualResponse = client.getWorkflowTemplate(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetWorkflowTemplateRequest actualRequest = (GetWorkflowTemplateRequest) actualRequests.get(0); @@ -207,7 +207,7 @@ public void instantiateWorkflowTemplateTest() throws Exception { Empty actualResponse = client.instantiateWorkflowTemplateAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); InstantiateWorkflowTemplateRequest actualRequest = (InstantiateWorkflowTemplateRequest) actualRequests.get(0); @@ -257,7 +257,7 @@ public void instantiateWorkflowTemplateTest2() throws Exception { Empty actualResponse = client.instantiateWorkflowTemplateAsync(name, parameters).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); InstantiateWorkflowTemplateRequest actualRequest = (InstantiateWorkflowTemplateRequest) actualRequests.get(0); @@ -309,7 +309,7 @@ public void instantiateInlineWorkflowTemplateTest() throws Exception { client.instantiateInlineWorkflowTemplateAsync(formattedParent, template).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); InstantiateInlineWorkflowTemplateRequest actualRequest = (InstantiateInlineWorkflowTemplateRequest) actualRequests.get(0); @@ -361,7 +361,7 @@ public void updateWorkflowTemplateTest() { WorkflowTemplate actualResponse = client.updateWorkflowTemplate(template); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateWorkflowTemplateRequest actualRequest = (UpdateWorkflowTemplateRequest) actualRequests.get(0); @@ -410,7 +410,7 @@ public void listWorkflowTemplatesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTemplatesList().get(0), resources.get(0)); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListWorkflowTemplatesRequest actualRequest = (ListWorkflowTemplatesRequest) actualRequests.get(0); @@ -449,7 +449,7 @@ public void deleteWorkflowTemplateTest() { client.deleteWorkflowTemplate(name); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteWorkflowTemplateRequest actualRequest = (DeleteWorkflowTemplateRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java index b4bcb1e867b2..f5de90f68c22 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClientTest.java @@ -27,10 +27,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -115,7 +115,7 @@ public void createClusterTest() throws Exception { Cluster actualResponse = client.createClusterAsync(projectId, region, cluster).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateClusterRequest actualRequest = (CreateClusterRequest) actualRequests.get(0); @@ -178,7 +178,7 @@ public void updateClusterTest() throws Exception { client.updateClusterAsync(projectId, region, clusterName, cluster, updateMask).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateClusterRequest actualRequest = (UpdateClusterRequest) actualRequests.get(0); @@ -234,7 +234,7 @@ public void deleteClusterTest() throws Exception { Empty actualResponse = client.deleteClusterAsync(projectId, region, clusterName).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteClusterRequest actualRequest = (DeleteClusterRequest) actualRequests.get(0); @@ -288,7 +288,7 @@ public void getClusterTest() { Cluster actualResponse = client.getCluster(projectId, region, clusterName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetClusterRequest actualRequest = (GetClusterRequest) actualRequests.get(0); @@ -341,7 +341,7 @@ public void listClustersTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getClustersList().get(0), resources.get(0)); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListClustersRequest actualRequest = (ListClustersRequest) actualRequests.get(0); @@ -393,7 +393,7 @@ public void listClustersTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getClustersList().get(0), resources.get(0)); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListClustersRequest actualRequest = (ListClustersRequest) actualRequests.get(0); @@ -443,7 +443,7 @@ public void diagnoseClusterTest() throws Exception { Empty actualResponse = client.diagnoseClusterAsync(projectId, region, clusterName).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockClusterController.getRequests(); + List actualRequests = mockClusterController.getRequests(); Assert.assertEquals(1, actualRequests.size()); DiagnoseClusterRequest actualRequest = (DiagnoseClusterRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java index 5711a6697247..cb7aee5e87d8 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/JobControllerClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -106,7 +106,7 @@ public void submitJobTest() { Job actualResponse = client.submitJob(projectId, region, job); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); SubmitJobRequest actualRequest = (SubmitJobRequest) actualRequests.get(0); @@ -160,7 +160,7 @@ public void getJobTest() { Job actualResponse = client.getJob(projectId, region, jobId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetJobRequest actualRequest = (GetJobRequest) actualRequests.get(0); @@ -210,7 +210,7 @@ public void listJobsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -259,7 +259,7 @@ public void listJobsTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -313,7 +313,7 @@ public void cancelJobTest() { Job actualResponse = client.cancelJob(projectId, region, jobId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); CancelJobRequest actualRequest = (CancelJobRequest) actualRequests.get(0); @@ -356,7 +356,7 @@ public void deleteJobTest() { client.deleteJob(projectId, region, jobId); - List actualRequests = mockJobController.getRequests(); + List actualRequests = mockJobController.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterController.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterController.java index b8bad4b134c3..5b12cfa626a4 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterController.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterController.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockClusterController() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterControllerImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterControllerImpl.java index 82555172ecbb..0243f55d921c 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterControllerImpl.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockClusterControllerImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dataproc.v1beta2.ClusterControllerGrpc.ClusterControllerImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockClusterControllerImpl extends ClusterControllerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockClusterControllerImpl() { @@ -36,15 +36,15 @@ public MockClusterControllerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobController.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobController.java index fd0cedf5cceb..a467dc02ecc6 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobController.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobController.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockJobController() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobControllerImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobControllerImpl.java index 67d2f4d6cf13..44e55008ed95 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobControllerImpl.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockJobControllerImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dataproc.v1beta2.JobControllerGrpc.JobControllerImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockJobControllerImpl extends JobControllerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockJobControllerImpl() { @@ -36,15 +36,15 @@ public MockJobControllerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateService.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateService.java index 85432f8bed31..9a0dd642fb0c 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateService.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockWorkflowTemplateService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateServiceImpl.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateServiceImpl.java index fadc76d87180..123bc68f6ee1 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateServiceImpl.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/MockWorkflowTemplateServiceImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dataproc.v1beta2.WorkflowTemplateServiceGrpc.WorkflowTemplateServiceImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockWorkflowTemplateServiceImpl extends WorkflowTemplateServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockWorkflowTemplateServiceImpl() { @@ -37,15 +37,15 @@ public MockWorkflowTemplateServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClientTest.java b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClientTest.java index 42fdab91477e..62ea42dfd1b6 100644 --- a/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClientTest.java +++ b/google-cloud-clients/google-cloud-dataproc/src/test/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -110,7 +110,7 @@ public void createWorkflowTemplateTest() { WorkflowTemplate actualResponse = client.createWorkflowTemplate(parent, template); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateWorkflowTemplateRequest actualRequest = (CreateWorkflowTemplateRequest) actualRequests.get(0); @@ -161,7 +161,7 @@ public void getWorkflowTemplateTest() { WorkflowTemplate actualResponse = client.getWorkflowTemplate(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetWorkflowTemplateRequest actualRequest = (GetWorkflowTemplateRequest) actualRequests.get(0); @@ -207,7 +207,7 @@ public void instantiateWorkflowTemplateTest() throws Exception { Empty actualResponse = client.instantiateWorkflowTemplateAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); InstantiateWorkflowTemplateRequest actualRequest = (InstantiateWorkflowTemplateRequest) actualRequests.get(0); @@ -255,7 +255,7 @@ public void instantiateWorkflowTemplateTest2() throws Exception { Empty actualResponse = client.instantiateWorkflowTemplateAsync(parameters).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); InstantiateWorkflowTemplateRequest actualRequest = (InstantiateWorkflowTemplateRequest) actualRequests.get(0); @@ -304,7 +304,7 @@ public void instantiateInlineWorkflowTemplateTest() throws Exception { client.instantiateInlineWorkflowTemplateAsync(formattedParent, template).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); InstantiateInlineWorkflowTemplateRequest actualRequest = (InstantiateInlineWorkflowTemplateRequest) actualRequests.get(0); @@ -356,7 +356,7 @@ public void updateWorkflowTemplateTest() { WorkflowTemplate actualResponse = client.updateWorkflowTemplate(template); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateWorkflowTemplateRequest actualRequest = (UpdateWorkflowTemplateRequest) actualRequests.get(0); @@ -405,7 +405,7 @@ public void listWorkflowTemplatesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTemplatesList().get(0), resources.get(0)); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListWorkflowTemplatesRequest actualRequest = (ListWorkflowTemplatesRequest) actualRequests.get(0); @@ -444,7 +444,7 @@ public void deleteWorkflowTemplateTest() { client.deleteWorkflowTemplate(name); - List actualRequests = mockWorkflowTemplateService.getRequests(); + List actualRequests = mockWorkflowTemplateService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteWorkflowTemplateRequest actualRequest = (DeleteWorkflowTemplateRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java index e20b24d9a213..4bac7289e154 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -127,7 +127,7 @@ public void getAgentTest() { Agent actualResponse = client.getAgent(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetAgentRequest actualRequest = (GetAgentRequest) actualRequests.get(0); @@ -175,7 +175,7 @@ public void searchAgentsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getAgentsList().get(0), resources.get(0)); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchAgentsRequest actualRequest = (SearchAgentsRequest) actualRequests.get(0); @@ -219,7 +219,7 @@ public void trainAgentTest() throws Exception { Empty actualResponse = client.trainAgentAsync(parent).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); TrainAgentRequest actualRequest = (TrainAgentRequest) actualRequests.get(0); @@ -267,7 +267,7 @@ public void exportAgentTest() throws Exception { ExportAgentResponse actualResponse = client.exportAgentAsync(parent).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); ExportAgentRequest actualRequest = (ExportAgentRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java index 46d6fa76c840..8ae391df3324 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/ContextsClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -115,7 +115,7 @@ public void listContextsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getContextsList().get(0), resources.get(0)); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListContextsRequest actualRequest = (ListContextsRequest) actualRequests.get(0); @@ -156,7 +156,7 @@ public void getContextTest() { Context actualResponse = client.getContext(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetContextRequest actualRequest = (GetContextRequest) actualRequests.get(0); @@ -198,7 +198,7 @@ public void createContextTest() { Context actualResponse = client.createContext(parent, context); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateContextRequest actualRequest = (CreateContextRequest) actualRequests.get(0); @@ -241,7 +241,7 @@ public void updateContextTest() { Context actualResponse = client.updateContext(context); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateContextRequest actualRequest = (UpdateContextRequest) actualRequests.get(0); @@ -278,7 +278,7 @@ public void deleteContextTest() { client.deleteContext(name); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteContextRequest actualRequest = (DeleteContextRequest) actualRequests.get(0); @@ -315,7 +315,7 @@ public void deleteAllContextsTest() { client.deleteAllContexts(parent); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteAllContextsRequest actualRequest = (DeleteAllContextsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java index 0dc002482884..88c41972e828 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/EntityTypesClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -120,7 +120,7 @@ public void listEntityTypesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getEntityTypesList().get(0), resources.get(0)); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListEntityTypesRequest actualRequest = (ListEntityTypesRequest) actualRequests.get(0); @@ -169,7 +169,7 @@ public void listEntityTypesTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getEntityTypesList().get(0), resources.get(0)); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListEntityTypesRequest actualRequest = (ListEntityTypesRequest) actualRequests.get(0); @@ -212,7 +212,7 @@ public void getEntityTypeTest() { EntityType actualResponse = client.getEntityType(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetEntityTypeRequest actualRequest = (GetEntityTypeRequest) actualRequests.get(0); @@ -254,7 +254,7 @@ public void getEntityTypeTest2() { EntityType actualResponse = client.getEntityType(name, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetEntityTypeRequest actualRequest = (GetEntityTypeRequest) actualRequests.get(0); @@ -298,7 +298,7 @@ public void createEntityTypeTest() { EntityType actualResponse = client.createEntityType(parent, entityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateEntityTypeRequest actualRequest = (CreateEntityTypeRequest) actualRequests.get(0); @@ -343,7 +343,7 @@ public void createEntityTypeTest2() { EntityType actualResponse = client.createEntityType(parent, entityType, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateEntityTypeRequest actualRequest = (CreateEntityTypeRequest) actualRequests.get(0); @@ -388,7 +388,7 @@ public void updateEntityTypeTest() { EntityType actualResponse = client.updateEntityType(entityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateEntityTypeRequest actualRequest = (UpdateEntityTypeRequest) actualRequests.get(0); @@ -430,7 +430,7 @@ public void updateEntityTypeTest2() { EntityType actualResponse = client.updateEntityType(entityType, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateEntityTypeRequest actualRequest = (UpdateEntityTypeRequest) actualRequests.get(0); @@ -469,7 +469,7 @@ public void deleteEntityTypeTest() { client.deleteEntityType(name); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteEntityTypeRequest actualRequest = (DeleteEntityTypeRequest) actualRequests.get(0); @@ -514,7 +514,7 @@ public void batchDeleteEntityTypesTest() throws Exception { Empty actualResponse = client.batchDeleteEntityTypesAsync(parent, entityTypeNames).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteEntityTypesRequest actualRequest = (BatchDeleteEntityTypesRequest) actualRequests.get(0); @@ -564,7 +564,7 @@ public void batchCreateEntitiesTest() throws Exception { Empty actualResponse = client.batchCreateEntitiesAsync(parent, entities).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateEntitiesRequest actualRequest = (BatchCreateEntitiesRequest) actualRequests.get(0); @@ -614,7 +614,7 @@ public void batchCreateEntitiesTest2() throws Exception { Empty actualResponse = client.batchCreateEntitiesAsync(parent, entities, languageCode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateEntitiesRequest actualRequest = (BatchCreateEntitiesRequest) actualRequests.get(0); @@ -665,7 +665,7 @@ public void batchUpdateEntitiesTest() throws Exception { Empty actualResponse = client.batchUpdateEntitiesAsync(parent, entities).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchUpdateEntitiesRequest actualRequest = (BatchUpdateEntitiesRequest) actualRequests.get(0); @@ -715,7 +715,7 @@ public void batchUpdateEntitiesTest2() throws Exception { Empty actualResponse = client.batchUpdateEntitiesAsync(parent, entities, languageCode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchUpdateEntitiesRequest actualRequest = (BatchUpdateEntitiesRequest) actualRequests.get(0); @@ -766,7 +766,7 @@ public void batchDeleteEntitiesTest() throws Exception { Empty actualResponse = client.batchDeleteEntitiesAsync(parent, entityValues).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteEntitiesRequest actualRequest = (BatchDeleteEntitiesRequest) actualRequests.get(0); @@ -817,7 +817,7 @@ public void batchDeleteEntitiesTest2() throws Exception { client.batchDeleteEntitiesAsync(parent, entityValues, languageCode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteEntitiesRequest actualRequest = (BatchDeleteEntitiesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java index ff4ff9e0e5bd..a156bc76a440 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/IntentsClientTest.java @@ -27,10 +27,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -121,7 +121,7 @@ public void listIntentsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getIntentsList().get(0), resources.get(0)); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListIntentsRequest actualRequest = (ListIntentsRequest) actualRequests.get(0); @@ -170,7 +170,7 @@ public void listIntentsTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getIntentsList().get(0), resources.get(0)); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListIntentsRequest actualRequest = (ListIntentsRequest) actualRequests.get(0); @@ -230,7 +230,7 @@ public void getIntentTest() { Intent actualResponse = client.getIntent(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIntentRequest actualRequest = (GetIntentRequest) actualRequests.get(0); @@ -289,7 +289,7 @@ public void getIntentTest2() { Intent actualResponse = client.getIntent(name, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIntentRequest actualRequest = (GetIntentRequest) actualRequests.get(0); @@ -350,7 +350,7 @@ public void createIntentTest() { Intent actualResponse = client.createIntent(parent, intent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateIntentRequest actualRequest = (CreateIntentRequest) actualRequests.get(0); @@ -412,7 +412,7 @@ public void createIntentTest2() { Intent actualResponse = client.createIntent(parent, intent, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateIntentRequest actualRequest = (CreateIntentRequest) actualRequests.get(0); @@ -475,7 +475,7 @@ public void updateIntentTest() { Intent actualResponse = client.updateIntent(intent, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0); @@ -537,7 +537,7 @@ public void updateIntentTest2() { Intent actualResponse = client.updateIntent(intent, languageCode, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0); @@ -578,7 +578,7 @@ public void deleteIntentTest() { client.deleteIntent(name); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteIntentRequest actualRequest = (DeleteIntentRequest) actualRequests.get(0); @@ -623,7 +623,7 @@ public void batchDeleteIntentsTest() throws Exception { Empty actualResponse = client.batchDeleteIntentsAsync(parent, intents).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteIntentsRequest actualRequest = (BatchDeleteIntentsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java index c5cbafc74d5b..5ecee6424159 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgents.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockAgents() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java index 1bc862150526..8a6a7ea033b6 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockAgentsImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2.AgentsGrpc.AgentsImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockAgentsImpl extends AgentsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockAgentsImpl() { @@ -36,15 +36,15 @@ public MockAgentsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java index 473c04687bc3..ffe11d2ae6dc 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContexts.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockContexts() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java index 0434ec9f9d38..8fd60484080d 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockContextsImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2.ContextsGrpc.ContextsImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockContextsImpl extends ContextsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockContextsImpl() { @@ -36,15 +36,15 @@ public MockContextsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java index 9dd7d28beec8..e81b8e2bdea6 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypes.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockEntityTypes() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java index 3753142b8ae6..b51cd6eafbf6 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockEntityTypesImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2.EntityTypesGrpc.EntityTypesImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockEntityTypesImpl extends EntityTypesImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockEntityTypesImpl() { @@ -37,15 +37,15 @@ public MockEntityTypesImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java index 8390a517b5f0..aff42cf81fb2 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntents.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockIntents() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java index 20b962b4f3b9..6f1180795dd5 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockIntentsImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2.IntentsGrpc.IntentsImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockIntentsImpl extends IntentsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockIntentsImpl() { @@ -37,15 +37,15 @@ public MockIntentsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java index 3c8888bb0093..d271bc87715e 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypes.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSessionEntityTypes() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java index c968f9c7ad89..a2835eb638c4 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionEntityTypesImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2.SessionEntityTypesGrpc.SessionEntityTypesImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSessionEntityTypesImpl extends SessionEntityTypesImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSessionEntityTypesImpl() { @@ -36,15 +36,15 @@ public MockSessionEntityTypesImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java index 160f7eb2d777..96b34d232305 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessions.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSessions() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java index 10dd6c1bdc40..bc9ad9b4dad9 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/MockSessionsImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2.SessionsGrpc.SessionsImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSessionsImpl extends SessionsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSessionsImpl() { @@ -35,15 +35,15 @@ public MockSessionsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java index 33e83087d72c..af089a580146 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -115,7 +115,7 @@ public void listSessionEntityTypesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSessionEntityTypesList().get(0), resources.get(0)); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSessionEntityTypesRequest actualRequest = (ListSessionEntityTypesRequest) actualRequests.get(0); @@ -158,7 +158,7 @@ public void getSessionEntityTypeTest() { SessionEntityType actualResponse = client.getSessionEntityType(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSessionEntityTypeRequest actualRequest = (GetSessionEntityTypeRequest) actualRequests.get(0); @@ -201,7 +201,7 @@ public void createSessionEntityTypeTest() { SessionEntityType actualResponse = client.createSessionEntityType(parent, sessionEntityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSessionEntityTypeRequest actualRequest = (CreateSessionEntityTypeRequest) actualRequests.get(0); @@ -245,7 +245,7 @@ public void updateSessionEntityTypeTest() { SessionEntityType actualResponse = client.updateSessionEntityType(sessionEntityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSessionEntityTypeRequest actualRequest = (UpdateSessionEntityTypeRequest) actualRequests.get(0); @@ -284,7 +284,7 @@ public void deleteSessionEntityTypeTest() { client.deleteSessionEntityType(name); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSessionEntityTypeRequest actualRequest = (DeleteSessionEntityTypeRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java index ce7b0d35a776..7063ea63ee51 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/SessionsClientTest.java @@ -26,8 +26,8 @@ import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -114,7 +114,7 @@ public void detectIntentTest() { DetectIntentResponse actualResponse = client.detectIntent(session, queryInput); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessions.getRequests(); + List actualRequests = mockSessions.getRequests(); Assert.assertEquals(1, actualRequests.size()); DetectIntentRequest actualRequest = (DetectIntentRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java index cca45442057c..70ecb8f8ad25 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -133,7 +133,7 @@ public void getAgentTest() { Agent actualResponse = client.getAgent(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetAgentRequest actualRequest = (GetAgentRequest) actualRequests.get(0); @@ -181,7 +181,7 @@ public void searchAgentsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getAgentsList().get(0), resources.get(0)); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchAgentsRequest actualRequest = (SearchAgentsRequest) actualRequests.get(0); @@ -225,7 +225,7 @@ public void trainAgentTest() throws Exception { Empty actualResponse = client.trainAgentAsync(parent).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); TrainAgentRequest actualRequest = (TrainAgentRequest) actualRequests.get(0); @@ -273,7 +273,7 @@ public void exportAgentTest() throws Exception { ExportAgentResponse actualResponse = client.exportAgentAsync(parent).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAgents.getRequests(); + List actualRequests = mockAgents.getRequests(); Assert.assertEquals(1, actualRequests.size()); ExportAgentRequest actualRequest = (ExportAgentRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java index 427f218e2e24..401a4f4c5c8e 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -121,7 +121,7 @@ public void listContextsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getContextsList().get(0), resources.get(0)); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListContextsRequest actualRequest = (ListContextsRequest) actualRequests.get(0); @@ -162,7 +162,7 @@ public void getContextTest() { Context actualResponse = client.getContext(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetContextRequest actualRequest = (GetContextRequest) actualRequests.get(0); @@ -204,7 +204,7 @@ public void createContextTest() { Context actualResponse = client.createContext(parent, context); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateContextRequest actualRequest = (CreateContextRequest) actualRequests.get(0); @@ -247,7 +247,7 @@ public void updateContextTest() { Context actualResponse = client.updateContext(context); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateContextRequest actualRequest = (UpdateContextRequest) actualRequests.get(0); @@ -284,7 +284,7 @@ public void deleteContextTest() { client.deleteContext(name); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteContextRequest actualRequest = (DeleteContextRequest) actualRequests.get(0); @@ -321,7 +321,7 @@ public void deleteAllContextsTest() { client.deleteAllContexts(parent); - List actualRequests = mockContexts.getRequests(); + List actualRequests = mockContexts.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteAllContextsRequest actualRequest = (DeleteAllContextsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java index 9ebd4492b68b..c25c9073a755 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -125,7 +125,7 @@ public void listDocumentsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getDocumentsList().get(0), resources.get(0)); - List actualRequests = mockDocuments.getRequests(); + List actualRequests = mockDocuments.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDocumentsRequest actualRequest = (ListDocumentsRequest) actualRequests.get(0); @@ -173,7 +173,7 @@ public void getDocumentTest() { Document actualResponse = client.getDocument(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDocuments.getRequests(); + List actualRequests = mockDocuments.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDocumentRequest actualRequest = (GetDocumentRequest) actualRequests.get(0); @@ -228,7 +228,7 @@ public void createDocumentTest() throws Exception { Document actualResponse = client.createDocumentAsync(parent, document).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDocuments.getRequests(); + List actualRequests = mockDocuments.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateDocumentRequest actualRequest = (CreateDocumentRequest) actualRequests.get(0); @@ -276,7 +276,7 @@ public void deleteDocumentTest() throws Exception { Empty actualResponse = client.deleteDocumentAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDocuments.getRequests(); + List actualRequests = mockDocuments.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteDocumentRequest actualRequest = (DeleteDocumentRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java index 61ca940b6d3d..2e6f8ed6a936 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java @@ -27,9 +27,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -126,7 +126,7 @@ public void listEntityTypesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getEntityTypesList().get(0), resources.get(0)); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListEntityTypesRequest actualRequest = (ListEntityTypesRequest) actualRequests.get(0); @@ -175,7 +175,7 @@ public void listEntityTypesTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getEntityTypesList().get(0), resources.get(0)); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListEntityTypesRequest actualRequest = (ListEntityTypesRequest) actualRequests.get(0); @@ -218,7 +218,7 @@ public void getEntityTypeTest() { EntityType actualResponse = client.getEntityType(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetEntityTypeRequest actualRequest = (GetEntityTypeRequest) actualRequests.get(0); @@ -260,7 +260,7 @@ public void getEntityTypeTest2() { EntityType actualResponse = client.getEntityType(name, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetEntityTypeRequest actualRequest = (GetEntityTypeRequest) actualRequests.get(0); @@ -304,7 +304,7 @@ public void createEntityTypeTest() { EntityType actualResponse = client.createEntityType(parent, entityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateEntityTypeRequest actualRequest = (CreateEntityTypeRequest) actualRequests.get(0); @@ -349,7 +349,7 @@ public void createEntityTypeTest2() { EntityType actualResponse = client.createEntityType(parent, entityType, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateEntityTypeRequest actualRequest = (CreateEntityTypeRequest) actualRequests.get(0); @@ -394,7 +394,7 @@ public void updateEntityTypeTest() { EntityType actualResponse = client.updateEntityType(entityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateEntityTypeRequest actualRequest = (UpdateEntityTypeRequest) actualRequests.get(0); @@ -436,7 +436,7 @@ public void updateEntityTypeTest2() { EntityType actualResponse = client.updateEntityType(entityType, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateEntityTypeRequest actualRequest = (UpdateEntityTypeRequest) actualRequests.get(0); @@ -475,7 +475,7 @@ public void deleteEntityTypeTest() { client.deleteEntityType(name); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteEntityTypeRequest actualRequest = (DeleteEntityTypeRequest) actualRequests.get(0); @@ -520,7 +520,7 @@ public void batchDeleteEntityTypesTest() throws Exception { Empty actualResponse = client.batchDeleteEntityTypesAsync(parent, entityTypeNames).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteEntityTypesRequest actualRequest = (BatchDeleteEntityTypesRequest) actualRequests.get(0); @@ -570,7 +570,7 @@ public void batchCreateEntitiesTest() throws Exception { Empty actualResponse = client.batchCreateEntitiesAsync(parent, entities).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateEntitiesRequest actualRequest = (BatchCreateEntitiesRequest) actualRequests.get(0); @@ -620,7 +620,7 @@ public void batchCreateEntitiesTest2() throws Exception { Empty actualResponse = client.batchCreateEntitiesAsync(parent, entities, languageCode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchCreateEntitiesRequest actualRequest = (BatchCreateEntitiesRequest) actualRequests.get(0); @@ -671,7 +671,7 @@ public void batchUpdateEntitiesTest() throws Exception { Empty actualResponse = client.batchUpdateEntitiesAsync(parent, entities).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchUpdateEntitiesRequest actualRequest = (BatchUpdateEntitiesRequest) actualRequests.get(0); @@ -721,7 +721,7 @@ public void batchUpdateEntitiesTest2() throws Exception { Empty actualResponse = client.batchUpdateEntitiesAsync(parent, entities, languageCode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchUpdateEntitiesRequest actualRequest = (BatchUpdateEntitiesRequest) actualRequests.get(0); @@ -772,7 +772,7 @@ public void batchDeleteEntitiesTest() throws Exception { Empty actualResponse = client.batchDeleteEntitiesAsync(parent, entityValues).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteEntitiesRequest actualRequest = (BatchDeleteEntitiesRequest) actualRequests.get(0); @@ -823,7 +823,7 @@ public void batchDeleteEntitiesTest2() throws Exception { client.batchDeleteEntitiesAsync(parent, entityValues, languageCode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEntityTypes.getRequests(); + List actualRequests = mockEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteEntitiesRequest actualRequest = (BatchDeleteEntitiesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java index 5ee8579653bc..2f0ffedf8f0e 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java @@ -27,10 +27,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -127,7 +127,7 @@ public void listIntentsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getIntentsList().get(0), resources.get(0)); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListIntentsRequest actualRequest = (ListIntentsRequest) actualRequests.get(0); @@ -176,7 +176,7 @@ public void listIntentsTest2() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getIntentsList().get(0), resources.get(0)); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListIntentsRequest actualRequest = (ListIntentsRequest) actualRequests.get(0); @@ -240,7 +240,7 @@ public void getIntentTest() { Intent actualResponse = client.getIntent(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIntentRequest actualRequest = (GetIntentRequest) actualRequests.get(0); @@ -303,7 +303,7 @@ public void getIntentTest2() { Intent actualResponse = client.getIntent(name, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIntentRequest actualRequest = (GetIntentRequest) actualRequests.get(0); @@ -368,7 +368,7 @@ public void createIntentTest() { Intent actualResponse = client.createIntent(parent, intent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateIntentRequest actualRequest = (CreateIntentRequest) actualRequests.get(0); @@ -434,7 +434,7 @@ public void createIntentTest2() { Intent actualResponse = client.createIntent(parent, intent, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateIntentRequest actualRequest = (CreateIntentRequest) actualRequests.get(0); @@ -501,7 +501,7 @@ public void updateIntentTest() { Intent actualResponse = client.updateIntent(intent, languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0); @@ -567,7 +567,7 @@ public void updateIntentTest2() { Intent actualResponse = client.updateIntent(intent, languageCode, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0); @@ -608,7 +608,7 @@ public void deleteIntentTest() { client.deleteIntent(name); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteIntentRequest actualRequest = (DeleteIntentRequest) actualRequests.get(0); @@ -653,7 +653,7 @@ public void batchDeleteIntentsTest() throws Exception { Empty actualResponse = client.batchDeleteIntentsAsync(parent, intents).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIntents.getRequests(); + List actualRequests = mockIntents.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteIntentsRequest actualRequest = (BatchDeleteIntentsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java index ff4799bfc1cb..70b7dc1aed1c 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -121,7 +121,7 @@ public void listKnowledgeBasesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getKnowledgeBasesList().get(0), resources.get(0)); - List actualRequests = mockKnowledgeBases.getRequests(); + List actualRequests = mockKnowledgeBases.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListKnowledgeBasesRequest actualRequest = (ListKnowledgeBasesRequest) actualRequests.get(0); @@ -162,7 +162,7 @@ public void getKnowledgeBaseTest() { KnowledgeBase actualResponse = client.getKnowledgeBase(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKnowledgeBases.getRequests(); + List actualRequests = mockKnowledgeBases.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetKnowledgeBaseRequest actualRequest = (GetKnowledgeBaseRequest) actualRequests.get(0); @@ -204,7 +204,7 @@ public void createKnowledgeBaseTest() { KnowledgeBase actualResponse = client.createKnowledgeBase(parent, knowledgeBase); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKnowledgeBases.getRequests(); + List actualRequests = mockKnowledgeBases.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateKnowledgeBaseRequest actualRequest = (CreateKnowledgeBaseRequest) actualRequests.get(0); @@ -243,7 +243,7 @@ public void deleteKnowledgeBaseTest() { client.deleteKnowledgeBase(name); - List actualRequests = mockKnowledgeBases.getRequests(); + List actualRequests = mockKnowledgeBases.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteKnowledgeBaseRequest actualRequest = (DeleteKnowledgeBaseRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java index 4e4e4722c329..c8582fa61088 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgents.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockAgents() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java index c4c3798fefa8..708c4efc5095 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockAgentsImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.AgentsGrpc.AgentsImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockAgentsImpl extends AgentsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockAgentsImpl() { @@ -36,15 +36,15 @@ public MockAgentsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java index 0d132ff0b217..6a4b37c84f9f 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContexts.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockContexts() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java index e4762e07befb..1e89f867f899 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockContextsImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.ContextsGrpc.ContextsImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockContextsImpl extends ContextsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockContextsImpl() { @@ -36,15 +36,15 @@ public MockContextsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocuments.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocuments.java index 73cde4461b67..0968a0ae95a7 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocuments.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocuments.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockDocuments() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocumentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocumentsImpl.java index 85b68fb9f7ec..52b34cd7eda9 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocumentsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockDocumentsImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.DocumentsGrpc.DocumentsImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockDocumentsImpl extends DocumentsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockDocumentsImpl() { @@ -36,15 +36,15 @@ public MockDocumentsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java index 28a2555d7b13..36923aa2e273 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypes.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockEntityTypes() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java index 66d1b143f13e..0d3f30d86f08 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockEntityTypesImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.EntityTypesGrpc.EntityTypesImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockEntityTypesImpl extends EntityTypesImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockEntityTypesImpl() { @@ -37,15 +37,15 @@ public MockEntityTypesImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java index 9022841e180a..29ca599d926c 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntents.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockIntents() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java index 54c9091df26a..699e3bcad925 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockIntentsImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.IntentsGrpc.IntentsImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockIntentsImpl extends IntentsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockIntentsImpl() { @@ -37,15 +37,15 @@ public MockIntentsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBases.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBases.java index 44d0363c34f1..0a52933dcd1b 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBases.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBases.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockKnowledgeBases() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBasesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBasesImpl.java index 8f33b70ed530..59303c78c02d 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBasesImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockKnowledgeBasesImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.KnowledgeBasesGrpc.KnowledgeBasesImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockKnowledgeBasesImpl extends KnowledgeBasesImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockKnowledgeBasesImpl() { @@ -36,15 +36,15 @@ public MockKnowledgeBasesImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java index af200b04fce8..538fa743ade8 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypes.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSessionEntityTypes() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java index fc92ce3a5798..21ee139c160b 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionEntityTypesImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.SessionEntityTypesGrpc.SessionEntityTypesImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSessionEntityTypesImpl extends SessionEntityTypesImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSessionEntityTypesImpl() { @@ -36,15 +36,15 @@ public MockSessionEntityTypesImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java index a3fd1a2ffe15..049130f22645 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessions.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSessions() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java index ac37f6b2ce1a..6ff69810f3a0 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/MockSessionsImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.dialogflow.v2beta1.SessionsGrpc.SessionsImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSessionsImpl extends SessionsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSessionsImpl() { @@ -35,15 +35,15 @@ public MockSessionsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java index 8529ca55a685..b4eea7fd26cb 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -121,7 +121,7 @@ public void listSessionEntityTypesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSessionEntityTypesList().get(0), resources.get(0)); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSessionEntityTypesRequest actualRequest = (ListSessionEntityTypesRequest) actualRequests.get(0); @@ -164,7 +164,7 @@ public void getSessionEntityTypeTest() { SessionEntityType actualResponse = client.getSessionEntityType(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSessionEntityTypeRequest actualRequest = (GetSessionEntityTypeRequest) actualRequests.get(0); @@ -207,7 +207,7 @@ public void createSessionEntityTypeTest() { SessionEntityType actualResponse = client.createSessionEntityType(parent, sessionEntityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSessionEntityTypeRequest actualRequest = (CreateSessionEntityTypeRequest) actualRequests.get(0); @@ -251,7 +251,7 @@ public void updateSessionEntityTypeTest() { SessionEntityType actualResponse = client.updateSessionEntityType(sessionEntityType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSessionEntityTypeRequest actualRequest = (UpdateSessionEntityTypeRequest) actualRequests.get(0); @@ -290,7 +290,7 @@ public void deleteSessionEntityTypeTest() { client.deleteSessionEntityType(name); - List actualRequests = mockSessionEntityTypes.getRequests(); + List actualRequests = mockSessionEntityTypes.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSessionEntityTypeRequest actualRequest = (DeleteSessionEntityTypeRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java index 58bb6eeb17ed..455596adb6d7 100644 --- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java +++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java @@ -26,8 +26,8 @@ import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -120,7 +120,7 @@ public void detectIntentTest() { DetectIntentResponse actualResponse = client.detectIntent(session, queryInput); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSessions.getRequests(); + List actualRequests = mockSessions.getRequests(); Assert.assertEquals(1, actualRequests.size()); DetectIntentRequest actualRequest = (DetectIntentRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java index ca4c3b831013..9d2c08c190d7 100644 --- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java +++ b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockDlpService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java index dee93b4c3e22..3edcb195b87f 100644 --- a/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java +++ b/google-cloud-clients/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2/MockDlpServiceImpl.java @@ -62,8 +62,8 @@ import com.google.privacy.dlp.v2.UpdateInspectTemplateRequest; import com.google.privacy.dlp.v2.UpdateJobTriggerRequest; import com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -73,7 +73,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockDlpServiceImpl extends DlpServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockDlpServiceImpl() { @@ -81,15 +81,15 @@ public MockDlpServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java index 933b268a6bf8..0f9128dc790e 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java @@ -26,7 +26,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest; import com.google.devtools.clouderrorreporting.v1beta1.GroupName; import com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -97,7 +97,7 @@ public void getGroupTest() { ErrorGroup actualResponse = client.getGroup(groupName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockErrorGroupService.getRequests(); + List actualRequests = mockErrorGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetGroupRequest actualRequest = (GetGroupRequest) actualRequests.get(0); @@ -138,7 +138,7 @@ public void updateGroupTest() { ErrorGroup actualResponse = client.updateGroup(group); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockErrorGroupService.getRequests(); + List actualRequests = mockErrorGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateGroupRequest actualRequest = (UpdateGroupRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java index 71c257794b09..747c6c4da954 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java @@ -36,7 +36,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse; import com.google.devtools.clouderrorreporting.v1beta1.ProjectName; import com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -115,7 +115,7 @@ public void listGroupStatsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getErrorGroupStatsList().get(0), resources.get(0)); - List actualRequests = mockErrorStatsService.getRequests(); + List actualRequests = mockErrorStatsService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListGroupStatsRequest actualRequest = (ListGroupStatsRequest) actualRequests.get(0); @@ -166,7 +166,7 @@ public void listEventsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getErrorEventsList().get(0), resources.get(0)); - List actualRequests = mockErrorStatsService.getRequests(); + List actualRequests = mockErrorStatsService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListEventsRequest actualRequest = (ListEventsRequest) actualRequests.get(0); @@ -206,7 +206,7 @@ public void deleteEventsTest() { DeleteEventsResponse actualResponse = client.deleteEvents(projectName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockErrorStatsService.getRequests(); + List actualRequests = mockErrorStatsService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteEventsRequest actualRequest = (DeleteEventsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java index 6074323a80c2..4be8d502ef7e 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockErrorGroupService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java index 8cb62ba32905..29f7e7237b75 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java @@ -20,7 +20,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceGrpc.ErrorGroupServiceImplBase; import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest; import com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -30,7 +30,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockErrorGroupServiceImpl extends ErrorGroupServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockErrorGroupServiceImpl() { @@ -38,15 +38,15 @@ public MockErrorGroupServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java index 4bc2bfd6d461..674c85d4599b 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockErrorStatsService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java index 110d941ecef3..e2c52b2ef1c7 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java @@ -23,7 +23,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse; import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest; import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockErrorStatsServiceImpl extends ErrorStatsServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockErrorStatsServiceImpl() { @@ -41,15 +41,15 @@ public MockErrorStatsServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java index 54f2491e8ea5..f8333fec7caf 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockReportErrorsService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java index c658fda1d682..92aa33206a40 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java @@ -19,7 +19,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest; import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse; import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceGrpc.ReportErrorsServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockReportErrorsServiceImpl extends ReportErrorsServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockReportErrorsServiceImpl() { @@ -37,15 +37,15 @@ public MockReportErrorsServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java index 3f53e7358581..105424cd40e8 100644 --- a/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java +++ b/google-cloud-clients/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java @@ -26,7 +26,7 @@ import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest; import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse; import com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -95,7 +95,7 @@ public void reportErrorEventTest() { ReportErrorEventResponse actualResponse = client.reportErrorEvent(projectName, event); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockReportErrorsService.getRequests(); + List actualRequests = mockReportErrorsService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ReportErrorEventRequest actualRequest = (ReportErrorEventRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java index cd85027b79b1..d01a8085e956 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java @@ -59,7 +59,7 @@ import com.google.firestore.v1.Value; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Message; import java.io.FileInputStream; import java.io.IOException; @@ -113,7 +113,7 @@ private interface ConformanceTestCase extends Test, Describable {} @Captor private ArgumentCaptor getAllCapture; - @Captor private ArgumentCaptor> streamObserverCapture; + @Captor private ArgumentCaptor> streamObserverCapture; @Captor private ArgumentCaptor runQueryCapture; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java index 2372f9cb344b..a52dfb4660a9 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java @@ -44,8 +44,8 @@ import com.google.firestore.admin.v1.ParentName; import com.google.firestore.admin.v1.UpdateFieldRequest; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -109,7 +109,7 @@ public void createIndexTest() { Operation actualResponse = client.createIndex(formattedParent, index); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateIndexRequest actualRequest = (CreateIndexRequest) actualRequests.get(0); @@ -159,7 +159,7 @@ public void listIndexesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getIndexesList().get(0), resources.get(0)); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListIndexesRequest actualRequest = (ListIndexesRequest) actualRequests.get(0); @@ -198,7 +198,7 @@ public void getIndexTest() { Index actualResponse = client.getIndex(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIndexRequest actualRequest = (GetIndexRequest) actualRequests.get(0); @@ -235,7 +235,7 @@ public void deleteIndexTest() { client.deleteIndex(name); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteIndexRequest actualRequest = (DeleteIndexRequest) actualRequests.get(0); @@ -275,7 +275,7 @@ public void importDocumentsTest() { Operation actualResponse = client.importDocuments(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportDocumentsRequest actualRequest = (ImportDocumentsRequest) actualRequests.get(0); @@ -315,7 +315,7 @@ public void exportDocumentsTest() { Operation actualResponse = client.exportDocuments(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ExportDocumentsRequest actualRequest = (ExportDocumentsRequest) actualRequests.get(0); @@ -354,7 +354,7 @@ public void getFieldTest() { Field actualResponse = client.getField(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetFieldRequest actualRequest = (GetFieldRequest) actualRequests.get(0); @@ -402,7 +402,7 @@ public void listFieldsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getFieldsList().get(0), resources.get(0)); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListFieldsRequest actualRequest = (ListFieldsRequest) actualRequests.get(0); @@ -442,7 +442,7 @@ public void updateFieldTest() { Operation actualResponse = client.updateField(field); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestoreAdmin.getRequests(); + List actualRequests = mockFirestoreAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateFieldRequest actualRequest = (UpdateFieldRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java index 90642f92ba1b..219fb1b7fafb 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java @@ -52,9 +52,9 @@ import com.google.firestore.v1.Write; import com.google.firestore.v1.WriteRequest; import com.google.firestore.v1.WriteResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -119,7 +119,7 @@ public void updateDocumentTest() { Document actualResponse = client.updateDocument(document, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateDocumentRequest actualRequest = (UpdateDocumentRequest) actualRequests.get(0); @@ -158,7 +158,7 @@ public void deleteDocumentTest() { client.deleteDocument(name); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteDocumentRequest actualRequest = (DeleteDocumentRequest) actualRequests.get(0); @@ -257,7 +257,7 @@ public void beginTransactionTest() { BeginTransactionResponse actualResponse = client.beginTransaction(formattedDatabase); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); BeginTransactionRequest actualRequest = (BeginTransactionRequest) actualRequests.get(0); @@ -296,7 +296,7 @@ public void commitTest() { CommitResponse actualResponse = client.commit(formattedDatabase, writes); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); CommitRequest actualRequest = (CommitRequest) actualRequests.get(0); @@ -336,7 +336,7 @@ public void rollbackTest() { client.rollback(formattedDatabase, transaction); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); RollbackRequest actualRequest = (RollbackRequest) actualRequests.get(0); @@ -531,7 +531,7 @@ public void listCollectionIdsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getCollectionIdsList().get(0), resources.get(0)); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListCollectionIdsRequest actualRequest = (ListCollectionIdsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestore.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestore.java index 9ba9ada0648a..a2209bfa7b86 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestore.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestore.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockFirestore() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java index 86413e0ea045..10307418e89c 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockFirestoreAdmin() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java index b660c6efbf41..c40942d41226 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java @@ -31,8 +31,8 @@ import com.google.firestore.admin.v1.ListIndexesResponse; import com.google.firestore.admin.v1.UpdateFieldRequest; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -42,7 +42,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockFirestoreAdminImpl extends FirestoreAdminImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockFirestoreAdminImpl() { @@ -50,15 +50,15 @@ public MockFirestoreAdminImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreImpl.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreImpl.java index 3579eae07437..955fb973cc30 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreImpl.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreImpl.java @@ -39,8 +39,8 @@ import com.google.firestore.v1.UpdateDocumentRequest; import com.google.firestore.v1.WriteRequest; import com.google.firestore.v1.WriteResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -50,7 +50,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockFirestoreImpl extends FirestoreImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockFirestoreImpl() { @@ -58,15 +58,15 @@ public MockFirestoreImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java index c901c4a65cc1..fa111f8463f8 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java @@ -52,9 +52,9 @@ import com.google.firestore.v1beta1.Write; import com.google.firestore.v1beta1.WriteRequest; import com.google.firestore.v1beta1.WriteResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -119,7 +119,7 @@ public void updateDocumentTest() { Document actualResponse = client.updateDocument(document, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateDocumentRequest actualRequest = (UpdateDocumentRequest) actualRequests.get(0); @@ -158,7 +158,7 @@ public void deleteDocumentTest() { client.deleteDocument(name); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteDocumentRequest actualRequest = (DeleteDocumentRequest) actualRequests.get(0); @@ -257,7 +257,7 @@ public void beginTransactionTest() { BeginTransactionResponse actualResponse = client.beginTransaction(formattedDatabase); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); BeginTransactionRequest actualRequest = (BeginTransactionRequest) actualRequests.get(0); @@ -296,7 +296,7 @@ public void commitTest() { CommitResponse actualResponse = client.commit(formattedDatabase, writes); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); CommitRequest actualRequest = (CommitRequest) actualRequests.get(0); @@ -336,7 +336,7 @@ public void rollbackTest() { client.rollback(formattedDatabase, transaction); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); RollbackRequest actualRequest = (RollbackRequest) actualRequests.get(0); @@ -531,7 +531,7 @@ public void listCollectionIdsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getCollectionIdsList().get(0), resources.get(0)); - List actualRequests = mockFirestore.getRequests(); + List actualRequests = mockFirestore.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListCollectionIdsRequest actualRequest = (ListCollectionIdsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java index bf2b9f821b67..1e478f8c498c 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockFirestore() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java index e5c097e93730..ebf72ef37989 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java @@ -39,8 +39,8 @@ import com.google.firestore.v1beta1.UpdateDocumentRequest; import com.google.firestore.v1beta1.WriteRequest; import com.google.firestore.v1beta1.WriteResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -50,7 +50,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockFirestoreImpl extends FirestoreImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockFirestoreImpl() { @@ -58,15 +58,15 @@ public MockFirestoreImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java index 1a00044a26fe..0951b452adbc 100644 --- a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java +++ b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/IamCredentialsClientTest.java @@ -22,9 +22,9 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Duration; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -92,7 +92,7 @@ public void generateAccessTokenTest() { client.generateAccessToken(name, delegates, scope, lifetime); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMCredentials.getRequests(); + List actualRequests = mockIAMCredentials.getRequests(); Assert.assertEquals(1, actualRequests.size()); GenerateAccessTokenRequest actualRequest = (GenerateAccessTokenRequest) actualRequests.get(0); @@ -142,7 +142,7 @@ public void generateIdTokenTest() { client.generateIdToken(name, delegates, audience, includeEmail); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMCredentials.getRequests(); + List actualRequests = mockIAMCredentials.getRequests(); Assert.assertEquals(1, actualRequests.size()); GenerateIdTokenRequest actualRequest = (GenerateIdTokenRequest) actualRequests.get(0); @@ -191,7 +191,7 @@ public void signBlobTest() { SignBlobResponse actualResponse = client.signBlob(name, delegates, payload); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMCredentials.getRequests(); + List actualRequests = mockIAMCredentials.getRequests(); Assert.assertEquals(1, actualRequests.size()); SignBlobRequest actualRequest = (SignBlobRequest) actualRequests.get(0); @@ -238,7 +238,7 @@ public void signJwtTest() { SignJwtResponse actualResponse = client.signJwt(name, delegates, payload); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMCredentials.getRequests(); + List actualRequests = mockIAMCredentials.getRequests(); Assert.assertEquals(1, actualRequests.size()); SignJwtRequest actualRequest = (SignJwtRequest) actualRequests.get(0); @@ -285,7 +285,7 @@ public void generateIdentityBindingAccessTokenTest() { client.generateIdentityBindingAccessToken(name, scope, jwt); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMCredentials.getRequests(); + List actualRequests = mockIAMCredentials.getRequests(); Assert.assertEquals(1, actualRequests.size()); GenerateIdentityBindingAccessTokenRequest actualRequest = (GenerateIdentityBindingAccessTokenRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java index 492a337cb564..b7428fc38197 100644 --- a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java +++ b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockIAMCredentials() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java index 17940f07aa07..1a51f52a2f9e 100644 --- a/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java +++ b/google-cloud-clients/google-cloud-iamcredentials/src/test/java/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.iam.credentials.v1.IAMCredentialsGrpc.IAMCredentialsImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockIAMCredentialsImpl extends IAMCredentialsImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockIAMCredentialsImpl() { @@ -35,15 +35,15 @@ public MockIAMCredentialsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java index 107c8539e74b..028f4bcd239d 100644 --- a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java +++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/DeviceManagerClientTest.java @@ -31,10 +31,10 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -101,7 +101,7 @@ public void createDeviceRegistryTest() { DeviceRegistry actualResponse = client.createDeviceRegistry(parent, deviceRegistry); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateDeviceRegistryRequest actualRequest = (CreateDeviceRegistryRequest) actualRequests.get(0); @@ -144,7 +144,7 @@ public void getDeviceRegistryTest() { DeviceRegistry actualResponse = client.getDeviceRegistry(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDeviceRegistryRequest actualRequest = (GetDeviceRegistryRequest) actualRequests.get(0); @@ -186,7 +186,7 @@ public void updateDeviceRegistryTest() { DeviceRegistry actualResponse = client.updateDeviceRegistry(deviceRegistry, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateDeviceRegistryRequest actualRequest = (UpdateDeviceRegistryRequest) actualRequests.get(0); @@ -225,7 +225,7 @@ public void deleteDeviceRegistryTest() { client.deleteDeviceRegistry(name); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteDeviceRegistryRequest actualRequest = (DeleteDeviceRegistryRequest) actualRequests.get(0); @@ -273,7 +273,7 @@ public void listDeviceRegistriesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getDeviceRegistriesList().get(0), resources.get(0)); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDeviceRegistriesRequest actualRequest = (ListDeviceRegistriesRequest) actualRequests.get(0); @@ -322,7 +322,7 @@ public void createDeviceTest() { Device actualResponse = client.createDevice(parent, device); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateDeviceRequest actualRequest = (CreateDeviceRequest) actualRequests.get(0); @@ -372,7 +372,7 @@ public void getDeviceTest() { Device actualResponse = client.getDevice(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDeviceRequest actualRequest = (GetDeviceRequest) actualRequests.get(0); @@ -421,7 +421,7 @@ public void updateDeviceTest() { Device actualResponse = client.updateDevice(device, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateDeviceRequest actualRequest = (UpdateDeviceRequest) actualRequests.get(0); @@ -460,7 +460,7 @@ public void deleteDeviceTest() { client.deleteDevice(name); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteDeviceRequest actualRequest = (DeleteDeviceRequest) actualRequests.get(0); @@ -508,7 +508,7 @@ public void listDevicesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getDevicesList().get(0), resources.get(0)); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDevicesRequest actualRequest = (ListDevicesRequest) actualRequests.get(0); @@ -550,7 +550,7 @@ public void modifyCloudToDeviceConfigTest() { DeviceConfig actualResponse = client.modifyCloudToDeviceConfig(name, binaryData); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyCloudToDeviceConfigRequest actualRequest = (ModifyCloudToDeviceConfigRequest) actualRequests.get(0); @@ -592,7 +592,7 @@ public void listDeviceConfigVersionsTest() { ListDeviceConfigVersionsResponse actualResponse = client.listDeviceConfigVersions(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDeviceConfigVersionsRequest actualRequest = (ListDeviceConfigVersionsRequest) actualRequests.get(0); @@ -631,7 +631,7 @@ public void listDeviceStatesTest() { ListDeviceStatesResponse actualResponse = client.listDeviceStates(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDeviceStatesRequest actualRequest = (ListDeviceStatesRequest) actualRequests.get(0); @@ -672,7 +672,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -714,7 +714,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -753,7 +753,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); @@ -796,7 +796,7 @@ public void sendCommandToDeviceTest() { client.sendCommandToDevice(name, binaryData, subfolder); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); SendCommandToDeviceRequest actualRequest = (SendCommandToDeviceRequest) actualRequests.get(0); @@ -841,7 +841,7 @@ public void bindDeviceToGatewayTest() { client.bindDeviceToGateway(parent, gatewayId, deviceId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); BindDeviceToGatewayRequest actualRequest = (BindDeviceToGatewayRequest) actualRequests.get(0); @@ -887,7 +887,7 @@ public void unbindDeviceFromGatewayTest() { client.unbindDeviceFromGateway(parent, gatewayId, deviceId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDeviceManager.getRequests(); + List actualRequests = mockDeviceManager.getRequests(); Assert.assertEquals(1, actualRequests.size()); UnbindDeviceFromGatewayRequest actualRequest = (UnbindDeviceFromGatewayRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java index 7ff558548a4d..75d77b036c70 100644 --- a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java +++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManager.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockDeviceManager() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java index f8610231e2ab..7f78d5f40b02 100644 --- a/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java +++ b/google-cloud-clients/google-cloud-iot/src/test/java/com/google/cloud/iot/v1/MockDeviceManagerImpl.java @@ -22,8 +22,8 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockDeviceManagerImpl extends DeviceManagerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockDeviceManagerImpl() { @@ -41,15 +41,15 @@ public MockDeviceManagerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java index c273056b96c7..90bfec221dc7 100644 --- a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java +++ b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java @@ -32,10 +32,10 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Duration; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Timestamp; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -115,7 +115,7 @@ public void listKeyRingsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getKeyRingsList().get(0), resources.get(0)); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListKeyRingsRequest actualRequest = (ListKeyRingsRequest) actualRequests.get(0); @@ -165,7 +165,7 @@ public void listCryptoKeysTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getCryptoKeysList().get(0), resources.get(0)); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListCryptoKeysRequest actualRequest = (ListCryptoKeysRequest) actualRequests.get(0); @@ -216,7 +216,7 @@ public void listCryptoKeyVersionsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getCryptoKeyVersionsList().get(0), resources.get(0)); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListCryptoKeyVersionsRequest actualRequest = (ListCryptoKeyVersionsRequest) actualRequests.get(0); @@ -257,7 +257,7 @@ public void getKeyRingTest() { KeyRing actualResponse = client.getKeyRing(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetKeyRingRequest actualRequest = (GetKeyRingRequest) actualRequests.get(0); @@ -296,7 +296,7 @@ public void getCryptoKeyTest() { CryptoKey actualResponse = client.getCryptoKey(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetCryptoKeyRequest actualRequest = (GetCryptoKeyRequest) actualRequests.get(0); @@ -341,7 +341,7 @@ public void getCryptoKeyVersionTest() { CryptoKeyVersion actualResponse = client.getCryptoKeyVersion(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetCryptoKeyVersionRequest actualRequest = (GetCryptoKeyVersionRequest) actualRequests.get(0); @@ -384,7 +384,7 @@ public void createKeyRingTest() { KeyRing actualResponse = client.createKeyRing(parent, keyRingId, keyRing); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateKeyRingRequest actualRequest = (CreateKeyRingRequest) actualRequests.get(0); @@ -439,7 +439,7 @@ public void createCryptoKeyTest() { CryptoKey actualResponse = client.createCryptoKey(parent, cryptoKeyId, cryptoKey); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateCryptoKeyRequest actualRequest = (CreateCryptoKeyRequest) actualRequests.get(0); @@ -497,7 +497,7 @@ public void createCryptoKeyVersionTest() { CryptoKeyVersion actualResponse = client.createCryptoKeyVersion(parent, cryptoKeyVersion); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateCryptoKeyVersionRequest actualRequest = (CreateCryptoKeyVersionRequest) actualRequests.get(0); @@ -541,7 +541,7 @@ public void updateCryptoKeyTest() { CryptoKey actualResponse = client.updateCryptoKey(cryptoKey, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateCryptoKeyRequest actualRequest = (UpdateCryptoKeyRequest) actualRequests.get(0); @@ -586,7 +586,7 @@ public void updateCryptoKeyVersionTest() { CryptoKeyVersion actualResponse = client.updateCryptoKeyVersion(cryptoKeyVersion, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateCryptoKeyVersionRequest actualRequest = (UpdateCryptoKeyVersionRequest) actualRequests.get(0); @@ -632,7 +632,7 @@ public void encryptTest() { EncryptResponse actualResponse = client.encrypt(name, plaintext); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); EncryptRequest actualRequest = (EncryptRequest) actualRequests.get(0); @@ -675,7 +675,7 @@ public void decryptTest() { DecryptResponse actualResponse = client.decrypt(name, ciphertext); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DecryptRequest actualRequest = (DecryptRequest) actualRequests.get(0); @@ -718,7 +718,7 @@ public void updateCryptoKeyPrimaryVersionTest() { CryptoKey actualResponse = client.updateCryptoKeyPrimaryVersion(name, cryptoKeyVersionId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateCryptoKeyPrimaryVersionRequest actualRequest = (UpdateCryptoKeyPrimaryVersionRequest) actualRequests.get(0); @@ -766,7 +766,7 @@ public void destroyCryptoKeyVersionTest() { CryptoKeyVersion actualResponse = client.destroyCryptoKeyVersion(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DestroyCryptoKeyVersionRequest actualRequest = (DestroyCryptoKeyVersionRequest) actualRequests.get(0); @@ -813,7 +813,7 @@ public void restoreCryptoKeyVersionTest() { CryptoKeyVersion actualResponse = client.restoreCryptoKeyVersion(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); RestoreCryptoKeyVersionRequest actualRequest = (RestoreCryptoKeyVersionRequest) actualRequests.get(0); @@ -857,7 +857,7 @@ public void getPublicKeyTest() { PublicKey actualResponse = client.getPublicKey(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetPublicKeyRequest actualRequest = (GetPublicKeyRequest) actualRequests.get(0); @@ -902,7 +902,7 @@ public void asymmetricDecryptTest() { AsymmetricDecryptResponse actualResponse = client.asymmetricDecrypt(name, ciphertext); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsymmetricDecryptRequest actualRequest = (AsymmetricDecryptRequest) actualRequests.get(0); @@ -949,7 +949,7 @@ public void asymmetricSignTest() { AsymmetricSignResponse actualResponse = client.asymmetricSign(name, digest); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsymmetricSignRequest actualRequest = (AsymmetricSignRequest) actualRequests.get(0); @@ -994,7 +994,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -1036,7 +1036,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -1075,7 +1075,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java index 08456991fcf4..25fddf8f3b5e 100644 --- a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java +++ b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicy.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockIAMPolicy() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java index 9e3f07419a33..27ea2e5351ec 100644 --- a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java +++ b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockIAMPolicyImpl.java @@ -22,7 +22,7 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -32,7 +32,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockIAMPolicyImpl() { @@ -40,15 +40,15 @@ public MockIAMPolicyImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementService.java b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementService.java index 1e218a0d15b2..5937c4a7f60d 100644 --- a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementService.java +++ b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockKeyManagementService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java index e09ff54b9550..7a2abc3a21ba 100644 --- a/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java +++ b/google-cloud-clients/google-cloud-kms/src/test/java/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.kms.v1.KeyManagementServiceGrpc.KeyManagementServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockKeyManagementServiceImpl extends KeyManagementServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockKeyManagementServiceImpl() { @@ -35,15 +35,15 @@ public MockKeyManagementServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java index dcc2b2c6b9ab..f02c92c5e098 100644 --- a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java +++ b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java @@ -22,7 +22,7 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -85,7 +85,7 @@ public void analyzeSentimentTest() { AnalyzeSentimentResponse actualResponse = client.analyzeSentiment(document); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeSentimentRequest actualRequest = (AnalyzeSentimentRequest) actualRequests.get(0); @@ -126,7 +126,7 @@ public void analyzeEntitiesTest() { AnalyzeEntitiesResponse actualResponse = client.analyzeEntities(document, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeEntitiesRequest actualRequest = (AnalyzeEntitiesRequest) actualRequests.get(0); @@ -170,7 +170,7 @@ public void analyzeEntitySentimentTest() { client.analyzeEntitySentiment(document, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeEntitySentimentRequest actualRequest = (AnalyzeEntitySentimentRequest) actualRequests.get(0); @@ -214,7 +214,7 @@ public void analyzeSyntaxTest() { AnalyzeSyntaxResponse actualResponse = client.analyzeSyntax(document, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeSyntaxRequest actualRequest = (AnalyzeSyntaxRequest) actualRequests.get(0); @@ -254,7 +254,7 @@ public void classifyTextTest() { ClassifyTextResponse actualResponse = client.classifyText(document); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ClassifyTextRequest actualRequest = (ClassifyTextRequest) actualRequests.get(0); @@ -296,7 +296,7 @@ public void annotateTextTest() { AnnotateTextResponse actualResponse = client.annotateText(document, features, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateTextRequest actualRequest = (AnnotateTextRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java index 770e9623b0b1..649f8e1a0774 100644 --- a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java +++ b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockLanguageService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java index 6a4c5c39742c..eb16f71d832b 100644 --- a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java +++ b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.language.v1.LanguageServiceGrpc.LanguageServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockLanguageServiceImpl extends LanguageServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockLanguageServiceImpl() { @@ -35,15 +35,15 @@ public MockLanguageServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java index a8820c5e185e..88793b187f63 100644 --- a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java +++ b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java @@ -22,7 +22,7 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -85,7 +85,7 @@ public void analyzeSentimentTest() { AnalyzeSentimentResponse actualResponse = client.analyzeSentiment(document); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeSentimentRequest actualRequest = (AnalyzeSentimentRequest) actualRequests.get(0); @@ -126,7 +126,7 @@ public void analyzeEntitiesTest() { AnalyzeEntitiesResponse actualResponse = client.analyzeEntities(document, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeEntitiesRequest actualRequest = (AnalyzeEntitiesRequest) actualRequests.get(0); @@ -170,7 +170,7 @@ public void analyzeEntitySentimentTest() { client.analyzeEntitySentiment(document, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeEntitySentimentRequest actualRequest = (AnalyzeEntitySentimentRequest) actualRequests.get(0); @@ -214,7 +214,7 @@ public void analyzeSyntaxTest() { AnalyzeSyntaxResponse actualResponse = client.analyzeSyntax(document, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeSyntaxRequest actualRequest = (AnalyzeSyntaxRequest) actualRequests.get(0); @@ -254,7 +254,7 @@ public void classifyTextTest() { ClassifyTextResponse actualResponse = client.classifyText(document); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ClassifyTextRequest actualRequest = (ClassifyTextRequest) actualRequests.get(0); @@ -296,7 +296,7 @@ public void annotateTextTest() { AnnotateTextResponse actualResponse = client.annotateText(document, features, encodingType); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLanguageService.getRequests(); + List actualRequests = mockLanguageService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateTextRequest actualRequest = (AnnotateTextRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java index 9ef0bc8a759b..8d4bfef8a4b2 100644 --- a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java +++ b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockLanguageService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java index e9813e34c799..94788d573fea 100644 --- a/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java +++ b/google-cloud-clients/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.language.v1beta2.LanguageServiceGrpc.LanguageServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockLanguageServiceImpl extends LanguageServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockLanguageServiceImpl() { @@ -35,15 +35,15 @@ public MockLanguageServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java index e1d9b376cbae..f13fb50f18cf 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java @@ -51,9 +51,9 @@ import com.google.logging.v2.SinkNames; import com.google.logging.v2.UpdateExclusionRequest; import com.google.logging.v2.UpdateSinkRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -128,7 +128,7 @@ public void listSinksTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSinksList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSinksRequest actualRequest = (ListSinksRequest) actualRequests.get(0); @@ -178,7 +178,7 @@ public void getSinkTest() { LogSink actualResponse = client.getSink(sinkName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSinkRequest actualRequest = (GetSinkRequest) actualRequests.get(0); @@ -229,7 +229,7 @@ public void createSinkTest() { LogSink actualResponse = client.createSink(parent, sink); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSinkRequest actualRequest = (CreateSinkRequest) actualRequests.get(0); @@ -283,7 +283,7 @@ public void updateSinkTest() { LogSink actualResponse = client.updateSink(sinkName, sink, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSinkRequest actualRequest = (UpdateSinkRequest) actualRequests.get(0); @@ -338,7 +338,7 @@ public void updateSinkTest2() { LogSink actualResponse = client.updateSink(sinkName, sink); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSinkRequest actualRequest = (UpdateSinkRequest) actualRequests.get(0); @@ -377,7 +377,7 @@ public void deleteSinkTest() { client.deleteSink(sinkName); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSinkRequest actualRequest = (DeleteSinkRequest) actualRequests.get(0); @@ -425,7 +425,7 @@ public void listExclusionsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getExclusionsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListExclusionsRequest actualRequest = (ListExclusionsRequest) actualRequests.get(0); @@ -473,7 +473,7 @@ public void getExclusionTest() { LogExclusion actualResponse = client.getExclusion(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetExclusionRequest actualRequest = (GetExclusionRequest) actualRequests.get(0); @@ -522,7 +522,7 @@ public void createExclusionTest() { LogExclusion actualResponse = client.createExclusion(parent, exclusion); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateExclusionRequest actualRequest = (CreateExclusionRequest) actualRequests.get(0); @@ -574,7 +574,7 @@ public void updateExclusionTest() { LogExclusion actualResponse = client.updateExclusion(name, exclusion, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateExclusionRequest actualRequest = (UpdateExclusionRequest) actualRequests.get(0); @@ -615,7 +615,7 @@ public void deleteExclusionTest() { client.deleteExclusion(name); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteExclusionRequest actualRequest = (DeleteExclusionRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java index 0b83db624d53..c42da72c818b 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java @@ -41,8 +41,8 @@ import com.google.logging.v2.ProjectName; import com.google.logging.v2.WriteLogEntriesRequest; import com.google.logging.v2.WriteLogEntriesResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -112,7 +112,7 @@ public void deleteLogTest() { client.deleteLog(logName); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogRequest actualRequest = (DeleteLogRequest) actualRequests.get(0); @@ -154,7 +154,7 @@ public void writeLogEntriesTest() { client.writeLogEntries(logName, resource, labels, entries); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); WriteLogEntriesRequest actualRequest = (WriteLogEntriesRequest) actualRequests.get(0); @@ -211,7 +211,7 @@ public void listLogEntriesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getEntriesList().get(0), resources.get(0)); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLogEntriesRequest actualRequest = (ListLogEntriesRequest) actualRequests.get(0); @@ -263,7 +263,7 @@ public void listLogsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLogNamesList().get(0), resources.get(0)); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLogsRequest actualRequest = (ListLogsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java index 9d1c5e630ffd..ac621d49bedf 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java @@ -38,8 +38,8 @@ import com.google.logging.v2.ProjectMetricName; import com.google.logging.v2.ProjectName; import com.google.logging.v2.UpdateLogMetricRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -117,7 +117,7 @@ public void listLogMetricsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getMetricsList().get(0), resources.get(0)); - List actualRequests = mockMetricsServiceV2.getRequests(); + List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLogMetricsRequest actualRequest = (ListLogMetricsRequest) actualRequests.get(0); @@ -165,7 +165,7 @@ public void getLogMetricTest() { LogMetric actualResponse = client.getLogMetric(metricName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMetricsServiceV2.getRequests(); + List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLogMetricRequest actualRequest = (GetLogMetricRequest) actualRequests.get(0); @@ -214,7 +214,7 @@ public void createLogMetricTest() { LogMetric actualResponse = client.createLogMetric(parent, metric); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMetricsServiceV2.getRequests(); + List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateLogMetricRequest actualRequest = (CreateLogMetricRequest) actualRequests.get(0); @@ -265,7 +265,7 @@ public void updateLogMetricTest() { LogMetric actualResponse = client.updateLogMetric(metricName, metric); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMetricsServiceV2.getRequests(); + List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateLogMetricRequest actualRequest = (UpdateLogMetricRequest) actualRequests.get(0); @@ -304,7 +304,7 @@ public void deleteLogMetricTest() { client.deleteLogMetric(metricName); - List actualRequests = mockMetricsServiceV2.getRequests(); + List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogMetricRequest actualRequest = (DeleteLogMetricRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java index 254e95823ee7..e5efa9b06921 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockConfigServiceV2() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java index 3aec9661b8d3..0aadacfa0e1d 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java @@ -31,8 +31,8 @@ import com.google.logging.v2.LogSink; import com.google.logging.v2.UpdateExclusionRequest; import com.google.logging.v2.UpdateSinkRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -42,7 +42,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockConfigServiceV2Impl extends ConfigServiceV2ImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockConfigServiceV2Impl() { @@ -50,15 +50,15 @@ public MockConfigServiceV2Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java index 564cd7e0ace5..a90d0a768c71 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockLoggingServiceV2() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java index 076b8725a1e2..69b042ed9cce 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java @@ -26,8 +26,8 @@ import com.google.logging.v2.LoggingServiceV2Grpc.LoggingServiceV2ImplBase; import com.google.logging.v2.WriteLogEntriesRequest; import com.google.logging.v2.WriteLogEntriesResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -37,7 +37,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockLoggingServiceV2Impl extends LoggingServiceV2ImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockLoggingServiceV2Impl() { @@ -45,15 +45,15 @@ public MockLoggingServiceV2Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java index 5c1ef2009539..0d9007d5d928 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockMetricsServiceV2() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java index 0630817d421b..dd7f3696ea02 100644 --- a/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java +++ b/google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java @@ -24,8 +24,8 @@ import com.google.logging.v2.LogMetric; import com.google.logging.v2.MetricsServiceV2Grpc.MetricsServiceV2ImplBase; import com.google.logging.v2.UpdateLogMetricRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -35,7 +35,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockMetricsServiceV2Impl extends MetricsServiceV2ImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockMetricsServiceV2Impl() { @@ -43,15 +43,15 @@ public MockMetricsServiceV2Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java index 1897bfe95000..6b1d701f9e67 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/AlertPolicyServiceClientTest.java @@ -34,9 +34,9 @@ import com.google.monitoring.v3.ListAlertPoliciesResponse; import com.google.monitoring.v3.ProjectName; import com.google.monitoring.v3.UpdateAlertPolicyRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -122,7 +122,7 @@ public void listAlertPoliciesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getAlertPoliciesList().get(0), resources.get(0)); - List actualRequests = mockAlertPolicyService.getRequests(); + List actualRequests = mockAlertPolicyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListAlertPoliciesRequest actualRequest = (ListAlertPoliciesRequest) actualRequests.get(0); @@ -163,7 +163,7 @@ public void getAlertPolicyTest() { AlertPolicy actualResponse = client.getAlertPolicy(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAlertPolicyService.getRequests(); + List actualRequests = mockAlertPolicyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetAlertPolicyRequest actualRequest = (GetAlertPolicyRequest) actualRequests.get(0); @@ -205,7 +205,7 @@ public void createAlertPolicyTest() { AlertPolicy actualResponse = client.createAlertPolicy(name, alertPolicy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAlertPolicyService.getRequests(); + List actualRequests = mockAlertPolicyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateAlertPolicyRequest actualRequest = (CreateAlertPolicyRequest) actualRequests.get(0); @@ -244,7 +244,7 @@ public void deleteAlertPolicyTest() { client.deleteAlertPolicy(name); - List actualRequests = mockAlertPolicyService.getRequests(); + List actualRequests = mockAlertPolicyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteAlertPolicyRequest actualRequest = (DeleteAlertPolicyRequest) actualRequests.get(0); @@ -286,7 +286,7 @@ public void updateAlertPolicyTest() { AlertPolicy actualResponse = client.updateAlertPolicy(updateMask, alertPolicy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAlertPolicyService.getRequests(); + List actualRequests = mockAlertPolicyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateAlertPolicyRequest actualRequest = (UpdateAlertPolicyRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java index 29d33d133a10..a15d4c7f5dc6 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java @@ -35,8 +35,8 @@ import com.google.monitoring.v3.ListGroupMembersResponse; import com.google.monitoring.v3.ProjectName; import com.google.monitoring.v3.UpdateGroupRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -124,7 +124,7 @@ public void getGroupTest() { Group actualResponse = client.getGroup(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGroupService.getRequests(); + List actualRequests = mockGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetGroupRequest actualRequest = (GetGroupRequest) actualRequests.get(0); @@ -175,7 +175,7 @@ public void createGroupTest() { Group actualResponse = client.createGroup(name, group); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGroupService.getRequests(); + List actualRequests = mockGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateGroupRequest actualRequest = (CreateGroupRequest) actualRequests.get(0); @@ -227,7 +227,7 @@ public void updateGroupTest() { Group actualResponse = client.updateGroup(group); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockGroupService.getRequests(); + List actualRequests = mockGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateGroupRequest actualRequest = (UpdateGroupRequest) actualRequests.get(0); @@ -264,7 +264,7 @@ public void deleteGroupTest() { client.deleteGroup(name); - List actualRequests = mockGroupService.getRequests(); + List actualRequests = mockGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteGroupRequest actualRequest = (DeleteGroupRequest) actualRequests.get(0); @@ -314,7 +314,7 @@ public void listGroupMembersTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getMembersList().get(0), resources.get(0)); - List actualRequests = mockGroupService.getRequests(); + List actualRequests = mockGroupService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListGroupMembersRequest actualRequest = (ListGroupMembersRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java index 0d79d7cec208..24a9a0036cd0 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java @@ -45,8 +45,8 @@ import com.google.monitoring.v3.ProjectName; import com.google.monitoring.v3.TimeInterval; import com.google.monitoring.v3.TimeSeries; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -137,7 +137,7 @@ public void listMonitoredResourceDescriptorsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResourceDescriptorsList().get(0), resources.get(0)); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListMonitoredResourceDescriptorsRequest actualRequest = (ListMonitoredResourceDescriptorsRequest) actualRequests.get(0); @@ -187,7 +187,7 @@ public void getMonitoredResourceDescriptorTest() { MonitoredResourceDescriptor actualResponse = client.getMonitoredResourceDescriptor(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetMonitoredResourceDescriptorRequest actualRequest = (GetMonitoredResourceDescriptorRequest) actualRequests.get(0); @@ -237,7 +237,7 @@ public void listMetricDescriptorsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getMetricDescriptorsList().get(0), resources.get(0)); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListMetricDescriptorsRequest actualRequest = (ListMetricDescriptorsRequest) actualRequests.get(0); @@ -288,7 +288,7 @@ public void getMetricDescriptorTest() { MetricDescriptor actualResponse = client.getMetricDescriptor(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetMetricDescriptorRequest actualRequest = (GetMetricDescriptorRequest) actualRequests.get(0); @@ -339,7 +339,7 @@ public void createMetricDescriptorTest() { MetricDescriptor actualResponse = client.createMetricDescriptor(name, metricDescriptor); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateMetricDescriptorRequest actualRequest = (CreateMetricDescriptorRequest) actualRequests.get(0); @@ -379,7 +379,7 @@ public void deleteMetricDescriptorTest() { client.deleteMetricDescriptor(name); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteMetricDescriptorRequest actualRequest = (DeleteMetricDescriptorRequest) actualRequests.get(0); @@ -432,7 +432,7 @@ public void listTimeSeriesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTimeSeriesList().get(0), resources.get(0)); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTimeSeriesRequest actualRequest = (ListTimeSeriesRequest) actualRequests.get(0); @@ -476,7 +476,7 @@ public void createTimeSeriesTest() { client.createTimeSeries(name, timeSeries); - List actualRequests = mockMetricService.getRequests(); + List actualRequests = mockMetricService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTimeSeriesRequest actualRequest = (CreateTimeSeriesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java index 3818a2ba517a..1a820d6d5ebe 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockAlertPolicyService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java index 5070250afd45..9e18fc94a5cc 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockAlertPolicyServiceImpl.java @@ -24,8 +24,8 @@ import com.google.monitoring.v3.ListAlertPoliciesRequest; import com.google.monitoring.v3.ListAlertPoliciesResponse; import com.google.monitoring.v3.UpdateAlertPolicyRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -35,7 +35,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockAlertPolicyServiceImpl extends AlertPolicyServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockAlertPolicyServiceImpl() { @@ -43,15 +43,15 @@ public MockAlertPolicyServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java index 31410e9ca184..e77b5a87ced8 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockGroupService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java index a8ff86cf8cf1..129420b2396e 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java @@ -26,8 +26,8 @@ import com.google.monitoring.v3.ListGroupsRequest; import com.google.monitoring.v3.ListGroupsResponse; import com.google.monitoring.v3.UpdateGroupRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -37,7 +37,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockGroupServiceImpl extends GroupServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockGroupServiceImpl() { @@ -45,15 +45,15 @@ public MockGroupServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java index 91d5bed0b69e..fee781c5030a 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockMetricService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java index 3dc276006b03..83707b3731cb 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java @@ -30,8 +30,8 @@ import com.google.monitoring.v3.ListTimeSeriesRequest; import com.google.monitoring.v3.ListTimeSeriesResponse; import com.google.monitoring.v3.MetricServiceGrpc.MetricServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -41,7 +41,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockMetricServiceImpl extends MetricServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockMetricServiceImpl() { @@ -49,15 +49,15 @@ public MockMetricServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java index 0826e48a9838..7667e6d6ad68 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockNotificationChannelService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java index 49f124decd21..b1fd26f329d8 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockNotificationChannelServiceImpl.java @@ -28,8 +28,8 @@ import com.google.monitoring.v3.NotificationChannelDescriptor; import com.google.monitoring.v3.NotificationChannelServiceGrpc.NotificationChannelServiceImplBase; import com.google.monitoring.v3.UpdateNotificationChannelRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -39,7 +39,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockNotificationChannelServiceImpl extends NotificationChannelServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockNotificationChannelServiceImpl() { @@ -47,15 +47,15 @@ public MockNotificationChannelServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java index e9ed9ab7ce94..868aa71508b2 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockUptimeCheckService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java index 77a811e90293..f463929030fa 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockUptimeCheckServiceImpl.java @@ -26,8 +26,8 @@ import com.google.monitoring.v3.UpdateUptimeCheckConfigRequest; import com.google.monitoring.v3.UptimeCheckConfig; import com.google.monitoring.v3.UptimeCheckServiceGrpc.UptimeCheckServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -37,7 +37,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockUptimeCheckServiceImpl extends UptimeCheckServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockUptimeCheckServiceImpl() { @@ -45,15 +45,15 @@ public MockUptimeCheckServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java index 4c886a9250f4..db4ef432d1be 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/NotificationChannelServiceClientTest.java @@ -40,9 +40,9 @@ import com.google.monitoring.v3.NotificationChannelName; import com.google.monitoring.v3.ProjectName; import com.google.monitoring.v3.UpdateNotificationChannelRequest; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -132,7 +132,7 @@ public void listNotificationChannelDescriptorsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getChannelDescriptorsList().get(0), resources.get(0)); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNotificationChannelDescriptorsRequest actualRequest = (ListNotificationChannelDescriptorsRequest) actualRequests.get(0); @@ -182,7 +182,7 @@ public void getNotificationChannelDescriptorTest() { NotificationChannelDescriptor actualResponse = client.getNotificationChannelDescriptor(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetNotificationChannelDescriptorRequest actualRequest = (GetNotificationChannelDescriptorRequest) actualRequests.get(0); @@ -232,7 +232,7 @@ public void listNotificationChannelsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getNotificationChannelsList().get(0), resources.get(0)); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNotificationChannelsRequest actualRequest = (ListNotificationChannelsRequest) actualRequests.get(0); @@ -282,7 +282,7 @@ public void getNotificationChannelTest() { NotificationChannel actualResponse = client.getNotificationChannel(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetNotificationChannelRequest actualRequest = (GetNotificationChannelRequest) actualRequests.get(0); @@ -334,7 +334,7 @@ public void createNotificationChannelTest() { client.createNotificationChannel(name, notificationChannel); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateNotificationChannelRequest actualRequest = (CreateNotificationChannelRequest) actualRequests.get(0); @@ -387,7 +387,7 @@ public void updateNotificationChannelTest() { client.updateNotificationChannel(updateMask, notificationChannel); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateNotificationChannelRequest actualRequest = (UpdateNotificationChannelRequest) actualRequests.get(0); @@ -429,7 +429,7 @@ public void deleteNotificationChannelTest() { client.deleteNotificationChannel(name, force); - List actualRequests = mockNotificationChannelService.getRequests(); + List actualRequests = mockNotificationChannelService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteNotificationChannelRequest actualRequest = (DeleteNotificationChannelRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java index 6faa686b5e2f..425aaf94cd11 100644 --- a/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java +++ b/google-cloud-clients/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/UptimeCheckServiceClientTest.java @@ -34,8 +34,8 @@ import com.google.monitoring.v3.UpdateUptimeCheckConfigRequest; import com.google.monitoring.v3.UptimeCheckConfig; import com.google.monitoring.v3.UptimeCheckConfigName; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -124,7 +124,7 @@ public void listUptimeCheckConfigsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getUptimeCheckConfigsList().get(0), resources.get(0)); - List actualRequests = mockUptimeCheckService.getRequests(); + List actualRequests = mockUptimeCheckService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListUptimeCheckConfigsRequest actualRequest = (ListUptimeCheckConfigsRequest) actualRequests.get(0); @@ -171,7 +171,7 @@ public void getUptimeCheckConfigTest() { UptimeCheckConfig actualResponse = client.getUptimeCheckConfig(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockUptimeCheckService.getRequests(); + List actualRequests = mockUptimeCheckService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetUptimeCheckConfigRequest actualRequest = (GetUptimeCheckConfigRequest) actualRequests.get(0); @@ -219,7 +219,7 @@ public void createUptimeCheckConfigTest() { client.createUptimeCheckConfig(formattedParent, uptimeCheckConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockUptimeCheckService.getRequests(); + List actualRequests = mockUptimeCheckService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateUptimeCheckConfigRequest actualRequest = (CreateUptimeCheckConfigRequest) actualRequests.get(0); @@ -268,7 +268,7 @@ public void updateUptimeCheckConfigTest() { UptimeCheckConfig actualResponse = client.updateUptimeCheckConfig(uptimeCheckConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockUptimeCheckService.getRequests(); + List actualRequests = mockUptimeCheckService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateUptimeCheckConfigRequest actualRequest = (UpdateUptimeCheckConfigRequest) actualRequests.get(0); @@ -306,7 +306,7 @@ public void deleteUptimeCheckConfigTest() { client.deleteUptimeCheckConfig(name); - List actualRequests = mockUptimeCheckService.getRequests(); + List actualRequests = mockUptimeCheckService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteUptimeCheckConfigRequest actualRequest = (DeleteUptimeCheckConfigRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java index 6713a417743c..ab4600fd277d 100644 --- a/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java +++ b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockOsLoginService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java index c9a1d8366c39..79dc58887cef 100644 --- a/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java +++ b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/MockOsLoginServiceImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey; import com.google.cloud.oslogin.v1.OsLoginServiceGrpc.OsLoginServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockOsLoginServiceImpl extends OsLoginServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockOsLoginServiceImpl() { @@ -37,15 +37,15 @@ public MockOsLoginServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java index 91bbc3aeff1f..1675ba4ac100 100644 --- a/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java +++ b/google-cloud-clients/google-cloud-os-login/src/test/java/com/google/cloud/oslogin/v1/OsLoginServiceClientTest.java @@ -23,9 +23,9 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -85,7 +85,7 @@ public void deletePosixAccountTest() { client.deletePosixAccount(name); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeletePosixAccountRequest actualRequest = (DeletePosixAccountRequest) actualRequests.get(0); @@ -122,7 +122,7 @@ public void deleteSshPublicKeyTest() { client.deleteSshPublicKey(name); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSshPublicKeyRequest actualRequest = (DeleteSshPublicKeyRequest) actualRequests.get(0); @@ -163,7 +163,7 @@ public void getLoginProfileTest() { LoginProfile actualResponse = client.getLoginProfile(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLoginProfileRequest actualRequest = (GetLoginProfileRequest) actualRequests.get(0); @@ -209,7 +209,7 @@ public void getSshPublicKeyTest() { SshPublicKey actualResponse = client.getSshPublicKey(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSshPublicKeyRequest actualRequest = (GetSshPublicKeyRequest) actualRequests.get(0); @@ -248,7 +248,7 @@ public void importSshPublicKeyTest() { ImportSshPublicKeyResponse actualResponse = client.importSshPublicKey(parent, sshPublicKey); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportSshPublicKeyRequest actualRequest = (ImportSshPublicKeyRequest) actualRequests.get(0); @@ -291,7 +291,7 @@ public void importSshPublicKeyTest2() { client.importSshPublicKey(parent, sshPublicKey, projectId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportSshPublicKeyRequest actualRequest = (ImportSshPublicKeyRequest) actualRequests.get(0); @@ -342,7 +342,7 @@ public void updateSshPublicKeyTest() { SshPublicKey actualResponse = client.updateSshPublicKey(name, sshPublicKey); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSshPublicKeyRequest actualRequest = (UpdateSshPublicKeyRequest) actualRequests.get(0); @@ -392,7 +392,7 @@ public void updateSshPublicKeyTest2() { SshPublicKey actualResponse = client.updateSshPublicKey(name, sshPublicKey, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOsLoginService.getRequests(); + List actualRequests = mockOsLoginService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSshPublicKeyRequest actualRequest = (UpdateSshPublicKeyRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java index 15d84f60c63d..353aee4679ed 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockIAMPolicy() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java index 0b2084391413..e1630035f35f 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java @@ -22,7 +22,7 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -32,7 +32,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockIAMPolicyImpl() { @@ -40,15 +40,15 @@ public MockIAMPolicyImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java index 306787cd1ff5..5fedd620003c 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockPublisher() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java index e458610a89b0..48f215c9bb49 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java @@ -16,8 +16,8 @@ package com.google.cloud.pubsub.v1; import com.google.api.core.BetaApi; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.pubsub.v1.DeleteTopicRequest; import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -38,7 +38,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockPublisherImpl extends PublisherImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockPublisherImpl() { @@ -46,15 +46,15 @@ public MockPublisherImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java index 238f36fbe818..be46f47f7cf5 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSubscriber() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java index f6d387ef7476..2ade2858d4a6 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java @@ -16,8 +16,8 @@ package com.google.cloud.pubsub.v1; import com.google.api.core.BetaApi; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.pubsub.v1.AcknowledgeRequest; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -49,7 +49,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSubscriberImpl extends SubscriberImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSubscriberImpl() { @@ -57,15 +57,15 @@ public MockSubscriberImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java index 9580bc069267..77a67d2732b2 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java @@ -35,9 +35,9 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.pubsub.v1.AcknowledgeRequest; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -147,7 +147,7 @@ public void createSubscriptionTest() { client.createSubscription(name, topic, pushConfig, ackDeadlineSeconds); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); Subscription actualRequest = (Subscription) actualRequests.get(0); @@ -204,7 +204,7 @@ public void getSubscriptionTest() { Subscription actualResponse = client.getSubscription(subscription); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSubscriptionRequest actualRequest = (GetSubscriptionRequest) actualRequests.get(0); @@ -254,7 +254,7 @@ public void listSubscriptionsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSubscriptionsRequest actualRequest = (ListSubscriptionsRequest) actualRequests.get(0); @@ -292,7 +292,7 @@ public void deleteSubscriptionTest() { client.deleteSubscription(subscription); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = (DeleteSubscriptionRequest) actualRequests.get(0); @@ -334,7 +334,7 @@ public void modifyAckDeadlineTest() { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = (ModifyAckDeadlineRequest) actualRequests.get(0); @@ -379,7 +379,7 @@ public void acknowledgeTest() { client.acknowledge(subscription, ackIds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = (AcknowledgeRequest) actualRequests.get(0); @@ -424,7 +424,7 @@ public void pullTest() { PullResponse actualResponse = client.pull(subscription, returnImmediately, maxMessages); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); PullRequest actualRequest = (PullRequest) actualRequests.get(0); @@ -534,7 +534,7 @@ public void modifyPushConfigTest() { client.modifyPushConfig(subscription, pushConfig); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = (ModifyPushConfigRequest) actualRequests.get(0); @@ -586,7 +586,7 @@ public void listSnapshotsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSnapshotsRequest actualRequest = (ListSnapshotsRequest) actualRequests.get(0); @@ -629,7 +629,7 @@ public void createSnapshotTest() { Snapshot actualResponse = client.createSnapshot(name, subscription); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSnapshotRequest actualRequest = (CreateSnapshotRequest) actualRequests.get(0); @@ -670,7 +670,7 @@ public void deleteSnapshotTest() { client.deleteSnapshot(snapshot); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = (DeleteSnapshotRequest) actualRequests.get(0); @@ -711,7 +711,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(formattedResource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -753,7 +753,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(formattedResource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -793,7 +793,7 @@ public void testIamPermissionsTest() { client.testIamPermissions(formattedResource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java index a87462aedabb..d2ac5766d77f 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java @@ -31,9 +31,9 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.pubsub.v1.DeleteTopicRequest; import com.google.pubsub.v1.GetTopicRequest; import com.google.pubsub.v1.ListTopicSubscriptionsRequest; @@ -115,7 +115,7 @@ public void createTopicTest() { Topic actualResponse = client.createTopic(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); Topic actualRequest = (Topic) actualRequests.get(0); @@ -159,7 +159,7 @@ public void publishTest() { PublishResponse actualResponse = client.publish(topic, messages); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); PublishRequest actualRequest = (PublishRequest) actualRequests.get(0); @@ -202,7 +202,7 @@ public void getTopicTest() { Topic actualResponse = client.getTopic(topic); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTopicRequest actualRequest = (GetTopicRequest) actualRequests.get(0); @@ -250,7 +250,7 @@ public void listTopicsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTopicsList().get(0), resources.get(0)); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTopicsRequest actualRequest = (ListTopicsRequest) actualRequests.get(0); @@ -305,7 +305,7 @@ public void listTopicSubscriptionsTest() { ProjectSubscriptionName.parse(expectedResponse.getSubscriptionsList().get(0)), resourceNames.get(0)); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTopicSubscriptionsRequest actualRequest = (ListTopicSubscriptionsRequest) actualRequests.get(0); @@ -343,7 +343,7 @@ public void deleteTopicTest() { client.deleteTopic(topic); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTopicRequest actualRequest = (DeleteTopicRequest) actualRequests.get(0); @@ -384,7 +384,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(formattedResource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -426,7 +426,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(formattedResource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -466,7 +466,7 @@ public void testIamPermissionsTest() { client.testIamPermissions(formattedResource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/CloudRedisClientTest.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/CloudRedisClientTest.java index c8d81e44f1ab..3ba6823ef9cb 100644 --- a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/CloudRedisClientTest.java +++ b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/CloudRedisClientTest.java @@ -27,10 +27,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -102,7 +102,7 @@ public void listInstancesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getInstancesList().get(0), resources.get(0)); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListInstancesRequest actualRequest = (ListInstancesRequest) actualRequests.get(0); @@ -166,7 +166,7 @@ public void getInstanceTest() { Instance actualResponse = client.getInstance(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceRequest actualRequest = (GetInstanceRequest) actualRequests.get(0); @@ -240,7 +240,7 @@ public void createInstanceTest() throws Exception { Instance actualResponse = client.createInstanceAsync(parent, instanceId, instance).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateInstanceRequest actualRequest = (CreateInstanceRequest) actualRequests.get(0); @@ -325,7 +325,7 @@ public void updateInstanceTest() throws Exception { Instance actualResponse = client.updateInstanceAsync(updateMask, instance).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateInstanceRequest actualRequest = (UpdateInstanceRequest) actualRequests.get(0); @@ -379,7 +379,7 @@ public void deleteInstanceTest() throws Exception { Empty actualResponse = client.deleteInstanceAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteInstanceRequest actualRequest = (DeleteInstanceRequest) actualRequests.get(0); @@ -453,7 +453,7 @@ public void failoverInstanceTest() throws Exception { Instance actualResponse = client.failoverInstanceAsync(name, dataProtectionMode).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); FailoverInstanceRequest actualRequest = (FailoverInstanceRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedis.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedis.java index 5fbf49c7a1c9..a4a6ed950bf4 100644 --- a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedis.java +++ b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedis.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCloudRedis() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedisImpl.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedisImpl.java index 44131a5de186..4ef792d7ea67 100644 --- a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedisImpl.java +++ b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1/MockCloudRedisImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.redis.v1.CloudRedisGrpc.CloudRedisImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCloudRedisImpl extends CloudRedisImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCloudRedisImpl() { @@ -36,15 +36,15 @@ public MockCloudRedisImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java index 89bbeffb5bf9..63d6b02fc22c 100644 --- a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java +++ b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java @@ -27,10 +27,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -102,7 +102,7 @@ public void listInstancesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getInstancesList().get(0), resources.get(0)); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListInstancesRequest actualRequest = (ListInstancesRequest) actualRequests.get(0); @@ -166,7 +166,7 @@ public void getInstanceTest() { Instance actualResponse = client.getInstance(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceRequest actualRequest = (GetInstanceRequest) actualRequests.get(0); @@ -240,7 +240,7 @@ public void createInstanceTest() throws Exception { Instance actualResponse = client.createInstanceAsync(parent, instanceId, instance).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateInstanceRequest actualRequest = (CreateInstanceRequest) actualRequests.get(0); @@ -325,7 +325,7 @@ public void updateInstanceTest() throws Exception { Instance actualResponse = client.updateInstanceAsync(updateMask, instance).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateInstanceRequest actualRequest = (UpdateInstanceRequest) actualRequests.get(0); @@ -379,7 +379,7 @@ public void deleteInstanceTest() throws Exception { Empty actualResponse = client.deleteInstanceAsync(name).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteInstanceRequest actualRequest = (DeleteInstanceRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java index 498040646421..e9f9f3a0908a 100644 --- a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java +++ b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedis.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCloudRedis() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java index 1cd7db15e1d4..e5d26623b74c 100644 --- a/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java +++ b/google-cloud-clients/google-cloud-redis/src/test/java/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.redis.v1beta1.CloudRedisGrpc.CloudRedisImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCloudRedisImpl extends CloudRedisImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCloudRedisImpl() { @@ -36,15 +36,15 @@ public MockCloudRedisImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/CloudSchedulerClientTest.java b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/CloudSchedulerClientTest.java index 43db66530976..b2eb20f67a0b 100644 --- a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/CloudSchedulerClientTest.java +++ b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/CloudSchedulerClientTest.java @@ -25,9 +25,9 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -95,7 +95,7 @@ public void listJobsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -143,7 +143,7 @@ public void getJobTest() { Job actualResponse = client.getJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetJobRequest actualRequest = (GetJobRequest) actualRequests.get(0); @@ -192,7 +192,7 @@ public void createJobTest() { Job actualResponse = client.createJob(parent, job); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateJobRequest actualRequest = (CreateJobRequest) actualRequests.get(0); @@ -243,7 +243,7 @@ public void updateJobTest() { Job actualResponse = client.updateJob(job, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateJobRequest actualRequest = (UpdateJobRequest) actualRequests.get(0); @@ -282,7 +282,7 @@ public void deleteJobTest() { client.deleteJob(name); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0); @@ -330,7 +330,7 @@ public void pauseJobTest() { Job actualResponse = client.pauseJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); PauseJobRequest actualRequest = (PauseJobRequest) actualRequests.get(0); @@ -378,7 +378,7 @@ public void resumeJobTest() { Job actualResponse = client.resumeJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); ResumeJobRequest actualRequest = (ResumeJobRequest) actualRequests.get(0); @@ -426,7 +426,7 @@ public void runJobTest() { Job actualResponse = client.runJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); RunJobRequest actualRequest = (RunJobRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudScheduler.java b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudScheduler.java index 6b05c0207a86..3f94bf9b2e64 100644 --- a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudScheduler.java +++ b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudScheduler.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCloudScheduler() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudSchedulerImpl.java b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudSchedulerImpl.java index 51fc9cd6688f..9d3089ec6faa 100644 --- a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudSchedulerImpl.java +++ b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1/MockCloudSchedulerImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.scheduler.v1.CloudSchedulerGrpc.CloudSchedulerImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCloudSchedulerImpl extends CloudSchedulerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCloudSchedulerImpl() { @@ -36,15 +36,15 @@ public MockCloudSchedulerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/CloudSchedulerClientTest.java b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/CloudSchedulerClientTest.java index 9006ade66f42..87834a8f4d39 100644 --- a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/CloudSchedulerClientTest.java +++ b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/CloudSchedulerClientTest.java @@ -25,9 +25,9 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -95,7 +95,7 @@ public void listJobsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -143,7 +143,7 @@ public void getJobTest() { Job actualResponse = client.getJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetJobRequest actualRequest = (GetJobRequest) actualRequests.get(0); @@ -192,7 +192,7 @@ public void createJobTest() { Job actualResponse = client.createJob(parent, job); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateJobRequest actualRequest = (CreateJobRequest) actualRequests.get(0); @@ -243,7 +243,7 @@ public void updateJobTest() { Job actualResponse = client.updateJob(job, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateJobRequest actualRequest = (UpdateJobRequest) actualRequests.get(0); @@ -282,7 +282,7 @@ public void deleteJobTest() { client.deleteJob(name); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0); @@ -330,7 +330,7 @@ public void pauseJobTest() { Job actualResponse = client.pauseJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); PauseJobRequest actualRequest = (PauseJobRequest) actualRequests.get(0); @@ -378,7 +378,7 @@ public void resumeJobTest() { Job actualResponse = client.resumeJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); ResumeJobRequest actualRequest = (ResumeJobRequest) actualRequests.get(0); @@ -426,7 +426,7 @@ public void runJobTest() { Job actualResponse = client.runJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudScheduler.getRequests(); + List actualRequests = mockCloudScheduler.getRequests(); Assert.assertEquals(1, actualRequests.size()); RunJobRequest actualRequest = (RunJobRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudScheduler.java b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudScheduler.java index 499ddbaec156..3b20ee8fc107 100644 --- a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudScheduler.java +++ b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudScheduler.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCloudScheduler() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudSchedulerImpl.java b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudSchedulerImpl.java index 0f4356395a92..53688cdb96a8 100644 --- a/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudSchedulerImpl.java +++ b/google-cloud-clients/google-cloud-scheduler/src/test/java/com/google/cloud/scheduler/v1beta1/MockCloudSchedulerImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.scheduler.v1beta1.CloudSchedulerGrpc.CloudSchedulerImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCloudSchedulerImpl extends CloudSchedulerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCloudSchedulerImpl() { @@ -36,15 +36,15 @@ public MockCloudSchedulerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenter.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenter.java index 0b288e179bf5..29ce3cbe72c0 100644 --- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenter.java +++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenter.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSecurityCenter() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenterImpl.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenterImpl.java index a3390dc944c5..e94fd625b2dc 100644 --- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenterImpl.java +++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/MockSecurityCenterImpl.java @@ -23,7 +23,7 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSecurityCenterImpl extends SecurityCenterImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSecurityCenterImpl() { @@ -41,15 +41,15 @@ public MockSecurityCenterImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/SecurityCenterClientTest.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/SecurityCenterClientTest.java index cc563616f1c3..9c9f04208a3b 100644 --- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/SecurityCenterClientTest.java +++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1/SecurityCenterClientTest.java @@ -33,10 +33,10 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Timestamp; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -110,7 +110,7 @@ public void createSourceTest() { Source actualResponse = client.createSource(parent, source); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSourceRequest actualRequest = (CreateSourceRequest) actualRequests.get(0); @@ -164,7 +164,7 @@ public void createFindingTest() { Finding actualResponse = client.createFinding(parent, findingId, finding); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateFindingRequest actualRequest = (CreateFindingRequest) actualRequests.get(0); @@ -208,7 +208,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -252,7 +252,7 @@ public void getOrganizationSettingsTest() { OrganizationSettings actualResponse = client.getOrganizationSettings(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetOrganizationSettingsRequest actualRequest = (GetOrganizationSettingsRequest) actualRequests.get(0); @@ -299,7 +299,7 @@ public void getSourceTest() { Source actualResponse = client.getSource(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSourceRequest actualRequest = (GetSourceRequest) actualRequests.get(0); @@ -350,7 +350,7 @@ public void groupFindingsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getGroupByResultsList().get(0), resources.get(0)); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GroupFindingsRequest actualRequest = (GroupFindingsRequest) actualRequests.get(0); @@ -400,7 +400,7 @@ public void listSourcesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSourcesList().get(0), resources.get(0)); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSourcesRequest actualRequest = (ListSourcesRequest) actualRequests.get(0); @@ -444,7 +444,7 @@ public void runAssetDiscoveryTest() throws Exception { Empty actualResponse = client.runAssetDiscoveryAsync(parent).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); RunAssetDiscoveryRequest actualRequest = (RunAssetDiscoveryRequest) actualRequests.get(0); @@ -498,7 +498,7 @@ public void setFindingStateTest() { Finding actualResponse = client.setFindingState(name, state, startTime); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetFindingStateRequest actualRequest = (SetFindingStateRequest) actualRequests.get(0); @@ -543,7 +543,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -584,7 +584,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); @@ -636,7 +636,7 @@ public void updateFindingTest() { Finding actualResponse = client.updateFinding(finding); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateFindingRequest actualRequest = (UpdateFindingRequest) actualRequests.get(0); @@ -680,7 +680,7 @@ public void updateOrganizationSettingsTest() { OrganizationSettings actualResponse = client.updateOrganizationSettings(organizationSettings); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateOrganizationSettingsRequest actualRequest = (UpdateOrganizationSettingsRequest) actualRequests.get(0); @@ -727,7 +727,7 @@ public void updateSourceTest() { Source actualResponse = client.updateSource(source); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSourceRequest actualRequest = (UpdateSourceRequest) actualRequests.get(0); @@ -766,7 +766,7 @@ public void updateSecurityMarksTest() { SecurityMarks actualResponse = client.updateSecurityMarks(securityMarks); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSecurityMarksRequest actualRequest = (UpdateSecurityMarksRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenter.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenter.java index 5aaf4a2301e9..e12bb8124004 100644 --- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenter.java +++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenter.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSecurityCenter() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenterImpl.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenterImpl.java index 97624dddba57..14718050f05a 100644 --- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenterImpl.java +++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/MockSecurityCenterImpl.java @@ -23,7 +23,7 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSecurityCenterImpl extends SecurityCenterImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSecurityCenterImpl() { @@ -41,15 +41,15 @@ public MockSecurityCenterImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java index 74f9b0974f1a..cdf3dd639964 100644 --- a/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java +++ b/google-cloud-clients/google-cloud-securitycenter/src/test/java/com/google/cloud/securitycenter/v1beta1/SecurityCenterClientTest.java @@ -33,10 +33,10 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Timestamp; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -109,7 +109,7 @@ public void createSourceTest() { Source actualResponse = client.createSource(parent, source); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSourceRequest actualRequest = (CreateSourceRequest) actualRequests.get(0); @@ -163,7 +163,7 @@ public void createFindingTest() { Finding actualResponse = client.createFinding(parent, findingId, finding); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateFindingRequest actualRequest = (CreateFindingRequest) actualRequests.get(0); @@ -207,7 +207,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -251,7 +251,7 @@ public void getOrganizationSettingsTest() { OrganizationSettings actualResponse = client.getOrganizationSettings(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetOrganizationSettingsRequest actualRequest = (GetOrganizationSettingsRequest) actualRequests.get(0); @@ -298,7 +298,7 @@ public void getSourceTest() { Source actualResponse = client.getSource(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSourceRequest actualRequest = (GetSourceRequest) actualRequests.get(0); @@ -347,7 +347,7 @@ public void groupFindingsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getGroupByResultsList().get(0), resources.get(0)); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); GroupFindingsRequest actualRequest = (GroupFindingsRequest) actualRequests.get(0); @@ -397,7 +397,7 @@ public void listSourcesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSourcesList().get(0), resources.get(0)); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSourcesRequest actualRequest = (ListSourcesRequest) actualRequests.get(0); @@ -441,7 +441,7 @@ public void runAssetDiscoveryTest() throws Exception { Empty actualResponse = client.runAssetDiscoveryAsync(parent).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); RunAssetDiscoveryRequest actualRequest = (RunAssetDiscoveryRequest) actualRequests.get(0); @@ -495,7 +495,7 @@ public void setFindingStateTest() { Finding actualResponse = client.setFindingState(name, state, startTime); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetFindingStateRequest actualRequest = (SetFindingStateRequest) actualRequests.get(0); @@ -540,7 +540,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -581,7 +581,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); @@ -633,7 +633,7 @@ public void updateFindingTest() { Finding actualResponse = client.updateFinding(finding); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateFindingRequest actualRequest = (UpdateFindingRequest) actualRequests.get(0); @@ -677,7 +677,7 @@ public void updateOrganizationSettingsTest() { OrganizationSettings actualResponse = client.updateOrganizationSettings(organizationSettings); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateOrganizationSettingsRequest actualRequest = (UpdateOrganizationSettingsRequest) actualRequests.get(0); @@ -724,7 +724,7 @@ public void updateSourceTest() { Source actualResponse = client.updateSource(source); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSourceRequest actualRequest = (UpdateSourceRequest) actualRequests.get(0); @@ -763,7 +763,7 @@ public void updateSecurityMarksTest() { SecurityMarks actualResponse = client.updateSecurityMarks(securityMarks); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSecurityCenter.getRequests(); + List actualRequests = mockSecurityCenter.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSecurityMarksRequest actualRequest = (UpdateSecurityMarksRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java index 0029cba4dfe9..36be82483c63 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java @@ -32,10 +32,10 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.spanner.admin.database.v1.CreateDatabaseRequest; import com.google.spanner.admin.database.v1.Database; import com.google.spanner.admin.database.v1.DatabaseName; @@ -119,7 +119,7 @@ public void listDatabasesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getDatabasesList().get(0), resources.get(0)); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListDatabasesRequest actualRequest = (ListDatabasesRequest) actualRequests.get(0); @@ -165,7 +165,7 @@ public void createDatabaseTest() throws Exception { Database actualResponse = client.createDatabaseAsync(parent, createStatement).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateDatabaseRequest actualRequest = (CreateDatabaseRequest) actualRequests.get(0); @@ -208,7 +208,7 @@ public void getDatabaseTest() { Database actualResponse = client.getDatabase(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDatabaseRequest actualRequest = (GetDatabaseRequest) actualRequests.get(0); @@ -253,7 +253,7 @@ public void updateDatabaseDdlTest() throws Exception { Empty actualResponse = client.updateDatabaseDdlAsync(database, statements).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateDatabaseDdlRequest actualRequest = (UpdateDatabaseDdlRequest) actualRequests.get(0); @@ -294,7 +294,7 @@ public void dropDatabaseTest() { client.dropDatabase(database); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DropDatabaseRequest actualRequest = (DropDatabaseRequest) actualRequests.get(0); @@ -332,7 +332,7 @@ public void getDatabaseDdlTest() { GetDatabaseDdlResponse actualResponse = client.getDatabaseDdl(database); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetDatabaseDdlRequest actualRequest = (GetDatabaseDdlRequest) actualRequests.get(0); @@ -373,7 +373,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(formattedResource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -415,7 +415,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(formattedResource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -455,7 +455,7 @@ public void testIamPermissionsTest() { client.testIamPermissions(formattedResource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockDatabaseAdmin.getRequests(); + List actualRequests = mockDatabaseAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java index cac9113dfcdb..343b31e4420e 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdmin.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockDatabaseAdmin() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java index 68801fd5989f..9f386abd9f18 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/MockDatabaseAdminImpl.java @@ -22,8 +22,8 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.spanner.admin.database.v1.CreateDatabaseRequest; import com.google.spanner.admin.database.v1.Database; import com.google.spanner.admin.database.v1.DatabaseAdminGrpc.DatabaseAdminImplBase; @@ -43,7 +43,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockDatabaseAdminImpl extends DatabaseAdminImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockDatabaseAdminImpl() { @@ -51,15 +51,15 @@ public MockDatabaseAdminImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java index 5ff0700f7b48..b916eb76346c 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java @@ -33,11 +33,11 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import com.google.spanner.admin.instance.v1.CreateInstanceRequest; import com.google.spanner.admin.instance.v1.DeleteInstanceRequest; import com.google.spanner.admin.instance.v1.GetInstanceConfigRequest; @@ -124,7 +124,7 @@ public void listInstanceConfigsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getInstanceConfigsList().get(0), resources.get(0)); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListInstanceConfigsRequest actualRequest = (ListInstanceConfigsRequest) actualRequests.get(0); @@ -165,7 +165,7 @@ public void getInstanceConfigTest() { InstanceConfig actualResponse = client.getInstanceConfig(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceConfigRequest actualRequest = (GetInstanceConfigRequest) actualRequests.get(0); @@ -213,7 +213,7 @@ public void listInstancesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getInstancesList().get(0), resources.get(0)); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListInstancesRequest actualRequest = (ListInstancesRequest) actualRequests.get(0); @@ -261,7 +261,7 @@ public void getInstanceTest() { Instance actualResponse = client.getInstance(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceRequest actualRequest = (GetInstanceRequest) actualRequests.get(0); @@ -317,7 +317,7 @@ public void createInstanceTest() throws Exception { Instance actualResponse = client.createInstanceAsync(parent, instanceId, instance).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateInstanceRequest actualRequest = (CreateInstanceRequest) actualRequests.get(0); @@ -378,7 +378,7 @@ public void updateInstanceTest() throws Exception { Instance actualResponse = client.updateInstanceAsync(instance, fieldMask).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateInstanceRequest actualRequest = (UpdateInstanceRequest) actualRequests.get(0); @@ -419,7 +419,7 @@ public void deleteInstanceTest() { client.deleteInstance(name); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteInstanceRequest actualRequest = (DeleteInstanceRequest) actualRequests.get(0); @@ -460,7 +460,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(formattedResource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -502,7 +502,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(formattedResource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -542,7 +542,7 @@ public void testIamPermissionsTest() { client.testIamPermissions(formattedResource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockInstanceAdmin.getRequests(); + List actualRequests = mockInstanceAdmin.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java index cd133a6c5b69..4863194f826b 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdmin.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockInstanceAdmin() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java index d10baae76bb2..65e63c003099 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/MockInstanceAdminImpl.java @@ -22,8 +22,8 @@ import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.spanner.admin.instance.v1.CreateInstanceRequest; import com.google.spanner.admin.instance.v1.DeleteInstanceRequest; import com.google.spanner.admin.instance.v1.GetInstanceConfigRequest; @@ -45,7 +45,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockInstanceAdminImpl extends InstanceAdminImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockInstanceAdminImpl() { @@ -53,15 +53,15 @@ public MockInstanceAdminImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java index f42d81bd02ca..e958fe85f529 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpanner.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSpanner() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java index 1fc3105bca43..344b248ef736 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/MockSpannerImpl.java @@ -16,8 +16,8 @@ package com.google.cloud.spanner.v1; import com.google.api.core.BetaApi; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.spanner.v1.BeginTransactionRequest; import com.google.spanner.v1.CommitRequest; import com.google.spanner.v1.CommitResponse; @@ -48,7 +48,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSpannerImpl extends SpannerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSpannerImpl() { @@ -56,15 +56,15 @@ public MockSpannerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java index 2abf41b56a38..bce486411815 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java @@ -28,9 +28,9 @@ import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import com.google.spanner.v1.BeginTransactionRequest; import com.google.spanner.v1.CommitRequest; import com.google.spanner.v1.CommitResponse; @@ -113,7 +113,7 @@ public void createSessionTest() { Session actualResponse = client.createSession(database); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSessionRequest actualRequest = (CreateSessionRequest) actualRequests.get(0); @@ -152,7 +152,7 @@ public void getSessionTest() { Session actualResponse = client.getSession(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSessionRequest actualRequest = (GetSessionRequest) actualRequests.get(0); @@ -200,7 +200,7 @@ public void listSessionsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSessionsList().get(0), resources.get(0)); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSessionsRequest actualRequest = (ListSessionsRequest) actualRequests.get(0); @@ -237,7 +237,7 @@ public void deleteSessionTest() { client.deleteSession(name); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSessionRequest actualRequest = (DeleteSessionRequest) actualRequests.get(0); @@ -397,7 +397,7 @@ public void beginTransactionTest() { Transaction actualResponse = client.beginTransaction(session, options); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); BeginTransactionRequest actualRequest = (BeginTransactionRequest) actualRequests.get(0); @@ -439,7 +439,7 @@ public void commitTest() { CommitResponse actualResponse = client.commit(session, transactionId, mutations); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); CommitRequest actualRequest = (CommitRequest) actualRequests.get(0); @@ -483,7 +483,7 @@ public void commitTest2() { CommitResponse actualResponse = client.commit(session, singleUseTransaction, mutations); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); CommitRequest actualRequest = (CommitRequest) actualRequests.get(0); @@ -525,7 +525,7 @@ public void rollbackTest() { client.rollback(session, transactionId); - List actualRequests = mockSpanner.getRequests(); + List actualRequests = mockSpanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); RollbackRequest actualRequest = (RollbackRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java index 414c5386d483..cad60e664dbe 100644 --- a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java +++ b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSpeech() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java index 9b7868a8b0b7..04f61527f089 100644 --- a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java +++ b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.speech.v1.SpeechGrpc.SpeechImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSpeechImpl extends SpeechImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSpeechImpl() { @@ -36,15 +36,15 @@ public MockSpeechImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java index c224f6b173eb..2e22804afde5 100644 --- a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java +++ b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java @@ -27,8 +27,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -100,7 +100,7 @@ public void recognizeTest() { RecognizeResponse actualResponse = client.recognize(config, audio); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpeech.getRequests(); + List actualRequests = mockSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); RecognizeRequest actualRequest = (RecognizeRequest) actualRequests.get(0); @@ -167,7 +167,7 @@ public void longRunningRecognizeTest() throws Exception { client.longRunningRecognizeAsync(config, audio).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpeech.getRequests(); + List actualRequests = mockSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); LongRunningRecognizeRequest actualRequest = (LongRunningRecognizeRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java index ca68f5406235..0ea7834e983e 100644 --- a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java +++ b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeech.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockSpeech() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java index 906b3fa88402..a4ab25950a2f 100644 --- a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java +++ b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/MockSpeechImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.speech.v1p1beta1.SpeechGrpc.SpeechImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockSpeechImpl extends SpeechImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockSpeechImpl() { @@ -36,15 +36,15 @@ public MockSpeechImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java index 80c9fab5f1a5..7a7ff50697c2 100644 --- a/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java +++ b/google-cloud-clients/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechClientTest.java @@ -27,8 +27,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -100,7 +100,7 @@ public void recognizeTest() { RecognizeResponse actualResponse = client.recognize(config, audio); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpeech.getRequests(); + List actualRequests = mockSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); RecognizeRequest actualRequest = (RecognizeRequest) actualRequests.get(0); @@ -167,7 +167,7 @@ public void longRunningRecognizeTest() throws Exception { client.longRunningRecognizeAsync(config, audio).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSpeech.getRequests(); + List actualRequests = mockSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); LongRunningRecognizeRequest actualRequest = (LongRunningRecognizeRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java index 2eba9e147643..d757f2f5a070 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -126,7 +126,7 @@ public void createApplicationTest() { Application actualResponse = client.createApplication(parent, application); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockApplicationService.getRequests(); + List actualRequests = mockApplicationService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateApplicationRequest actualRequest = (CreateApplicationRequest) actualRequests.get(0); @@ -184,7 +184,7 @@ public void getApplicationTest() { Application actualResponse = client.getApplication(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockApplicationService.getRequests(); + List actualRequests = mockApplicationService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetApplicationRequest actualRequest = (GetApplicationRequest) actualRequests.get(0); @@ -240,7 +240,7 @@ public void updateApplicationTest() { Application actualResponse = client.updateApplication(application); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockApplicationService.getRequests(); + List actualRequests = mockApplicationService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateApplicationRequest actualRequest = (UpdateApplicationRequest) actualRequests.get(0); @@ -278,7 +278,7 @@ public void deleteApplicationTest() { client.deleteApplication(name); - List actualRequests = mockApplicationService.getRequests(); + List actualRequests = mockApplicationService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteApplicationRequest actualRequest = (DeleteApplicationRequest) actualRequests.get(0); @@ -327,7 +327,7 @@ public void listApplicationsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getApplicationsList().get(0), resources.get(0)); - List actualRequests = mockApplicationService.getRequests(); + List actualRequests = mockApplicationService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListApplicationsRequest actualRequest = (ListApplicationsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java index 624170315d59..4c5f035246e1 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -131,7 +131,7 @@ public void createCompanyTest() { Company actualResponse = client.createCompany(parent, company); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompanyService.getRequests(); + List actualRequests = mockCompanyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateCompanyRequest actualRequest = (CreateCompanyRequest) actualRequests.get(0); @@ -193,7 +193,7 @@ public void getCompanyTest() { Company actualResponse = client.getCompany(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompanyService.getRequests(); + List actualRequests = mockCompanyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetCompanyRequest actualRequest = (GetCompanyRequest) actualRequests.get(0); @@ -253,7 +253,7 @@ public void updateCompanyTest() { Company actualResponse = client.updateCompany(company); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompanyService.getRequests(); + List actualRequests = mockCompanyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateCompanyRequest actualRequest = (UpdateCompanyRequest) actualRequests.get(0); @@ -290,7 +290,7 @@ public void deleteCompanyTest() { client.deleteCompany(name); - List actualRequests = mockCompanyService.getRequests(); + List actualRequests = mockCompanyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteCompanyRequest actualRequest = (DeleteCompanyRequest) actualRequests.get(0); @@ -338,7 +338,7 @@ public void listCompaniesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getCompaniesList().get(0), resources.get(0)); - List actualRequests = mockCompanyService.getRequests(); + List actualRequests = mockCompanyService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListCompaniesRequest actualRequest = (ListCompaniesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/EventServiceClientTest.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/EventServiceClientTest.java index 2f52d39f1f2d..28b9a39be851 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/EventServiceClientTest.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/EventServiceClientTest.java @@ -22,7 +22,7 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -113,7 +113,7 @@ public void createClientEventTest() { ClientEvent actualResponse = client.createClientEvent(parent, clientEvent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEventService.getRequests(); + List actualRequests = mockEventService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateClientEventRequest actualRequest = (CreateClientEventRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java index 645ff4742c80..7c46187ec179 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -135,7 +135,7 @@ public void createJobTest() { Job actualResponse = client.createJob(parent, job); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobService.getRequests(); + List actualRequests = mockJobService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateJobRequest actualRequest = (CreateJobRequest) actualRequests.get(0); @@ -201,7 +201,7 @@ public void getJobTest() { Job actualResponse = client.getJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobService.getRequests(); + List actualRequests = mockJobService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetJobRequest actualRequest = (GetJobRequest) actualRequests.get(0); @@ -265,7 +265,7 @@ public void updateJobTest() { Job actualResponse = client.updateJob(job); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockJobService.getRequests(); + List actualRequests = mockJobService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateJobRequest actualRequest = (UpdateJobRequest) actualRequests.get(0); @@ -302,7 +302,7 @@ public void deleteJobTest() { client.deleteJob(name); - List actualRequests = mockJobService.getRequests(); + List actualRequests = mockJobService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0); @@ -348,7 +348,7 @@ public void listJobsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getJobsList().get(0), resources.get(0)); - List actualRequests = mockJobService.getRequests(); + List actualRequests = mockJobService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListJobsRequest actualRequest = (ListJobsRequest) actualRequests.get(0); @@ -388,7 +388,7 @@ public void batchDeleteJobsTest() { client.batchDeleteJobs(parent, filter); - List actualRequests = mockJobService.getRequests(); + List actualRequests = mockJobService.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchDeleteJobsRequest actualRequest = (BatchDeleteJobsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationService.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationService.java index 764132fa5a2b..d4662efeace8 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationService.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockApplicationService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationServiceImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationServiceImpl.java index fa3b3bf6c37f..62c5ab3fa40e 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationServiceImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockApplicationServiceImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.ApplicationServiceGrpc.ApplicationServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockApplicationServiceImpl extends ApplicationServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockApplicationServiceImpl() { @@ -36,15 +36,15 @@ public MockApplicationServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyService.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyService.java index 486157eb0444..9b336f5a4305 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyService.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCompanyService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyServiceImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyServiceImpl.java index 2aa65fade100..6d12a90a741e 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyServiceImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompanyServiceImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.CompanyServiceGrpc.CompanyServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCompanyServiceImpl extends CompanyServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCompanyServiceImpl() { @@ -36,15 +36,15 @@ public MockCompanyServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletion.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletion.java index fb932934b36e..db53051b3ecf 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletion.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletion.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCompletion() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletionImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletionImpl.java index dd9ce13c6689..3d42e537458a 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletionImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockCompletionImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.CompletionGrpc.CompletionImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCompletionImpl extends CompletionImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCompletionImpl() { @@ -35,15 +35,15 @@ public MockCompletionImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventService.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventService.java index d3ff2ae24c03..450a9fc25686 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventService.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockEventService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventServiceImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventServiceImpl.java index 33edc4e1bbb0..886f3fe82774 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventServiceImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockEventServiceImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.EventServiceGrpc.EventServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockEventServiceImpl extends EventServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockEventServiceImpl() { @@ -35,15 +35,15 @@ public MockEventServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobService.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobService.java index b2627ec50436..3c04e6a34103 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobService.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockJobService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobServiceImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobServiceImpl.java index 8bde932a8deb..c2b6f83b12da 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobServiceImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockJobServiceImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.JobServiceGrpc.JobServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockJobServiceImpl extends JobServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockJobServiceImpl() { @@ -36,15 +36,15 @@ public MockJobServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileService.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileService.java index ac7562ebe9b4..fa5ba26a95e6 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileService.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockProfileService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileServiceImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileServiceImpl.java index 9f29331ef48e..a6a27e5ed875 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileServiceImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockProfileServiceImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.ProfileServiceGrpc.ProfileServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProfileServiceImpl extends ProfileServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockProfileServiceImpl() { @@ -36,15 +36,15 @@ public MockProfileServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantService.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantService.java index cd1ee604db7f..f1878638df56 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantService.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockTenantService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantServiceImpl.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantServiceImpl.java index 90afb0cad258..a58d1ffdee64 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantServiceImpl.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/MockTenantServiceImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.talent.v4beta1.TenantServiceGrpc.TenantServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockTenantServiceImpl extends TenantServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockTenantServiceImpl() { @@ -36,15 +36,15 @@ public MockTenantServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java index 8bf0ecc8430f..30e0d8b487b3 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -118,7 +118,7 @@ public void listProfilesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProfilesList().get(0), resources.get(0)); - List actualRequests = mockProfileService.getRequests(); + List actualRequests = mockProfileService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProfilesRequest actualRequest = (ListProfilesRequest) actualRequests.get(0); @@ -175,7 +175,7 @@ public void createProfileTest() { Profile actualResponse = client.createProfile(parent, profile); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProfileService.getRequests(); + List actualRequests = mockProfileService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProfileRequest actualRequest = (CreateProfileRequest) actualRequests.get(0); @@ -233,7 +233,7 @@ public void getProfileTest() { Profile actualResponse = client.getProfile(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProfileService.getRequests(); + List actualRequests = mockProfileService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProfileRequest actualRequest = (GetProfileRequest) actualRequests.get(0); @@ -289,7 +289,7 @@ public void updateProfileTest() { Profile actualResponse = client.updateProfile(profile); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProfileService.getRequests(); + List actualRequests = mockProfileService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProfileRequest actualRequest = (UpdateProfileRequest) actualRequests.get(0); @@ -326,7 +326,7 @@ public void deleteProfileTest() { client.deleteProfile(name); - List actualRequests = mockProfileService.getRequests(); + List actualRequests = mockProfileService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProfileRequest actualRequest = (DeleteProfileRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java index ce0656e13b8c..d176894a5afb 100644 --- a/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java +++ b/google-cloud-clients/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java @@ -25,8 +25,8 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -112,7 +112,7 @@ public void createTenantTest() { Tenant actualResponse = client.createTenant(parent, tenant); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTenantService.getRequests(); + List actualRequests = mockTenantService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTenantRequest actualRequest = (CreateTenantRequest) actualRequests.get(0); @@ -155,7 +155,7 @@ public void getTenantTest() { Tenant actualResponse = client.getTenant(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTenantService.getRequests(); + List actualRequests = mockTenantService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTenantRequest actualRequest = (GetTenantRequest) actualRequests.get(0); @@ -196,7 +196,7 @@ public void updateTenantTest() { Tenant actualResponse = client.updateTenant(tenant); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTenantService.getRequests(); + List actualRequests = mockTenantService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateTenantRequest actualRequest = (UpdateTenantRequest) actualRequests.get(0); @@ -233,7 +233,7 @@ public void deleteTenantTest() { client.deleteTenant(name); - List actualRequests = mockTenantService.getRequests(); + List actualRequests = mockTenantService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTenantRequest actualRequest = (DeleteTenantRequest) actualRequests.get(0); @@ -281,7 +281,7 @@ public void listTenantsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTenantsList().get(0), resources.get(0)); - List actualRequests = mockTenantService.getRequests(); + List actualRequests = mockTenantService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTenantsRequest actualRequest = (ListTenantsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/CloudTasksClientTest.java b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/CloudTasksClientTest.java index 66dba4580794..51f5c428ddce 100644 --- a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/CloudTasksClientTest.java +++ b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/CloudTasksClientTest.java @@ -31,11 +31,11 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Duration; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.Timestamp; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -109,7 +109,7 @@ public void listQueuesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getQueuesList().get(0), resources.get(0)); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListQueuesRequest actualRequest = (ListQueuesRequest) actualRequests.get(0); @@ -148,7 +148,7 @@ public void getQueueTest() { Queue actualResponse = client.getQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetQueueRequest actualRequest = (GetQueueRequest) actualRequests.get(0); @@ -188,7 +188,7 @@ public void createQueueTest() { Queue actualResponse = client.createQueue(parent, queue); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateQueueRequest actualRequest = (CreateQueueRequest) actualRequests.get(0); @@ -230,7 +230,7 @@ public void updateQueueTest() { Queue actualResponse = client.updateQueue(queue, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateQueueRequest actualRequest = (UpdateQueueRequest) actualRequests.get(0); @@ -269,7 +269,7 @@ public void deleteQueueTest() { client.deleteQueue(name); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteQueueRequest actualRequest = (DeleteQueueRequest) actualRequests.get(0); @@ -308,7 +308,7 @@ public void purgeQueueTest() { Queue actualResponse = client.purgeQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); PurgeQueueRequest actualRequest = (PurgeQueueRequest) actualRequests.get(0); @@ -347,7 +347,7 @@ public void pauseQueueTest() { Queue actualResponse = client.pauseQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); PauseQueueRequest actualRequest = (PauseQueueRequest) actualRequests.get(0); @@ -386,7 +386,7 @@ public void resumeQueueTest() { Queue actualResponse = client.resumeQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); ResumeQueueRequest actualRequest = (ResumeQueueRequest) actualRequests.get(0); @@ -426,7 +426,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -467,7 +467,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -508,7 +508,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); @@ -555,7 +555,7 @@ public void listTasksTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTasksList().get(0), resources.get(0)); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTasksRequest actualRequest = (ListTasksRequest) actualRequests.get(0); @@ -594,7 +594,7 @@ public void getTaskTest() { Task actualResponse = client.getTask(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTaskRequest actualRequest = (GetTaskRequest) actualRequests.get(0); @@ -634,7 +634,7 @@ public void createTaskTest() { Task actualResponse = client.createTask(parent, task); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTaskRequest actualRequest = (CreateTaskRequest) actualRequests.get(0); @@ -673,7 +673,7 @@ public void deleteTaskTest() { client.deleteTask(name); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTaskRequest actualRequest = (DeleteTaskRequest) actualRequests.get(0); @@ -711,7 +711,7 @@ public void acknowledgeTaskTest() { client.acknowledgeTask(name, scheduleTime); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); AcknowledgeTaskRequest actualRequest = (AcknowledgeTaskRequest) actualRequests.get(0); @@ -754,7 +754,7 @@ public void renewLeaseTest() { Task actualResponse = client.renewLease(name, scheduleTime, leaseDuration); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); RenewLeaseRequest actualRequest = (RenewLeaseRequest) actualRequests.get(0); @@ -798,7 +798,7 @@ public void cancelLeaseTest() { Task actualResponse = client.cancelLease(name, scheduleTime); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); CancelLeaseRequest actualRequest = (CancelLeaseRequest) actualRequests.get(0); @@ -839,7 +839,7 @@ public void runTaskTest() { Task actualResponse = client.runTask(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); RunTaskRequest actualRequest = (RunTaskRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasks.java b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasks.java index 72ba188c5973..5d7f6c8e2262 100644 --- a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasks.java +++ b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasks.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCloudTasks() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasksImpl.java b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasksImpl.java index 5d6be4d7b236..bdaa3e1cf91d 100644 --- a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasksImpl.java +++ b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/MockCloudTasksImpl.java @@ -22,8 +22,8 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCloudTasksImpl extends CloudTasksImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCloudTasksImpl() { @@ -41,15 +41,15 @@ public MockCloudTasksImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksClientTest.java b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksClientTest.java index fadd4eda983e..778e95d210db 100644 --- a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksClientTest.java +++ b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksClientTest.java @@ -31,10 +31,10 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -107,7 +107,7 @@ public void listQueuesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getQueuesList().get(0), resources.get(0)); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListQueuesRequest actualRequest = (ListQueuesRequest) actualRequests.get(0); @@ -146,7 +146,7 @@ public void getQueueTest() { Queue actualResponse = client.getQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetQueueRequest actualRequest = (GetQueueRequest) actualRequests.get(0); @@ -186,7 +186,7 @@ public void createQueueTest() { Queue actualResponse = client.createQueue(parent, queue); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateQueueRequest actualRequest = (CreateQueueRequest) actualRequests.get(0); @@ -228,7 +228,7 @@ public void updateQueueTest() { Queue actualResponse = client.updateQueue(queue, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateQueueRequest actualRequest = (UpdateQueueRequest) actualRequests.get(0); @@ -267,7 +267,7 @@ public void deleteQueueTest() { client.deleteQueue(name); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteQueueRequest actualRequest = (DeleteQueueRequest) actualRequests.get(0); @@ -306,7 +306,7 @@ public void purgeQueueTest() { Queue actualResponse = client.purgeQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); PurgeQueueRequest actualRequest = (PurgeQueueRequest) actualRequests.get(0); @@ -345,7 +345,7 @@ public void pauseQueueTest() { Queue actualResponse = client.pauseQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); PauseQueueRequest actualRequest = (PauseQueueRequest) actualRequests.get(0); @@ -384,7 +384,7 @@ public void resumeQueueTest() { Queue actualResponse = client.resumeQueue(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); ResumeQueueRequest actualRequest = (ResumeQueueRequest) actualRequests.get(0); @@ -424,7 +424,7 @@ public void getIamPolicyTest() { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = (GetIamPolicyRequest) actualRequests.get(0); @@ -465,7 +465,7 @@ public void setIamPolicyTest() { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = (SetIamPolicyRequest) actualRequests.get(0); @@ -506,7 +506,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = (TestIamPermissionsRequest) actualRequests.get(0); @@ -553,7 +553,7 @@ public void listTasksTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTasksList().get(0), resources.get(0)); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTasksRequest actualRequest = (ListTasksRequest) actualRequests.get(0); @@ -599,7 +599,7 @@ public void getTaskTest() { Task actualResponse = client.getTask(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTaskRequest actualRequest = (GetTaskRequest) actualRequests.get(0); @@ -646,7 +646,7 @@ public void createTaskTest() { Task actualResponse = client.createTask(parent, task); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateTaskRequest actualRequest = (CreateTaskRequest) actualRequests.get(0); @@ -685,7 +685,7 @@ public void deleteTaskTest() { client.deleteTask(name); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTaskRequest actualRequest = (DeleteTaskRequest) actualRequests.get(0); @@ -731,7 +731,7 @@ public void runTaskTest() { Task actualResponse = client.runTask(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudTasks.getRequests(); + List actualRequests = mockCloudTasks.getRequests(); Assert.assertEquals(1, actualRequests.size()); RunTaskRequest actualRequest = (RunTaskRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasks.java b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasks.java index 6f5538031acc..0433dc6ef354 100644 --- a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasks.java +++ b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasks.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockCloudTasks() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasksImpl.java b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasksImpl.java index e4c20cc470fc..0ec40d40ad57 100644 --- a/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasksImpl.java +++ b/google-cloud-clients/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/MockCloudTasksImpl.java @@ -22,8 +22,8 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockCloudTasksImpl extends CloudTasksImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockCloudTasksImpl() { @@ -41,15 +41,15 @@ public MockCloudTasksImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java index 5dc823e8e109..44e8fc1f98be 100644 --- a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java +++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeech.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockTextToSpeech() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java index 55b62431c806..11db5fb2182e 100644 --- a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java +++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/MockTextToSpeechImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.texttospeech.v1.TextToSpeechGrpc.TextToSpeechImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockTextToSpeechImpl extends TextToSpeechImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockTextToSpeechImpl() { @@ -35,15 +35,15 @@ public MockTextToSpeechImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java index 43a7597d9622..052e22023cf2 100644 --- a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java +++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java @@ -22,8 +22,8 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -84,7 +84,7 @@ public void listVoicesTest() { ListVoicesResponse actualResponse = client.listVoices(languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTextToSpeech.getRequests(); + List actualRequests = mockTextToSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListVoicesRequest actualRequest = (ListVoicesRequest) actualRequests.get(0); @@ -126,7 +126,7 @@ public void synthesizeSpeechTest() { SynthesizeSpeechResponse actualResponse = client.synthesizeSpeech(input, voice, audioConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTextToSpeech.getRequests(); + List actualRequests = mockTextToSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); SynthesizeSpeechRequest actualRequest = (SynthesizeSpeechRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java index 4a56e5940bbc..444402731221 100644 --- a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java +++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeech.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockTextToSpeech() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java index 29e3479be36a..44127c48d6cc 100644 --- a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java +++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/MockTextToSpeechImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.texttospeech.v1beta1.TextToSpeechGrpc.TextToSpeechImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockTextToSpeechImpl extends TextToSpeechImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockTextToSpeechImpl() { @@ -35,15 +35,15 @@ public MockTextToSpeechImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java index 73ec948db37a..6afd5805546f 100644 --- a/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java +++ b/google-cloud-clients/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java @@ -22,8 +22,8 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -84,7 +84,7 @@ public void listVoicesTest() { ListVoicesResponse actualResponse = client.listVoices(languageCode); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTextToSpeech.getRequests(); + List actualRequests = mockTextToSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListVoicesRequest actualRequest = (ListVoicesRequest) actualRequests.get(0); @@ -126,7 +126,7 @@ public void synthesizeSpeechTest() { SynthesizeSpeechResponse actualResponse = client.synthesizeSpeech(input, voice, audioConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTextToSpeech.getRequests(); + List actualRequests = mockTextToSpeech.getRequests(); Assert.assertEquals(1, actualRequests.size()); SynthesizeSpeechRequest actualRequest = (SynthesizeSpeechRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java index 978ac9f2c6b5..5ac29eeffd55 100644 --- a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java +++ b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockTraceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java index f9e4a68b7ca5..707ea863ac9a 100644 --- a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java +++ b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java @@ -22,8 +22,8 @@ import com.google.devtools.cloudtrace.v1.PatchTracesRequest; import com.google.devtools.cloudtrace.v1.Trace; import com.google.devtools.cloudtrace.v1.TraceServiceGrpc.TraceServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockTraceServiceImpl extends TraceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockTraceServiceImpl() { @@ -41,15 +41,15 @@ public MockTraceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java index 401e5d498e9c..de0ce912622b 100644 --- a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java @@ -31,8 +31,8 @@ import com.google.devtools.cloudtrace.v1.PatchTracesRequest; import com.google.devtools.cloudtrace.v1.Trace; import com.google.devtools.cloudtrace.v1.Traces; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -93,7 +93,7 @@ public void patchTracesTest() { client.patchTraces(projectId, traces); - List actualRequests = mockTraceService.getRequests(); + List actualRequests = mockTraceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); PatchTracesRequest actualRequest = (PatchTracesRequest) actualRequests.get(0); @@ -137,7 +137,7 @@ public void getTraceTest() { Trace actualResponse = client.getTrace(projectId, traceId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTraceService.getRequests(); + List actualRequests = mockTraceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTraceRequest actualRequest = (GetTraceRequest) actualRequests.get(0); @@ -187,7 +187,7 @@ public void listTracesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTracesList().get(0), resources.get(0)); - List actualRequests = mockTraceService.getRequests(); + List actualRequests = mockTraceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTracesRequest actualRequest = (ListTracesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java index f51dcb39fce0..b53e16c10da7 100644 --- a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java +++ b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockTraceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java index 8c560281a458..986591d5531e 100644 --- a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java +++ b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/MockTraceServiceImpl.java @@ -19,8 +19,8 @@ import com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest; import com.google.devtools.cloudtrace.v2.Span; import com.google.devtools.cloudtrace.v2.TraceServiceGrpc.TraceServiceImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -30,7 +30,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockTraceServiceImpl extends TraceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockTraceServiceImpl() { @@ -38,15 +38,15 @@ public MockTraceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java index e4358c46d04e..ecee1c713bb9 100644 --- a/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-trace/src/test/java/com/google/cloud/trace/v2/TraceServiceClientTest.java @@ -25,8 +25,8 @@ import com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest; import com.google.devtools.cloudtrace.v2.ProjectName; import com.google.devtools.cloudtrace.v2.Span; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -88,7 +88,7 @@ public void batchWriteSpansTest() { client.batchWriteSpans(name, spans); - List actualRequests = mockTraceService.getRequests(); + List actualRequests = mockTraceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchWriteSpansRequest actualRequest = (BatchWriteSpansRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java index 6b5aa22f6f42..5448c9160141 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java index 7e74fd9ecf8b..469b3e6bfefd 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/MockVideoIntelligenceServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockVideoIntelligenceServiceImpl extends VideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java index 492e49879d3e..5e380f4e3171 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -96,7 +96,7 @@ public void annotateVideoTest() throws Exception { AnnotateVideoResponse actualResponse = client.annotateVideoAsync(inputUri, features).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockVideoIntelligenceService.getRequests(); + List actualRequests = mockVideoIntelligenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateVideoRequest actualRequest = (AnnotateVideoRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java index 4e858b37b6de..d4c8ff2efa53 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java index 51889d034b44..efc253e9fc1e 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockVideoIntelligenceServiceImpl extends VideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java index 66d618a46a94..ad6916b3f3bd 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -96,7 +96,7 @@ public void annotateVideoTest() throws Exception { AnnotateVideoResponse actualResponse = client.annotateVideoAsync(inputUri, features).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockVideoIntelligenceService.getRequests(); + List actualRequests = mockVideoIntelligenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateVideoRequest actualRequest = (AnnotateVideoRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java index bb03ece5e6e0..a9e4d503f767 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java index 60764e5a84a1..6c17eeb0e583 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/MockVideoIntelligenceServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockVideoIntelligenceServiceImpl extends VideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java index b47a000ed88f..1c168a939e61 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -96,7 +96,7 @@ public void annotateVideoTest() throws Exception { AnnotateVideoResponse actualResponse = client.annotateVideoAsync(inputUri, features).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockVideoIntelligenceService.getRequests(); + List actualRequests = mockVideoIntelligenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateVideoRequest actualRequest = (AnnotateVideoRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java index 3778f059676e..88ad1965e662 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java index d240ff33aa52..6192202c72cd 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/MockVideoIntelligenceServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockVideoIntelligenceServiceImpl extends VideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java index c2079951732c..4e3947185e89 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -96,7 +96,7 @@ public void annotateVideoTest() throws Exception { AnnotateVideoResponse actualResponse = client.annotateVideoAsync(inputUri, features).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockVideoIntelligenceService.getRequests(); + List actualRequests = mockVideoIntelligenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateVideoRequest actualRequest = (AnnotateVideoRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceService.java index 094e0833cd6e..4855dfae19de 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceServiceImpl.java index 865f6cf9dec2..f98577a6bd98 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/MockVideoIntelligenceServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1p2beta1.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockVideoIntelligenceServiceImpl extends VideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/VideoIntelligenceServiceClientTest.java index 7491ce824d93..a3cd2bc3a818 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p2beta1/VideoIntelligenceServiceClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -96,7 +96,7 @@ public void annotateVideoTest() throws Exception { AnnotateVideoResponse actualResponse = client.annotateVideoAsync(inputUri, features).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockVideoIntelligenceService.getRequests(); + List actualRequests = mockVideoIntelligenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateVideoRequest actualRequest = (AnnotateVideoRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceService.java index cb31e97325f4..8c9916070036 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockStreamingVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceServiceImpl.java index 1f57cd15f2d8..1738b6211989 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockStreamingVideoIntelligenceServiceImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1p3beta1.StreamingVideoIntelligenceServiceGrpc.StreamingVideoIntelligenceServiceImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @BetaApi public class MockStreamingVideoIntelligenceServiceImpl extends StreamingVideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockStreamingVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockStreamingVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceService.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceService.java index 3fa2e6af91a2..b735b012ec33 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceService.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceService.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockVideoIntelligenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceServiceImpl.java index 62dce68db766..c7925da88be4 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/MockVideoIntelligenceServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockVideoIntelligenceServiceImpl extends VideoIntelligenceServiceImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockVideoIntelligenceServiceImpl() { @@ -36,15 +36,15 @@ public MockVideoIntelligenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/VideoIntelligenceServiceClientTest.java index 23fe7cc06e58..beb05ee946b7 100644 --- a/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-clients/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1p3beta1/VideoIntelligenceServiceClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -100,7 +100,7 @@ public void annotateVideoTest() throws Exception { AnnotateVideoResponse actualResponse = client.annotateVideoAsync(inputUri, features).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockVideoIntelligenceService.getRequests(); + List actualRequests = mockVideoIntelligenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnnotateVideoRequest actualRequest = (AnnotateVideoRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java index 5646947cc919..123a9b9d07be 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -91,7 +91,7 @@ public void batchAnnotateImagesTest() { BatchAnnotateImagesResponse actualResponse = client.batchAnnotateImages(requests); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchAnnotateImagesRequest actualRequest = (BatchAnnotateImagesRequest) actualRequests.get(0); @@ -137,7 +137,7 @@ public void asyncBatchAnnotateFilesTest() throws Exception { client.asyncBatchAnnotateFilesAsync(requests).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsyncBatchAnnotateFilesRequest actualRequest = (AsyncBatchAnnotateFilesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java index 96d7bc528eb6..c8032db99176 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockImageAnnotator() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java index 3b1456bc3f71..8073ea26ecf0 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1.ImageAnnotatorGrpc.ImageAnnotatorImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockImageAnnotatorImpl() { @@ -36,15 +36,15 @@ public MockImageAnnotatorImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearch.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearch.java index 813c4cfd26f2..db4b4b60a539 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearch.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearch.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockProductSearch() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java index a7213f6abe46..d22b73eeee0c 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockProductSearchImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1.ProductSearchGrpc.ProductSearchImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProductSearchImpl extends ProductSearchImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockProductSearchImpl() { @@ -37,15 +37,15 @@ public MockProductSearchImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ProductSearchClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ProductSearchClientTest.java index ec3fff1a5baf..9bed869a3ed0 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ProductSearchClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ProductSearchClientTest.java @@ -30,10 +30,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -110,7 +110,7 @@ public void createProductTest() { Product actualResponse = client.createProduct(parent, product, productId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProductRequest actualRequest = (CreateProductRequest) actualRequests.get(0); @@ -162,7 +162,7 @@ public void listProductsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductsRequest actualRequest = (ListProductsRequest) actualRequests.get(0); @@ -210,7 +210,7 @@ public void getProductTest() { Product actualResponse = client.getProduct(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProductRequest actualRequest = (GetProductRequest) actualRequests.get(0); @@ -259,7 +259,7 @@ public void updateProductTest() { Product actualResponse = client.updateProduct(product, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProductRequest actualRequest = (UpdateProductRequest) actualRequests.get(0); @@ -298,7 +298,7 @@ public void deleteProductTest() { client.deleteProduct(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProductRequest actualRequest = (DeleteProductRequest) actualRequests.get(0); @@ -348,7 +348,7 @@ public void listReferenceImagesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getReferenceImagesList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListReferenceImagesRequest actualRequest = (ListReferenceImagesRequest) actualRequests.get(0); @@ -391,7 +391,7 @@ public void getReferenceImageTest() { ReferenceImage actualResponse = client.getReferenceImage(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetReferenceImageRequest actualRequest = (GetReferenceImageRequest) actualRequests.get(0); @@ -430,7 +430,7 @@ public void deleteReferenceImageTest() { client.deleteReferenceImage(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteReferenceImageRequest actualRequest = (DeleteReferenceImageRequest) actualRequests.get(0); @@ -476,7 +476,7 @@ public void createReferenceImageTest() { client.createReferenceImage(parent, referenceImage, referenceImageId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateReferenceImageRequest actualRequest = (CreateReferenceImageRequest) actualRequests.get(0); @@ -523,7 +523,7 @@ public void createProductSetTest() { ProductSet actualResponse = client.createProductSet(parent, productSet, productSetId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProductSetRequest actualRequest = (CreateProductSetRequest) actualRequests.get(0); @@ -575,7 +575,7 @@ public void listProductSetsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductSetsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductSetsRequest actualRequest = (ListProductSetsRequest) actualRequests.get(0); @@ -616,7 +616,7 @@ public void getProductSetTest() { ProductSet actualResponse = client.getProductSet(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProductSetRequest actualRequest = (GetProductSetRequest) actualRequests.get(0); @@ -658,7 +658,7 @@ public void updateProductSetTest() { ProductSet actualResponse = client.updateProductSet(productSet, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProductSetRequest actualRequest = (UpdateProductSetRequest) actualRequests.get(0); @@ -697,7 +697,7 @@ public void deleteProductSetTest() { client.deleteProductSet(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProductSetRequest actualRequest = (DeleteProductSetRequest) actualRequests.get(0); @@ -735,7 +735,7 @@ public void addProductToProductSetTest() { client.addProductToProductSet(name, product); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); AddProductToProductSetRequest actualRequest = (AddProductToProductSetRequest) actualRequests.get(0); @@ -776,7 +776,7 @@ public void removeProductFromProductSetTest() { client.removeProductFromProductSet(name, product); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); RemoveProductFromProductSetRequest actualRequest = (RemoveProductFromProductSetRequest) actualRequests.get(0); @@ -827,7 +827,7 @@ public void listProductsInProductSetTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductsInProductSetRequest actualRequest = (ListProductsInProductSetRequest) actualRequests.get(0); @@ -874,7 +874,7 @@ public void importProductSetsTest() throws Exception { client.importProductSetsAsync(parent, inputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportProductSetsRequest actualRequest = (ImportProductSetsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java index 26c0978ca5a2..cf2cb18d788d 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorClientTest.java @@ -22,7 +22,7 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -84,7 +84,7 @@ public void batchAnnotateImagesTest() { BatchAnnotateImagesResponse actualResponse = client.batchAnnotateImages(requests); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchAnnotateImagesRequest actualRequest = (BatchAnnotateImagesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java index ac46cae82528..727fbb63409e 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotator.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockImageAnnotator() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java index de6bda3f4275..9bbc89a8f37f 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p1beta1/MockImageAnnotatorImpl.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1p1beta1.ImageAnnotatorGrpc.ImageAnnotatorImplBase; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -27,7 +27,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockImageAnnotatorImpl() { @@ -35,15 +35,15 @@ public MockImageAnnotatorImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java index 7f9ce9529838..345071742a11 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -88,7 +88,7 @@ public void batchAnnotateImagesTest() { BatchAnnotateImagesResponse actualResponse = client.batchAnnotateImages(requests); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchAnnotateImagesRequest actualRequest = (BatchAnnotateImagesRequest) actualRequests.get(0); @@ -134,7 +134,7 @@ public void asyncBatchAnnotateFilesTest() throws Exception { client.asyncBatchAnnotateFilesAsync(requests).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsyncBatchAnnotateFilesRequest actualRequest = (AsyncBatchAnnotateFilesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java index a701d667546a..0f22dbb76d11 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotator.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockImageAnnotator() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java index 1d34d56e8354..b5e6d12ab282 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p2beta1/MockImageAnnotatorImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1p2beta1.ImageAnnotatorGrpc.ImageAnnotatorImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockImageAnnotatorImpl() { @@ -36,15 +36,15 @@ public MockImageAnnotatorImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorClientTest.java index 8a5ac896823c..e76f3b63c3e3 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -91,7 +91,7 @@ public void batchAnnotateImagesTest() { BatchAnnotateImagesResponse actualResponse = client.batchAnnotateImages(requests); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchAnnotateImagesRequest actualRequest = (BatchAnnotateImagesRequest) actualRequests.get(0); @@ -137,7 +137,7 @@ public void asyncBatchAnnotateFilesTest() throws Exception { client.asyncBatchAnnotateFilesAsync(requests).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsyncBatchAnnotateFilesRequest actualRequest = (AsyncBatchAnnotateFilesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotator.java index c9b6636274dd..de2a77ceaf7a 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotator.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotator.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockImageAnnotator() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java index e88f27fdac2d..a00843adbc78 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockImageAnnotatorImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1p3beta1.ImageAnnotatorGrpc.ImageAnnotatorImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockImageAnnotatorImpl() { @@ -36,15 +36,15 @@ public MockImageAnnotatorImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearch.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearch.java index 889aa57896fe..dac177710b71 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearch.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearch.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockProductSearch() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java index 7766818c674d..051563972458 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/MockProductSearchImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1p3beta1.ProductSearchGrpc.ProductSearchImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProductSearchImpl extends ProductSearchImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockProductSearchImpl() { @@ -37,15 +37,15 @@ public MockProductSearchImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ProductSearchClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ProductSearchClientTest.java index db442500539f..095a69c1a67d 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ProductSearchClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p3beta1/ProductSearchClientTest.java @@ -30,10 +30,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -103,7 +103,7 @@ public void createProductSetTest() { ProductSet actualResponse = client.createProductSet(parent, productSet, productSetId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProductSetRequest actualRequest = (CreateProductSetRequest) actualRequests.get(0); @@ -155,7 +155,7 @@ public void listProductSetsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductSetsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductSetsRequest actualRequest = (ListProductSetsRequest) actualRequests.get(0); @@ -196,7 +196,7 @@ public void getProductSetTest() { ProductSet actualResponse = client.getProductSet(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProductSetRequest actualRequest = (GetProductSetRequest) actualRequests.get(0); @@ -238,7 +238,7 @@ public void updateProductSetTest() { ProductSet actualResponse = client.updateProductSet(productSet, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProductSetRequest actualRequest = (UpdateProductSetRequest) actualRequests.get(0); @@ -277,7 +277,7 @@ public void deleteProductSetTest() { client.deleteProductSet(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProductSetRequest actualRequest = (DeleteProductSetRequest) actualRequests.get(0); @@ -327,7 +327,7 @@ public void createProductTest() { Product actualResponse = client.createProduct(parent, product, productId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProductRequest actualRequest = (CreateProductRequest) actualRequests.get(0); @@ -379,7 +379,7 @@ public void listProductsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductsRequest actualRequest = (ListProductsRequest) actualRequests.get(0); @@ -427,7 +427,7 @@ public void getProductTest() { Product actualResponse = client.getProduct(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProductRequest actualRequest = (GetProductRequest) actualRequests.get(0); @@ -476,7 +476,7 @@ public void updateProductTest() { Product actualResponse = client.updateProduct(product, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProductRequest actualRequest = (UpdateProductRequest) actualRequests.get(0); @@ -515,7 +515,7 @@ public void deleteProductTest() { client.deleteProduct(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProductRequest actualRequest = (DeleteProductRequest) actualRequests.get(0); @@ -558,7 +558,7 @@ public void createReferenceImageTest() { client.createReferenceImage(parent, referenceImage, referenceImageId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateReferenceImageRequest actualRequest = (CreateReferenceImageRequest) actualRequests.get(0); @@ -600,7 +600,7 @@ public void deleteReferenceImageTest() { client.deleteReferenceImage(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteReferenceImageRequest actualRequest = (DeleteReferenceImageRequest) actualRequests.get(0); @@ -651,7 +651,7 @@ public void listReferenceImagesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getReferenceImagesList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListReferenceImagesRequest actualRequest = (ListReferenceImagesRequest) actualRequests.get(0); @@ -693,7 +693,7 @@ public void getReferenceImageTest() { ReferenceImage actualResponse = client.getReferenceImage(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetReferenceImageRequest actualRequest = (GetReferenceImageRequest) actualRequests.get(0); @@ -732,7 +732,7 @@ public void addProductToProductSetTest() { client.addProductToProductSet(name, product); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); AddProductToProductSetRequest actualRequest = (AddProductToProductSetRequest) actualRequests.get(0); @@ -773,7 +773,7 @@ public void removeProductFromProductSetTest() { client.removeProductFromProductSet(name, product); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); RemoveProductFromProductSetRequest actualRequest = (RemoveProductFromProductSetRequest) actualRequests.get(0); @@ -824,7 +824,7 @@ public void listProductsInProductSetTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductsInProductSetRequest actualRequest = (ListProductsInProductSetRequest) actualRequests.get(0); @@ -871,7 +871,7 @@ public void importProductSetsTest() throws Exception { client.importProductSetsAsync(parent, inputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportProductSetsRequest actualRequest = (ImportProductSetsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorClientTest.java index 1cc3fcec80b5..70b1cbfb6d87 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorClientTest.java @@ -24,8 +24,8 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -91,7 +91,7 @@ public void batchAnnotateImagesTest() { BatchAnnotateImagesResponse actualResponse = client.batchAnnotateImages(requests); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchAnnotateImagesRequest actualRequest = (BatchAnnotateImagesRequest) actualRequests.get(0); @@ -129,7 +129,7 @@ public void batchAnnotateFilesTest() { BatchAnnotateFilesResponse actualResponse = client.batchAnnotateFiles(requests); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchAnnotateFilesRequest actualRequest = (BatchAnnotateFilesRequest) actualRequests.get(0); @@ -176,7 +176,7 @@ public void asyncBatchAnnotateImagesTest() throws Exception { client.asyncBatchAnnotateImagesAsync(requests, outputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsyncBatchAnnotateImagesRequest actualRequest = (AsyncBatchAnnotateImagesRequest) actualRequests.get(0); @@ -227,7 +227,7 @@ public void asyncBatchAnnotateFilesTest() throws Exception { client.asyncBatchAnnotateFilesAsync(requests).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockImageAnnotator.getRequests(); + List actualRequests = mockImageAnnotator.getRequests(); Assert.assertEquals(1, actualRequests.size()); AsyncBatchAnnotateFilesRequest actualRequest = (AsyncBatchAnnotateFilesRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotator.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotator.java index eda5eca39ce0..77f5252a18c5 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotator.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotator.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockImageAnnotator() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java index d844ff0af7dc..77cc1414d177 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockImageAnnotatorImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1p4beta1.ImageAnnotatorGrpc.ImageAnnotatorImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockImageAnnotatorImpl extends ImageAnnotatorImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockImageAnnotatorImpl() { @@ -36,15 +36,15 @@ public MockImageAnnotatorImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearch.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearch.java index 9bc4312c77f8..43158baeae59 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearch.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearch.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockProductSearch() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java index db40868e3699..08613f4f39f7 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/MockProductSearchImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.vision.v1p4beta1.ProductSearchGrpc.ProductSearchImplBase; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockProductSearchImpl extends ProductSearchImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockProductSearchImpl() { @@ -37,15 +37,15 @@ public MockProductSearchImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ProductSearchClientTest.java b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ProductSearchClientTest.java index 51a5f85751eb..8d9cb747f73e 100644 --- a/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ProductSearchClientTest.java +++ b/google-cloud-clients/google-cloud-vision/src/test/java/com/google/cloud/vision/v1p4beta1/ProductSearchClientTest.java @@ -30,10 +30,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.common.collect.Lists; import com.google.longrunning.Operation; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -103,7 +103,7 @@ public void createProductSetTest() { ProductSet actualResponse = client.createProductSet(parent, productSet, productSetId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProductSetRequest actualRequest = (CreateProductSetRequest) actualRequests.get(0); @@ -155,7 +155,7 @@ public void listProductSetsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductSetsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductSetsRequest actualRequest = (ListProductSetsRequest) actualRequests.get(0); @@ -196,7 +196,7 @@ public void getProductSetTest() { ProductSet actualResponse = client.getProductSet(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProductSetRequest actualRequest = (GetProductSetRequest) actualRequests.get(0); @@ -238,7 +238,7 @@ public void updateProductSetTest() { ProductSet actualResponse = client.updateProductSet(productSet, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProductSetRequest actualRequest = (UpdateProductSetRequest) actualRequests.get(0); @@ -277,7 +277,7 @@ public void deleteProductSetTest() { client.deleteProductSet(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProductSetRequest actualRequest = (DeleteProductSetRequest) actualRequests.get(0); @@ -327,7 +327,7 @@ public void createProductTest() { Product actualResponse = client.createProduct(parent, product, productId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateProductRequest actualRequest = (CreateProductRequest) actualRequests.get(0); @@ -379,7 +379,7 @@ public void listProductsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductsRequest actualRequest = (ListProductsRequest) actualRequests.get(0); @@ -427,7 +427,7 @@ public void getProductTest() { Product actualResponse = client.getProduct(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetProductRequest actualRequest = (GetProductRequest) actualRequests.get(0); @@ -476,7 +476,7 @@ public void updateProductTest() { Product actualResponse = client.updateProduct(product, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateProductRequest actualRequest = (UpdateProductRequest) actualRequests.get(0); @@ -515,7 +515,7 @@ public void deleteProductTest() { client.deleteProduct(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteProductRequest actualRequest = (DeleteProductRequest) actualRequests.get(0); @@ -558,7 +558,7 @@ public void createReferenceImageTest() { client.createReferenceImage(parent, referenceImage, referenceImageId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateReferenceImageRequest actualRequest = (CreateReferenceImageRequest) actualRequests.get(0); @@ -600,7 +600,7 @@ public void deleteReferenceImageTest() { client.deleteReferenceImage(name); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteReferenceImageRequest actualRequest = (DeleteReferenceImageRequest) actualRequests.get(0); @@ -651,7 +651,7 @@ public void listReferenceImagesTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getReferenceImagesList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListReferenceImagesRequest actualRequest = (ListReferenceImagesRequest) actualRequests.get(0); @@ -693,7 +693,7 @@ public void getReferenceImageTest() { ReferenceImage actualResponse = client.getReferenceImage(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetReferenceImageRequest actualRequest = (GetReferenceImageRequest) actualRequests.get(0); @@ -732,7 +732,7 @@ public void addProductToProductSetTest() { client.addProductToProductSet(name, product); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); AddProductToProductSetRequest actualRequest = (AddProductToProductSetRequest) actualRequests.get(0); @@ -773,7 +773,7 @@ public void removeProductFromProductSetTest() { client.removeProductFromProductSet(name, product); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); RemoveProductFromProductSetRequest actualRequest = (RemoveProductFromProductSetRequest) actualRequests.get(0); @@ -824,7 +824,7 @@ public void listProductsInProductSetTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getProductsList().get(0), resources.get(0)); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListProductsInProductSetRequest actualRequest = (ListProductsInProductSetRequest) actualRequests.get(0); @@ -871,7 +871,7 @@ public void importProductSetsTest() throws Exception { client.importProductSetsAsync(parent, inputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockProductSearch.getRequests(); + List actualRequests = mockProductSearch.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportProductSetsRequest actualRequest = (ImportProductSetsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java index 411244ab0935..9cc9f56b13e5 100644 --- a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java +++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScanner.java @@ -17,7 +17,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -31,12 +31,12 @@ public MockWebSecurityScanner() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { serviceImpl.addResponse(response); } diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java index bfaa2c5c5ec4..2d62d7f6bc77 100644 --- a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java +++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/MockWebSecurityScannerImpl.java @@ -17,8 +17,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerGrpc.WebSecurityScannerImplBase; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +28,7 @@ @javax.annotation.Generated("by GAPIC") @BetaApi public class MockWebSecurityScannerImpl extends WebSecurityScannerImplBase { - private ArrayList requests; + private ArrayList requests; private Queue responses; public MockWebSecurityScannerImpl() { @@ -36,15 +36,15 @@ public MockWebSecurityScannerImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(GeneratedMessageV3 response) { + public void addResponse(AbstractMessage response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java index 345beb67ae39..2f29ff601df8 100644 --- a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java +++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java @@ -28,9 +28,9 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; +import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; -import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -97,7 +97,7 @@ public void createScanConfigTest() { ScanConfig actualResponse = client.createScanConfig(parent, scanConfig); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateScanConfigRequest actualRequest = (CreateScanConfigRequest) actualRequests.get(0); @@ -136,7 +136,7 @@ public void deleteScanConfigTest() { client.deleteScanConfig(name); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteScanConfigRequest actualRequest = (DeleteScanConfigRequest) actualRequests.get(0); @@ -182,7 +182,7 @@ public void getScanConfigTest() { ScanConfig actualResponse = client.getScanConfig(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetScanConfigRequest actualRequest = (GetScanConfigRequest) actualRequests.get(0); @@ -230,7 +230,7 @@ public void listScanConfigsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getScanConfigsList().get(0), resources.get(0)); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListScanConfigsRequest actualRequest = (ListScanConfigsRequest) actualRequests.get(0); @@ -273,7 +273,7 @@ public void updateScanConfigTest() { ScanConfig actualResponse = client.updateScanConfig(scanConfig, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateScanConfigRequest actualRequest = (UpdateScanConfigRequest) actualRequests.get(0); @@ -325,7 +325,7 @@ public void startScanRunTest() { ScanRun actualResponse = client.startScanRun(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); StartScanRunRequest actualRequest = (StartScanRunRequest) actualRequests.get(0); @@ -375,7 +375,7 @@ public void getScanRunTest() { ScanRun actualResponse = client.getScanRun(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetScanRunRequest actualRequest = (GetScanRunRequest) actualRequests.get(0); @@ -423,7 +423,7 @@ public void listScanRunsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getScanRunsList().get(0), resources.get(0)); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListScanRunsRequest actualRequest = (ListScanRunsRequest) actualRequests.get(0); @@ -473,7 +473,7 @@ public void stopScanRunTest() { ScanRun actualResponse = client.stopScanRun(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); StopScanRunRequest actualRequest = (StopScanRunRequest) actualRequests.get(0); @@ -521,7 +521,7 @@ public void listCrawledUrlsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getCrawledUrlsList().get(0), resources.get(0)); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListCrawledUrlsRequest actualRequest = (ListCrawledUrlsRequest) actualRequests.get(0); @@ -579,7 +579,7 @@ public void getFindingTest() { Finding actualResponse = client.getFinding(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetFindingRequest actualRequest = (GetFindingRequest) actualRequests.get(0); @@ -628,7 +628,7 @@ public void listFindingsTest() { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getFindingsList().get(0), resources.get(0)); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListFindingsRequest actualRequest = (ListFindingsRequest) actualRequests.get(0); @@ -669,7 +669,7 @@ public void listFindingTypeStatsTest() { ListFindingTypeStatsResponse actualResponse = client.listFindingTypeStats(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWebSecurityScanner.getRequests(); + List actualRequests = mockWebSecurityScanner.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListFindingTypeStatsRequest actualRequest = (ListFindingTypeStatsRequest) actualRequests.get(0); diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index ae624b6e6a66..9d1da7430352 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -155,17 +155,17 @@ 0.85.1-alpha-SNAPSHOT 1.27.0 - 1.42.0 + 1.43.0 1.7.0 0.15.0 - 1.18.0 + 1.19.0 27.1-android 1.29.0 1.28.0 3.7.0 - 0.18.0 + 0.19.2 3.4 2.6