diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 139fffe892..6a632d77b3 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -124,6 +124,16 @@ proto-google-iam-v3beta 1.56.1-SNAPSHOT + + com.google.api.grpc + proto-google-iam-v3 + 1.56.1-SNAPSHOT + + + com.google.api.grpc + proto-google-iam-v3beta + 1.56.1-SNAPSHOT + @@ -151,6 +161,16 @@ grpc-google-iam-v3beta 1.56.1-SNAPSHOT + + com.google.api.grpc + grpc-google-iam-v3 + 1.56.1-SNAPSHOT + + + com.google.api.grpc + grpc-google-iam-v3beta + 1.56.1-SNAPSHOT + diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java index 175d45bc41..b86dc8ae87 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java @@ -61,7 +61,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import java.io.IOException; import java.util.ArrayList; @@ -902,7 +901,7 @@ protected abstract List createRpcLroExceptionTestCatchBody( private static TypeStore createStaticTypes() { List> concreteClazzes = Arrays.asList( - AbstractMessage.class, + com.google.protobuf.Message.class, After.class, AfterClass.class, Any.class, diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java index 7227b4fe4a..afa2d94322 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java @@ -36,7 +36,7 @@ import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.GapicContext; import com.google.api.generator.gapic.model.Service; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.Arrays; import java.util.List; @@ -130,7 +130,7 @@ private static MethodDefinition createGetRequestsMethod( TypeNode.withReference( ConcreteReference.builder() .setClazz(List.class) - .setGenerics(Arrays.asList(typeStore.get("AbstractMessage").reference())) + .setGenerics(Arrays.asList(typeStore.get("Message").reference())) .build()); String methodName = "getRequests"; Expr returnExpr = @@ -153,10 +153,7 @@ private static MethodDefinition createAddResponseMethod( String methodName = "addResponse"; VariableExpr responseArgExpr = VariableExpr.withVariable( - Variable.builder() - .setName("response") - .setType(typeStore.get("AbstractMessage")) - .build()); + Variable.builder().setName("response").setType(typeStore.get("Message")).build()); Expr methodInvocationExpr = MethodInvocationExpr.builder() @@ -235,8 +232,7 @@ private static MethodDefinition createResetMethod(VariableExpr serviceImplVarExp private static TypeStore createTypes(Service service) { List> concreteClazzes = - Arrays.asList( - AbstractMessage.class, BetaApi.class, Generated.class, ServerServiceDefinition.class); + Arrays.asList(Message.class, BetaApi.class, Generated.class, ServerServiceDefinition.class); TypeStore typeStore = new TypeStore(concreteClazzes); typeStore.put("com.google.api.gax.grpc.testing", "MockGrpcService"); diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java index d6573f026d..cebd3fdf14 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java @@ -51,7 +51,7 @@ import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -75,8 +75,7 @@ public class MockServiceImplClassComposer implements ClassComposer { TypeNode.withReference( ConcreteReference.builder() .setClazz(List.class) - .setGenerics( - Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference())) + .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference())) .build())) .build()); @@ -179,10 +178,7 @@ private static MethodDefinition createGetRequestsMethod() { private static MethodDefinition createAddResponseMethod() { VariableExpr responseArgExpr = VariableExpr.withVariable( - Variable.builder() - .setName("response") - .setType(FIXED_TYPESTORE.get("AbstractMessage")) - .build()); + Variable.builder().setName("response").setType(FIXED_TYPESTORE.get("Message")).build()); Expr methodInvocationExpr = MethodInvocationExpr.builder() .setMethodName("add") @@ -207,8 +203,7 @@ private static MethodDefinition createSetResponsesMethod(Service service) { TypeNode.withReference( ConcreteReference.builder() .setClazz(List.class) - .setGenerics( - Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference())) + .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference())) .build())) .build()); Expr responseAssignExpr = @@ -597,7 +592,7 @@ private static Statement createHandleObjectStatement( private static TypeStore createStaticTypes() { List> concreteClazzes = Arrays.asList( - AbstractMessage.class, + Message.class, ArrayList.class, BetaApi.class, Generated.class, diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java index b6d1ff3bc3..76e427b186 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java @@ -53,7 +53,6 @@ import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; -import com.google.protobuf.AbstractMessage; import io.grpc.StatusRuntimeException; import java.util.ArrayList; import java.util.Arrays; @@ -378,7 +377,8 @@ protected List constructRpcTestCheckerLogic( ConcreteReference.builder() .setClazz(List.class) .setGenerics( - Arrays.asList(ConcreteReference.withClazz(AbstractMessage.class))) + Arrays.asList( + ConcreteReference.withClazz(com.google.protobuf.Message.class))) .build())) .setName("actualRequests") .build()); @@ -416,7 +416,7 @@ protected List constructRpcTestCheckerLogic( .setArguments( ValueExpr.withValue( PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build())) - .setReturnType(FIXED_TYPESTORE.get("AbstractMessage")) + .setReturnType(FIXED_TYPESTORE.get("Message")) .build(); getFirstRequestExpr = CastExpr.builder().setType(method.inputType()).setExpr(getFirstRequestExpr).build(); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClientTest.golden index 5e26ce1290..ffc1544837 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClientTest.golden @@ -7,8 +7,8 @@ import com.google.api.gax.grpc.testing.MockGrpcService; 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.Empty; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.Arrays; @@ -69,7 +69,7 @@ public class DeprecatedServiceClientTest { client.fastFibonacci(request); - List actualRequests = mockDeprecatedService.getRequests(); + List actualRequests = mockDeprecatedService.getRequests(); Assert.assertEquals(1, actualRequests.size()); FibonacciRequest actualRequest = ((FibonacciRequest) actualRequests.get(0)); @@ -103,7 +103,7 @@ public class DeprecatedServiceClientTest { client.slowFibonacci(request); - List actualRequests = mockDeprecatedService.getRequests(); + List actualRequests = mockDeprecatedService.getRequests(); Assert.assertEquals(1, actualRequests.size()); FibonacciRequest actualRequest = ((FibonacciRequest) actualRequests.get(0)); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden index 515649a093..35945824c8 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden @@ -19,9 +19,9 @@ import com.google.api.gax.rpc.StatusCode; import com.google.api.resourcenames.ResourceName; 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.Duration; +import com.google.protobuf.Message; import com.google.protobuf.Timestamp; import com.google.rpc.Status; import io.grpc.StatusRuntimeException; @@ -89,7 +89,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -133,7 +133,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -172,7 +172,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(error); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -211,7 +211,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -250,7 +250,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(content); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -289,7 +289,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -328,7 +328,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -368,7 +368,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(content, severity); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -636,7 +636,7 @@ public class EchoClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0)); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0)); @@ -685,7 +685,7 @@ public class EchoClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0)); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0)); @@ -731,7 +731,7 @@ public class EchoClientTest { WaitResponse actualResponse = client.waitAsync(ttl).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0)); @@ -775,7 +775,7 @@ public class EchoClientTest { WaitResponse actualResponse = client.waitAsync(endTime).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0)); @@ -813,7 +813,7 @@ public class EchoClientTest { BlockResponse actualResponse = client.block(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); BlockRequest actualRequest = ((BlockRequest) actualRequests.get(0)); @@ -856,7 +856,7 @@ public class EchoClientTest { Object actualResponse = client.collideName(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingClientTest.golden index ead00722f4..66de495ad1 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingClientTest.golden @@ -18,8 +18,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.common.collect.Lists; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import google.cloud.BillingAccountName; import google.cloud.FolderName; import google.cloud.OrganizationName; @@ -88,7 +88,7 @@ public class LoggingServiceV2ClientTest { client.deleteLog(logName); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogRequest actualRequest = ((DeleteLogRequest) actualRequests.get(0)); @@ -122,7 +122,7 @@ public class LoggingServiceV2ClientTest { client.deleteLog(logName); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogRequest actualRequest = ((DeleteLogRequest) actualRequests.get(0)); @@ -161,7 +161,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -206,7 +206,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -259,7 +259,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -313,7 +313,7 @@ public class LoggingServiceV2ClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResourceDescriptorsList().get(0), resources.get(0)); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListMonitoredResourceDescriptorsRequest actualRequest = ((ListMonitoredResourceDescriptorsRequest) actualRequests.get(0)); @@ -363,7 +363,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -407,7 +407,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -451,7 +451,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -495,7 +495,7 @@ public class LoggingServiceV2ClientTest { 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)); @@ -539,7 +539,7 @@ public class LoggingServiceV2ClientTest { 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/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden index f189549919..d25356b4a6 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden @@ -2,7 +2,7 @@ package com.google.testdata.v1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -17,12 +17,12 @@ public class MockDeprecatedService implements MockGrpcService { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden index 7092d93a9e..fb287b9e2a 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden @@ -1,8 +1,8 @@ package com.google.testdata.v1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.testdata.v1.DeprecatedServiceGrpc.DeprecatedServiceImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -14,7 +14,7 @@ import javax.annotation.Generated; @BetaApi @Generated("by gapic-generator-java") public class MockDeprecatedServiceImpl extends DeprecatedServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockDeprecatedServiceImpl() { @@ -22,15 +22,15 @@ public class MockDeprecatedServiceImpl extends DeprecatedServiceImplBase { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden index 57c735b964..4a83043a43 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden @@ -2,7 +2,7 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -17,12 +17,12 @@ public class MockEcho implements MockGrpcService { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden index f8b42faff0..d549ce9e0a 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden @@ -2,7 +2,7 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.EchoGrpc.EchoImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -14,7 +14,7 @@ import javax.annotation.Generated; @BetaApi @Generated("by gapic-generator-java") public class MockEchoImpl extends EchoImplBase { - private List requests; + private List requests; private Queue responses; public MockEchoImpl() { @@ -22,15 +22,15 @@ public class MockEchoImpl extends EchoImplBase { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden index d9a1215708..761f322f6f 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/SubscriberClientTest.golden @@ -15,8 +15,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.common.collect.Lists; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import google.cloud.ProjectName; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -101,7 +101,7 @@ public class SubscriberClientTest { 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)); @@ -161,7 +161,7 @@ public class SubscriberClientTest { 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)); @@ -221,7 +221,7 @@ public class SubscriberClientTest { 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)); @@ -281,7 +281,7 @@ public class SubscriberClientTest { 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)); @@ -337,7 +337,7 @@ public class SubscriberClientTest { 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)); @@ -387,7 +387,7 @@ public class SubscriberClientTest { 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)); @@ -440,7 +440,7 @@ public class SubscriberClientTest { Subscription actualResponse = client.updateSubscription(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSubscriptionRequest actualRequest = ((UpdateSubscriptionRequest) actualRequests.get(0)); @@ -488,7 +488,7 @@ public class SubscriberClientTest { 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)); @@ -532,7 +532,7 @@ public class SubscriberClientTest { 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)); @@ -566,7 +566,7 @@ public class SubscriberClientTest { client.deleteSubscription(subscription); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = ((DeleteSubscriptionRequest) actualRequests.get(0)); @@ -600,7 +600,7 @@ public class SubscriberClientTest { client.deleteSubscription(subscription); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = ((DeleteSubscriptionRequest) actualRequests.get(0)); @@ -636,7 +636,7 @@ public class SubscriberClientTest { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = ((ModifyAckDeadlineRequest) actualRequests.get(0)); @@ -676,7 +676,7 @@ public class SubscriberClientTest { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = ((ModifyAckDeadlineRequest) actualRequests.get(0)); @@ -715,7 +715,7 @@ public class SubscriberClientTest { client.acknowledge(subscription, ackIds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = ((AcknowledgeRequest) actualRequests.get(0)); @@ -752,7 +752,7 @@ public class SubscriberClientTest { client.acknowledge(subscription, ackIds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = ((AcknowledgeRequest) actualRequests.get(0)); @@ -791,7 +791,7 @@ public class SubscriberClientTest { PullResponse actualResponse = client.pull(subscription, maxMessages); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); @@ -830,7 +830,7 @@ public class SubscriberClientTest { PullResponse actualResponse = client.pull(subscription, maxMessages); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); @@ -870,7 +870,7 @@ public class SubscriberClientTest { 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)); @@ -912,7 +912,7 @@ public class SubscriberClientTest { 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)); @@ -1026,7 +1026,7 @@ public class SubscriberClientTest { client.modifyPushConfig(subscription, pushConfig); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = ((ModifyPushConfigRequest) actualRequests.get(0)); @@ -1063,7 +1063,7 @@ public class SubscriberClientTest { client.modifyPushConfig(subscription, pushConfig); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = ((ModifyPushConfigRequest) actualRequests.get(0)); @@ -1105,7 +1105,7 @@ public class SubscriberClientTest { Snapshot actualResponse = client.getSnapshot(snapshot); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = ((GetSnapshotRequest) actualRequests.get(0)); @@ -1145,7 +1145,7 @@ public class SubscriberClientTest { Snapshot actualResponse = client.getSnapshot(snapshot); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = ((GetSnapshotRequest) actualRequests.get(0)); @@ -1189,7 +1189,7 @@ public class SubscriberClientTest { 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)); @@ -1233,7 +1233,7 @@ public class SubscriberClientTest { 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)); @@ -1274,7 +1274,7 @@ public class SubscriberClientTest { 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)); @@ -1317,7 +1317,7 @@ public class SubscriberClientTest { 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)); @@ -1360,7 +1360,7 @@ public class SubscriberClientTest { 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)); @@ -1403,7 +1403,7 @@ public class SubscriberClientTest { 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)); @@ -1446,7 +1446,7 @@ public class SubscriberClientTest { Snapshot actualResponse = client.updateSnapshot(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSnapshotRequest actualRequest = ((UpdateSnapshotRequest) actualRequests.get(0)); @@ -1482,7 +1482,7 @@ public class SubscriberClientTest { client.deleteSnapshot(snapshot); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = ((DeleteSnapshotRequest) actualRequests.get(0)); @@ -1516,7 +1516,7 @@ public class SubscriberClientTest { client.deleteSnapshot(snapshot); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = ((DeleteSnapshotRequest) actualRequests.get(0)); @@ -1554,7 +1554,7 @@ public class SubscriberClientTest { SeekResponse actualResponse = client.seek(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); SeekRequest actualRequest = ((SeekRequest) actualRequests.get(0)); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/TestingClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/TestingClientTest.golden index 76a18a39b5..d009991f90 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/TestingClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/TestingClientTest.golden @@ -11,9 +11,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.common.collect.Lists; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -82,7 +82,7 @@ public class TestingClientTest { Session actualResponse = client.createSession(session, blueprint); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSessionRequest actualRequest = ((CreateSessionRequest) actualRequests.get(0)); @@ -125,7 +125,7 @@ public class TestingClientTest { Session actualResponse = client.getSession(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSessionRequest actualRequest = ((GetSessionRequest) actualRequests.get(0)); @@ -174,7 +174,7 @@ public class TestingClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSessionsList().get(0), resources.get(0)); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSessionsRequest actualRequest = ((ListSessionsRequest) actualRequests.get(0)); @@ -214,7 +214,7 @@ public class TestingClientTest { client.deleteSession(request); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSessionRequest actualRequest = ((DeleteSessionRequest) actualRequests.get(0)); @@ -252,7 +252,7 @@ public class TestingClientTest { ReportSessionResponse actualResponse = client.reportSession(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); ReportSessionRequest actualRequest = ((ReportSessionRequest) actualRequests.get(0)); @@ -292,7 +292,7 @@ public class TestingClientTest { com.google.showcase.v1beta1.Test actualResponse = client.getTest(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTestRequest actualRequest = ((GetTestRequest) actualRequests.get(0)); @@ -331,7 +331,7 @@ public class TestingClientTest { com.google.showcase.v1beta1.Test actualResponse = client.getTest(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetTestRequest actualRequest = ((GetTestRequest) actualRequests.get(0)); @@ -382,7 +382,7 @@ public class TestingClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTestsList().get(0), resources.get(0)); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTestsRequest actualRequest = ((ListTestsRequest) actualRequests.get(0)); @@ -426,7 +426,7 @@ public class TestingClientTest { client.deleteTest(request); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTestRequest actualRequest = ((DeleteTestRequest) actualRequests.get(0)); @@ -472,7 +472,7 @@ public class TestingClientTest { VerifyTestResponse actualResponse = client.verifyTest(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); VerifyTestRequest actualRequest = ((VerifyTestRequest) actualRequests.get(0)); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClientTest.golden index 1d87f4584f..1afe443825 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClientTest.golden @@ -18,10 +18,10 @@ import com.google.api.gax.rpc.StatusCode; import com.google.api.resourcenames.ResourceName; 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.Duration; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import com.google.protobuf.Timestamp; import com.google.protobuf.Value; import com.google.rpc.Status; @@ -91,7 +91,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -136,7 +136,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -176,7 +176,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(error); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -216,7 +216,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -256,7 +256,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(content); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -296,7 +296,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -336,7 +336,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -377,7 +377,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.echo(content, severity); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -478,7 +478,7 @@ public class EchoClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0)); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0)); @@ -527,7 +527,7 @@ public class EchoClientTest { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0)); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0)); @@ -573,7 +573,7 @@ public class EchoClientTest { WaitResponse actualResponse = client.waitAsync(ttl).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0)); @@ -617,7 +617,7 @@ public class EchoClientTest { WaitResponse actualResponse = client.waitAsync(endTime).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0)); @@ -655,7 +655,7 @@ public class EchoClientTest { BlockResponse actualResponse = client.block(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); BlockRequest actualRequest = ((BlockRequest) actualRequests.get(0)); @@ -698,7 +698,7 @@ public class EchoClientTest { Object actualResponse = client.collideName(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -750,7 +750,7 @@ public class EchoClientTest { Object actualResponse = client.nestedBinding(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -866,7 +866,7 @@ public class EchoClientTest { EchoResponse actualResponse = client.noBinding(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -918,7 +918,7 @@ public class EchoClientTest { Case actualResponse = client.updateCase(case_, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateCaseRequest actualRequest = ((UpdateCaseRequest) actualRequests.get(0)); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClientTest.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClientTest.golden index 69db1fda7a..23802985f8 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClientTest.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedClientTest.golden @@ -12,7 +12,7 @@ import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.api.gax.rpc.ClientStreamingCallable; import com.google.api.gax.rpc.InvalidArgumentException; import com.google.api.gax.rpc.StatusCode; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.Arrays; @@ -77,7 +77,7 @@ public class WickedClientTest { EvilResponse actualResponse = client.craftEvilPlan(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockWicked.getRequests(); + List actualRequests = mockWicked.getRequests(); Assert.assertEquals(1, actualRequests.size()); EvilRequest actualRequest = ((EvilRequest) actualRequests.get(0)); diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java index 0f6c3fd8a3..62fb4f07d0 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java +++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java @@ -31,7 +31,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -45,12 +45,12 @@ public MockOperationsEx() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addGetOperationResponse(response); } diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java index 055e7cdca0..fadc77ad84 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java +++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java @@ -39,6 +39,7 @@ import com.google.longrunning.OperationsGrpc.OperationsImplBase; import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -48,7 +49,7 @@ /** A custom mock Operations service implementation which only mocks responses for GetOperation. */ @BetaApi public class MockOperationsExImpl extends OperationsImplBase { - private List requests; + private List requests; private Queue getOperationResponses; public MockOperationsExImpl() { @@ -56,11 +57,11 @@ public MockOperationsExImpl() { getOperationResponses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addGetOperationResponse(AbstractMessage response) { + public void addGetOperationResponse(Message response) { this.getOperationResponses.add(response); } diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java index 2377609132..dfd69d428e 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java +++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java @@ -30,7 +30,7 @@ package com.google.api.gax.grpc.testing; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -38,10 +38,10 @@ @BetaApi public interface MockGrpcService { /** Returns all the requests received. */ - List getRequests(); + List getRequests(); /** Adds the response to the response queue. */ - void addResponse(AbstractMessage response); + void addResponse(Message response); /** Adds the exception to the response queue. */ void addException(Exception exception); diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java index 624eaa5c64..2037c16ea4 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java +++ b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java @@ -31,7 +31,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -44,12 +44,12 @@ public MockOperations() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java index 594508d3de..3893cfe51f 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java +++ b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java @@ -31,8 +31,8 @@ import com.google.api.core.BetaApi; import com.google.longrunning.OperationsGrpc.OperationsImplBase; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -41,7 +41,7 @@ @BetaApi public class MockOperationsImpl extends OperationsImplBase { - private List requests; + private List requests; private Queue responses; public MockOperationsImpl() { @@ -49,15 +49,15 @@ public MockOperationsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java index d438a8c4f4..f7970a8b79 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java +++ b/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java @@ -39,9 +39,9 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; import com.google.longrunning.OperationsClient.ListOperationsPagedResponse; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Duration; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -102,7 +102,7 @@ void getOperationTest() { Operation actualResponse = client.getOperation(name); assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); GetOperationRequest actualRequest = (GetOperationRequest) actualRequests.get(0); @@ -145,7 +145,7 @@ void listOperationsTest() { assertEquals(1, resources.size()); assertEquals(expectedResponse.getOperationsList().get(0), resources.get(0)); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); ListOperationsRequest actualRequest = (ListOperationsRequest) actualRequests.get(0); @@ -178,7 +178,7 @@ void cancelOperationTest() { client.cancelOperation(name); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); CancelOperationRequest actualRequest = (CancelOperationRequest) actualRequests.get(0); @@ -209,7 +209,7 @@ void deleteOperationTest() { client.deleteOperation(name); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); DeleteOperationRequest actualRequest = (DeleteOperationRequest) actualRequests.get(0); @@ -246,7 +246,7 @@ void waitOperationTest() { Operation actualResponse = client.waitOperation(request); assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); WaitOperationRequest actualRequest = (WaitOperationRequest) actualRequests.get(0); diff --git a/java-iam/pom.xml b/java-iam/pom.xml index c5e79d368b..efc66dabfb 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -142,6 +142,16 @@ grpc-google-iam-v3 1.56.1-SNAPSHOT + + com.google.api.grpc + proto-google-iam-v3 + 1.56.1-SNAPSHOT + + + com.google.api.grpc + grpc-google-iam-v3 + 1.56.1-SNAPSHOT + javax.annotation javax.annotation-api diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/ComplianceClientTest.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/ComplianceClientTest.java index 8f76905d59..409f5bab79 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/ComplianceClientTest.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/ComplianceClientTest.java @@ -38,10 +38,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.Any; import com.google.protobuf.ByteString; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -126,7 +126,7 @@ public void repeatDataBodyTest() throws Exception { RepeatResponse actualResponse = client.repeatDataBody(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -198,7 +198,7 @@ public void repeatDataBodyInfoTest() throws Exception { RepeatResponse actualResponse = client.repeatDataBodyInfo(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -270,7 +270,7 @@ public void repeatDataQueryTest() throws Exception { RepeatResponse actualResponse = client.repeatDataQuery(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -342,7 +342,7 @@ public void repeatDataSimplePathTest() throws Exception { RepeatResponse actualResponse = client.repeatDataSimplePath(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -414,7 +414,7 @@ public void repeatDataPathResourceTest() throws Exception { RepeatResponse actualResponse = client.repeatDataPathResource(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -486,7 +486,7 @@ public void repeatDataPathTrailingResourceTest() throws Exception { RepeatResponse actualResponse = client.repeatDataPathTrailingResource(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -558,7 +558,7 @@ public void repeatDataBodyPutTest() throws Exception { RepeatResponse actualResponse = client.repeatDataBodyPut(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -630,7 +630,7 @@ public void repeatDataBodyPatchTest() throws Exception { RepeatResponse actualResponse = client.repeatDataBodyPatch(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); RepeatRequest actualRequest = ((RepeatRequest) actualRequests.get(0)); @@ -690,7 +690,7 @@ public void getEnumTest() throws Exception { EnumResponse actualResponse = client.getEnum(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); EnumRequest actualRequest = ((EnumRequest) actualRequests.get(0)); @@ -733,7 +733,7 @@ public void verifyEnumTest() throws Exception { EnumResponse actualResponse = client.verifyEnum(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCompliance.getRequests(); + List actualRequests = mockCompliance.getRequests(); Assert.assertEquals(1, actualRequests.size()); EnumResponse actualRequest = ((EnumResponse) actualRequests.get(0)); @@ -788,7 +788,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -839,7 +839,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -885,7 +885,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -937,7 +937,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -982,7 +982,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/EchoClientTest.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/EchoClientTest.java index 44ce3dff79..898d4dc9c3 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/EchoClientTest.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/EchoClientTest.java @@ -47,11 +47,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.Duration; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import com.google.rpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -137,7 +137,7 @@ public void echoTest() throws Exception { EchoResponse actualResponse = client.echo(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0)); @@ -193,7 +193,7 @@ public void echoErrorDetailsTest() throws Exception { EchoErrorDetailsResponse actualResponse = client.echoErrorDetails(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); EchoErrorDetailsRequest actualRequest = ((EchoErrorDetailsRequest) actualRequests.get(0)); @@ -234,7 +234,7 @@ public void failEchoWithDetailsTest() throws Exception { FailEchoWithDetailsResponse actualResponse = client.failEchoWithDetails(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); FailEchoWithDetailsRequest actualRequest = ((FailEchoWithDetailsRequest) actualRequests.get(0)); @@ -461,7 +461,7 @@ public void pagedExpandTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0)); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0)); @@ -512,7 +512,7 @@ public void pagedExpandLegacyTest() throws Exception { PagedExpandResponse actualResponse = client.pagedExpandLegacy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandLegacyRequest actualRequest = ((PagedExpandLegacyRequest) actualRequests.get(0)); @@ -571,7 +571,7 @@ public void pagedExpandLegacyMappedTest() throws Exception { Assert.assertEquals( expectedResponse.getAlphabetizedMap().entrySet().iterator().next(), resources.get(0)); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0)); @@ -620,7 +620,7 @@ public void waitTest() throws Exception { WaitResponse actualResponse = client.waitAsync(request).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0)); @@ -662,7 +662,7 @@ public void blockTest() throws Exception { BlockResponse actualResponse = client.block(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockEcho.getRequests(); + List actualRequests = mockEcho.getRequests(); Assert.assertEquals(1, actualRequests.size()); BlockRequest actualRequest = ((BlockRequest) actualRequests.get(0)); @@ -715,7 +715,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -766,7 +766,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -812,7 +812,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -864,7 +864,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -909,7 +909,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/IdentityClientTest.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/IdentityClientTest.java index a799116534..20e569cd83 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/IdentityClientTest.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/IdentityClientTest.java @@ -39,11 +39,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.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -125,7 +125,7 @@ public void createUserTest() throws Exception { User actualResponse = client.createUser(displayName, email); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateUserRequest actualRequest = ((CreateUserRequest) actualRequests.get(0)); @@ -179,7 +179,7 @@ public void createUserTest2() throws Exception { client.createUser(displayName, email, age, nickname, enableNotifications, heightFeet); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateUserRequest actualRequest = ((CreateUserRequest) actualRequests.get(0)); @@ -235,7 +235,7 @@ public void getUserTest() throws Exception { User actualResponse = client.getUser(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetUserRequest actualRequest = ((GetUserRequest) actualRequests.get(0)); @@ -281,7 +281,7 @@ public void getUserTest2() throws Exception { User actualResponse = client.getUser(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetUserRequest actualRequest = ((GetUserRequest) actualRequests.get(0)); @@ -331,7 +331,7 @@ public void updateUserTest() throws Exception { User actualResponse = client.updateUser(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateUserRequest actualRequest = ((UpdateUserRequest) actualRequests.get(0)); @@ -370,7 +370,7 @@ public void deleteUserTest() throws Exception { client.deleteUser(name); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteUserRequest actualRequest = ((DeleteUserRequest) actualRequests.get(0)); @@ -404,7 +404,7 @@ public void deleteUserTest2() throws Exception { client.deleteUser(name); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteUserRequest actualRequest = ((DeleteUserRequest) actualRequests.get(0)); @@ -452,7 +452,7 @@ public void listUsersTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getUsersList().get(0), resources.get(0)); - List actualRequests = mockIdentity.getRequests(); + List actualRequests = mockIdentity.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListUsersRequest actualRequest = ((ListUsersRequest) actualRequests.get(0)); @@ -507,7 +507,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -558,7 +558,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -604,7 +604,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -656,7 +656,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -701,7 +701,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MessagingClientTest.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MessagingClientTest.java index 65b8248d12..ede68aa492 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MessagingClientTest.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MessagingClientTest.java @@ -47,11 +47,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.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -130,7 +130,7 @@ public void createRoomTest() throws Exception { Room actualResponse = client.createRoom(displayName, description); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateRoomRequest actualRequest = ((CreateRoomRequest) actualRequests.get(0)); @@ -174,7 +174,7 @@ public void getRoomTest() throws Exception { Room actualResponse = client.getRoom(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetRoomRequest actualRequest = ((GetRoomRequest) actualRequests.get(0)); @@ -216,7 +216,7 @@ public void getRoomTest2() throws Exception { Room actualResponse = client.getRoom(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetRoomRequest actualRequest = ((GetRoomRequest) actualRequests.get(0)); @@ -262,7 +262,7 @@ public void updateRoomTest() throws Exception { Room actualResponse = client.updateRoom(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateRoomRequest actualRequest = ((UpdateRoomRequest) actualRequests.get(0)); @@ -301,7 +301,7 @@ public void deleteRoomTest() throws Exception { client.deleteRoom(name); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteRoomRequest actualRequest = ((DeleteRoomRequest) actualRequests.get(0)); @@ -335,7 +335,7 @@ public void deleteRoomTest2() throws Exception { client.deleteRoom(name); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteRoomRequest actualRequest = ((DeleteRoomRequest) actualRequests.get(0)); @@ -383,7 +383,7 @@ public void listRoomsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getRoomsList().get(0), resources.get(0)); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListRoomsRequest actualRequest = ((ListRoomsRequest) actualRequests.get(0)); @@ -433,7 +433,7 @@ public void createBlurbTest() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, image); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -482,7 +482,7 @@ public void createBlurbTest2() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, text); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -531,7 +531,7 @@ public void createBlurbTest3() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, image); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -580,7 +580,7 @@ public void createBlurbTest4() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, text); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -629,7 +629,7 @@ public void createBlurbTest5() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, image); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -678,7 +678,7 @@ public void createBlurbTest6() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, text); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -727,7 +727,7 @@ public void createBlurbTest7() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, image); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -776,7 +776,7 @@ public void createBlurbTest8() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, text); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -825,7 +825,7 @@ public void createBlurbTest9() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, image); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -874,7 +874,7 @@ public void createBlurbTest10() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, text); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -923,7 +923,7 @@ public void createBlurbTest11() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, image); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -972,7 +972,7 @@ public void createBlurbTest12() throws Exception { Blurb actualResponse = client.createBlurb(parent, user, text); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBlurbRequest actualRequest = ((CreateBlurbRequest) actualRequests.get(0)); @@ -1017,7 +1017,7 @@ public void getBlurbTest() throws Exception { Blurb actualResponse = client.getBlurb(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBlurbRequest actualRequest = ((GetBlurbRequest) actualRequests.get(0)); @@ -1058,7 +1058,7 @@ public void getBlurbTest2() throws Exception { Blurb actualResponse = client.getBlurb(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBlurbRequest actualRequest = ((GetBlurbRequest) actualRequests.get(0)); @@ -1103,7 +1103,7 @@ public void updateBlurbTest() throws Exception { Blurb actualResponse = client.updateBlurb(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateBlurbRequest actualRequest = ((UpdateBlurbRequest) actualRequests.get(0)); @@ -1142,7 +1142,7 @@ public void deleteBlurbTest() throws Exception { client.deleteBlurb(name); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBlurbRequest actualRequest = ((DeleteBlurbRequest) actualRequests.get(0)); @@ -1176,7 +1176,7 @@ public void deleteBlurbTest2() throws Exception { client.deleteBlurb(name); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBlurbRequest actualRequest = ((DeleteBlurbRequest) actualRequests.get(0)); @@ -1220,7 +1220,7 @@ public void listBlurbsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBlurbsList().get(0), resources.get(0)); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBlurbsRequest actualRequest = ((ListBlurbsRequest) actualRequests.get(0)); @@ -1264,7 +1264,7 @@ public void listBlurbsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBlurbsList().get(0), resources.get(0)); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBlurbsRequest actualRequest = ((ListBlurbsRequest) actualRequests.get(0)); @@ -1308,7 +1308,7 @@ public void listBlurbsTest3() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBlurbsList().get(0), resources.get(0)); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBlurbsRequest actualRequest = ((ListBlurbsRequest) actualRequests.get(0)); @@ -1354,7 +1354,7 @@ public void searchBlurbsTest() throws Exception { SearchBlurbsResponse actualResponse = client.searchBlurbsAsync(parent, query).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchBlurbsRequest actualRequest = ((SearchBlurbsRequest) actualRequests.get(0)); @@ -1404,7 +1404,7 @@ public void searchBlurbsTest2() throws Exception { SearchBlurbsResponse actualResponse = client.searchBlurbsAsync(parent, query).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchBlurbsRequest actualRequest = ((SearchBlurbsRequest) actualRequests.get(0)); @@ -1454,7 +1454,7 @@ public void searchBlurbsTest3() throws Exception { SearchBlurbsResponse actualResponse = client.searchBlurbsAsync(parent, query).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockMessaging.getRequests(); + List actualRequests = mockMessaging.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchBlurbsRequest actualRequest = ((SearchBlurbsRequest) actualRequests.get(0)); @@ -1656,7 +1656,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -1707,7 +1707,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -1753,7 +1753,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -1805,7 +1805,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -1850,7 +1850,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java index dbf0d0e821..b1315aa4f5 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockCompliance() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java index 935a0a8532..25bf9291fc 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java @@ -17,7 +17,7 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.ComplianceGrpc.ComplianceImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockComplianceImpl extends ComplianceImplBase { - private List requests; + private List requests; private Queue responses; public MockComplianceImpl() { @@ -37,15 +37,15 @@ public MockComplianceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java index fc9db96a3e..4567510576 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockEcho() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java index f505bb9ad9..be45e07c2e 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.EchoGrpc.EchoImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockEchoImpl extends EchoImplBase { - private List requests; + private List requests; private Queue responses; public MockEchoImpl() { @@ -38,15 +38,15 @@ public MockEchoImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java index ef37c3d404..1e7ea12163 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java index 3c9b26728b..056fc23997 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java @@ -23,7 +23,7 @@ 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.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -34,7 +34,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -42,15 +42,15 @@ public MockIAMPolicyImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java index e6b7dd1c46..a32c1120ce 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIdentity() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java index 31b7602e49..e81da8f5c9 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java @@ -17,8 +17,8 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.IdentityGrpc.IdentityImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIdentityImpl extends IdentityImplBase { - private List requests; + private List requests; private Queue responses; public MockIdentityImpl() { @@ -38,15 +38,15 @@ public MockIdentityImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java index 43855bd7e0..9322aca03b 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLocations() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java index 59502a268d..3a8bb6de7b 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java @@ -22,7 +22,7 @@ import com.google.cloud.location.ListLocationsResponse; import com.google.cloud.location.Location; import com.google.cloud.location.LocationsGrpc.LocationsImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLocationsImpl extends LocationsImplBase { - private List requests; + private List requests; private Queue responses; public MockLocationsImpl() { @@ -41,15 +41,15 @@ public MockLocationsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java index b9517576ed..7e760e9147 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockMessaging() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java index 2a36840c7c..d900f71c4f 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.MessagingGrpc.MessagingImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -31,7 +31,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockMessagingImpl extends MessagingImplBase { - private List requests; + private List requests; private Queue responses; public MockMessagingImpl() { @@ -39,15 +39,15 @@ public MockMessagingImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java index 606571e14d..d6c9ed2659 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockSequenceService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java index 92e5fb15c8..cddde4ce28 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java @@ -17,8 +17,8 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.SequenceServiceGrpc.SequenceServiceImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockSequenceServiceImpl extends SequenceServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockSequenceServiceImpl() { @@ -38,15 +38,15 @@ public MockSequenceServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java index c03ddbbe4a..f59b3e89d9 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockTesting() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java index a73afd59a3..b2bc134089 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java @@ -17,8 +17,8 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.TestingGrpc.TestingImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockTestingImpl extends TestingImplBase { - private List requests; + private List requests; private Queue responses; public MockTestingImpl() { @@ -38,15 +38,15 @@ public MockTestingImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/SequenceServiceClientTest.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/SequenceServiceClientTest.java index 43d36555c0..c87e816c14 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/SequenceServiceClientTest.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/SequenceServiceClientTest.java @@ -41,11 +41,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.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -119,7 +119,7 @@ public void createSequenceTest() throws Exception { Sequence actualResponse = client.createSequence(sequence); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSequenceRequest actualRequest = ((CreateSequenceRequest) actualRequests.get(0)); @@ -159,7 +159,7 @@ public void createStreamingSequenceTest() throws Exception { StreamingSequence actualResponse = client.createStreamingSequence(streamingSequence); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateStreamingSequenceRequest actualRequest = ((CreateStreamingSequenceRequest) actualRequests.get(0)); @@ -199,7 +199,7 @@ public void getSequenceReportTest() throws Exception { SequenceReport actualResponse = client.getSequenceReport(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSequenceReportRequest actualRequest = ((GetSequenceReportRequest) actualRequests.get(0)); @@ -238,7 +238,7 @@ public void getSequenceReportTest2() throws Exception { SequenceReport actualResponse = client.getSequenceReport(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSequenceReportRequest actualRequest = ((GetSequenceReportRequest) actualRequests.get(0)); @@ -277,7 +277,7 @@ public void getStreamingSequenceReportTest() throws Exception { StreamingSequenceReport actualResponse = client.getStreamingSequenceReport(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetStreamingSequenceReportRequest actualRequest = ((GetStreamingSequenceReportRequest) actualRequests.get(0)); @@ -317,7 +317,7 @@ public void getStreamingSequenceReportTest2() throws Exception { StreamingSequenceReport actualResponse = client.getStreamingSequenceReport(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetStreamingSequenceReportRequest actualRequest = ((GetStreamingSequenceReportRequest) actualRequests.get(0)); @@ -352,7 +352,7 @@ public void attemptSequenceTest() throws Exception { client.attemptSequence(name); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AttemptSequenceRequest actualRequest = ((AttemptSequenceRequest) actualRequests.get(0)); @@ -386,7 +386,7 @@ public void attemptSequenceTest2() throws Exception { client.attemptSequence(name); - List actualRequests = mockSequenceService.getRequests(); + List actualRequests = mockSequenceService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AttemptSequenceRequest actualRequest = ((AttemptSequenceRequest) actualRequests.get(0)); @@ -486,7 +486,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -537,7 +537,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -583,7 +583,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -635,7 +635,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -680,7 +680,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/TestingClientTest.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/TestingClientTest.java index 1d6280165d..1383288081 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/TestingClientTest.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/TestingClientTest.java @@ -40,11 +40,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.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -115,7 +115,7 @@ public void createSessionTest() throws Exception { Session actualResponse = client.createSession(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSessionRequest actualRequest = ((CreateSessionRequest) actualRequests.get(0)); @@ -153,7 +153,7 @@ public void getSessionTest() throws Exception { Session actualResponse = client.getSession(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSessionRequest actualRequest = ((GetSessionRequest) actualRequests.get(0)); @@ -202,7 +202,7 @@ public void listSessionsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSessionsList().get(0), resources.get(0)); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSessionsRequest actualRequest = ((ListSessionsRequest) actualRequests.get(0)); @@ -242,7 +242,7 @@ public void deleteSessionTest() throws Exception { client.deleteSession(request); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSessionRequest actualRequest = ((DeleteSessionRequest) actualRequests.get(0)); @@ -280,7 +280,7 @@ public void reportSessionTest() throws Exception { ReportSessionResponse actualResponse = client.reportSession(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); ReportSessionRequest actualRequest = ((ReportSessionRequest) actualRequests.get(0)); @@ -332,7 +332,7 @@ public void listTestsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getTestsList().get(0), resources.get(0)); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTestsRequest actualRequest = ((ListTestsRequest) actualRequests.get(0)); @@ -376,7 +376,7 @@ public void deleteTestTest() throws Exception { client.deleteTest(request); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTestRequest actualRequest = ((DeleteTestRequest) actualRequests.get(0)); @@ -420,7 +420,7 @@ public void verifyTestTest() throws Exception { VerifyTestResponse actualResponse = client.verifyTest(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockTesting.getRequests(); + List actualRequests = mockTesting.getRequests(); Assert.assertEquals(1, actualRequests.size()); VerifyTestRequest actualRequest = ((VerifyTestRequest) actualRequests.get(0)); @@ -477,7 +477,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -528,7 +528,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -574,7 +574,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -626,7 +626,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -671,7 +671,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClientTest.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClientTest.java index e70f1c000f..f26fabc6c3 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClientTest.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceClientTest.java @@ -26,7 +26,7 @@ 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.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.Arrays; @@ -97,7 +97,7 @@ public void listConnectionsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getConnectionsList().get(0), resources.get(0)); - List actualRequests = mockConnectionService.getRequests(); + List actualRequests = mockConnectionService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListConnectionsRequest actualRequest = ((ListConnectionsRequest) actualRequests.get(0)); @@ -141,7 +141,7 @@ public void listConnectionsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getConnectionsList().get(0), resources.get(0)); - List actualRequests = mockConnectionService.getRequests(); + List actualRequests = mockConnectionService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListConnectionsRequest actualRequest = ((ListConnectionsRequest) actualRequests.get(0)); diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java index 342a7081cb..32b7fbf580 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockConnectionService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java index 6dc865c8c9..89128dbe69 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.apigeeconnect.v1.ConnectionServiceGrpc.ConnectionServiceImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockConnectionServiceImpl extends ConnectionServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockConnectionServiceImpl() { @@ -37,15 +37,15 @@ public MockConnectionServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java index d24fc94881..6322e9c5a2 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockTether() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java index 8161f3b2e8..8fa8a7c79c 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.apigeeconnect.v1.TetherGrpc.TetherImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockTetherImpl extends TetherImplBase { - private List requests; + private List requests; private Queue responses; public MockTetherImpl() { @@ -37,15 +37,15 @@ public MockTetherImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClientTest.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClientTest.java index ba45a86b80..024038f76c 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClientTest.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClientTest.java @@ -32,11 +32,11 @@ import com.google.api.resourcenames.ResourceName; 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.Duration; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import com.google.protobuf.Timestamp; import com.google.type.Expr; import io.grpc.StatusRuntimeException; @@ -122,7 +122,7 @@ public void exportAssetsTest() throws Exception { ExportAssetsResponse actualResponse = client.exportAssetsAsync(request).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ExportAssetsRequest actualRequest = ((ExportAssetsRequest) actualRequests.get(0)); @@ -182,7 +182,7 @@ public void listAssetsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getAssetsList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListAssetsRequest actualRequest = ((ListAssetsRequest) actualRequests.get(0)); @@ -226,7 +226,7 @@ public void listAssetsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getAssetsList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListAssetsRequest actualRequest = ((ListAssetsRequest) actualRequests.get(0)); @@ -271,7 +271,7 @@ public void batchGetAssetsHistoryTest() throws Exception { BatchGetAssetsHistoryResponse actualResponse = client.batchGetAssetsHistory(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchGetAssetsHistoryRequest actualRequest = ((BatchGetAssetsHistoryRequest) actualRequests.get(0)); @@ -328,7 +328,7 @@ public void createFeedTest() throws Exception { Feed actualResponse = client.createFeed(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateFeedRequest actualRequest = ((CreateFeedRequest) actualRequests.get(0)); @@ -372,7 +372,7 @@ public void getFeedTest() throws Exception { Feed actualResponse = client.getFeed(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetFeedRequest actualRequest = ((GetFeedRequest) actualRequests.get(0)); @@ -416,7 +416,7 @@ public void getFeedTest2() throws Exception { Feed actualResponse = client.getFeed(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetFeedRequest actualRequest = ((GetFeedRequest) actualRequests.get(0)); @@ -452,7 +452,7 @@ public void listFeedsTest() throws Exception { ListFeedsResponse actualResponse = client.listFeeds(parent); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListFeedsRequest actualRequest = ((ListFeedsRequest) actualRequests.get(0)); @@ -496,7 +496,7 @@ public void updateFeedTest() throws Exception { Feed actualResponse = client.updateFeed(feed); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateFeedRequest actualRequest = ((UpdateFeedRequest) actualRequests.get(0)); @@ -530,7 +530,7 @@ public void deleteFeedTest() throws Exception { client.deleteFeed(name); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteFeedRequest actualRequest = ((DeleteFeedRequest) actualRequests.get(0)); @@ -564,7 +564,7 @@ public void deleteFeedTest2() throws Exception { client.deleteFeed(name); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteFeedRequest actualRequest = ((DeleteFeedRequest) actualRequests.get(0)); @@ -611,7 +611,7 @@ public void searchAllResourcesTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResultsList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchAllResourcesRequest actualRequest = ((SearchAllResourcesRequest) actualRequests.get(0)); @@ -660,7 +660,7 @@ public void searchAllIamPoliciesTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResultsList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); SearchAllIamPoliciesRequest actualRequest = ((SearchAllIamPoliciesRequest) actualRequests.get(0)); @@ -709,7 +709,7 @@ public void analyzeIamPolicyTest() throws Exception { AnalyzeIamPolicyResponse actualResponse = client.analyzeIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeIamPolicyRequest actualRequest = ((AnalyzeIamPolicyRequest) actualRequests.get(0)); @@ -764,7 +764,7 @@ public void analyzeIamPolicyLongrunningTest() throws Exception { client.analyzeIamPolicyLongrunningAsync(request).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeIamPolicyLongrunningRequest actualRequest = ((AnalyzeIamPolicyLongrunningRequest) actualRequests.get(0)); @@ -814,7 +814,7 @@ public void analyzeMoveTest() throws Exception { AnalyzeMoveResponse actualResponse = client.analyzeMove(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); AnalyzeMoveRequest actualRequest = ((AnalyzeMoveRequest) actualRequests.get(0)); @@ -866,7 +866,7 @@ public void queryAssetsTest() throws Exception { QueryAssetsResponse actualResponse = client.queryAssets(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); QueryAssetsRequest actualRequest = ((QueryAssetsRequest) actualRequests.get(0)); @@ -929,7 +929,7 @@ public void createSavedQueryTest() throws Exception { SavedQuery actualResponse = client.createSavedQuery(parent, savedQuery, savedQueryId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSavedQueryRequest actualRequest = ((CreateSavedQueryRequest) actualRequests.get(0)); @@ -981,7 +981,7 @@ public void createSavedQueryTest2() throws Exception { SavedQuery actualResponse = client.createSavedQuery(parent, savedQuery, savedQueryId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSavedQueryRequest actualRequest = ((CreateSavedQueryRequest) actualRequests.get(0)); @@ -1033,7 +1033,7 @@ public void createSavedQueryTest3() throws Exception { SavedQuery actualResponse = client.createSavedQuery(parent, savedQuery, savedQueryId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSavedQueryRequest actualRequest = ((CreateSavedQueryRequest) actualRequests.get(0)); @@ -1085,7 +1085,7 @@ public void createSavedQueryTest4() throws Exception { SavedQuery actualResponse = client.createSavedQuery(parent, savedQuery, savedQueryId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSavedQueryRequest actualRequest = ((CreateSavedQueryRequest) actualRequests.get(0)); @@ -1135,7 +1135,7 @@ public void getSavedQueryTest() throws Exception { SavedQuery actualResponse = client.getSavedQuery(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSavedQueryRequest actualRequest = ((GetSavedQueryRequest) actualRequests.get(0)); @@ -1181,7 +1181,7 @@ public void getSavedQueryTest2() throws Exception { SavedQuery actualResponse = client.getSavedQuery(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSavedQueryRequest actualRequest = ((GetSavedQueryRequest) actualRequests.get(0)); @@ -1225,7 +1225,7 @@ public void listSavedQueriesTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSavedQueriesList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSavedQueriesRequest actualRequest = ((ListSavedQueriesRequest) actualRequests.get(0)); @@ -1269,7 +1269,7 @@ public void listSavedQueriesTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSavedQueriesList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSavedQueriesRequest actualRequest = ((ListSavedQueriesRequest) actualRequests.get(0)); @@ -1313,7 +1313,7 @@ public void listSavedQueriesTest3() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSavedQueriesList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSavedQueriesRequest actualRequest = ((ListSavedQueriesRequest) actualRequests.get(0)); @@ -1357,7 +1357,7 @@ public void listSavedQueriesTest4() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSavedQueriesList().get(0), resources.get(0)); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSavedQueriesRequest actualRequest = ((ListSavedQueriesRequest) actualRequests.get(0)); @@ -1404,7 +1404,7 @@ public void updateSavedQueryTest() throws Exception { SavedQuery actualResponse = client.updateSavedQuery(savedQuery, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSavedQueryRequest actualRequest = ((UpdateSavedQueryRequest) actualRequests.get(0)); @@ -1440,7 +1440,7 @@ public void deleteSavedQueryTest() throws Exception { client.deleteSavedQuery(name); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSavedQueryRequest actualRequest = ((DeleteSavedQueryRequest) actualRequests.get(0)); @@ -1474,7 +1474,7 @@ public void deleteSavedQueryTest2() throws Exception { client.deleteSavedQuery(name); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSavedQueryRequest actualRequest = ((DeleteSavedQueryRequest) actualRequests.get(0)); @@ -1518,7 +1518,7 @@ public void batchGetEffectiveIamPoliciesTest() throws Exception { client.batchGetEffectiveIamPolicies(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockAssetService.getRequests(); + List actualRequests = mockAssetService.getRequests(); Assert.assertEquals(1, actualRequests.size()); BatchGetEffectiveIamPoliciesRequest actualRequest = ((BatchGetEffectiveIamPoliciesRequest) actualRequests.get(0)); diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java index f95c6ba2e4..b893f79e21 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockAssetService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java index 0f4ca7f433..b58a7bad6d 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java @@ -19,8 +19,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.asset.v1.AssetServiceGrpc.AssetServiceImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -31,7 +31,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockAssetServiceImpl extends AssetServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockAssetServiceImpl() { @@ -39,15 +39,15 @@ public MockAssetServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java index ed5e2f44e9..1bd0f22367 100644 --- a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java +++ b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClientTest.java @@ -48,8 +48,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.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -222,7 +222,7 @@ public void mutateRowTest() throws Exception { 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)); @@ -263,7 +263,7 @@ public void mutateRowTest2() throws Exception { 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)); @@ -305,7 +305,7 @@ public void mutateRowTest3() throws Exception { MutateRowResponse actualResponse = client.mutateRow(tableName, rowKey, mutations, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); MutateRowRequest actualRequest = ((MutateRowRequest) actualRequests.get(0)); @@ -349,7 +349,7 @@ public void mutateRowTest4() throws Exception { MutateRowResponse actualResponse = client.mutateRow(tableName, rowKey, mutations, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); MutateRowRequest actualRequest = ((MutateRowRequest) actualRequests.get(0)); @@ -448,7 +448,7 @@ public void checkAndMutateRowTest() throws Exception { 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)); @@ -497,7 +497,7 @@ public void checkAndMutateRowTest2() throws Exception { 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)); @@ -548,7 +548,7 @@ public void checkAndMutateRowTest3() throws Exception { tableName, rowKey, predicateFilter, trueMutations, falseMutations, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); CheckAndMutateRowRequest actualRequest = ((CheckAndMutateRowRequest) actualRequests.get(0)); @@ -602,7 +602,7 @@ public void checkAndMutateRowTest4() throws Exception { tableName, rowKey, predicateFilter, trueMutations, falseMutations, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); CheckAndMutateRowRequest actualRequest = ((CheckAndMutateRowRequest) actualRequests.get(0)); @@ -648,7 +648,7 @@ public void pingAndWarmTest() throws Exception { PingAndWarmResponse actualResponse = client.pingAndWarm(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); PingAndWarmRequest actualRequest = ((PingAndWarmRequest) actualRequests.get(0)); @@ -683,7 +683,7 @@ public void pingAndWarmTest2() throws Exception { PingAndWarmResponse actualResponse = client.pingAndWarm(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); PingAndWarmRequest actualRequest = ((PingAndWarmRequest) actualRequests.get(0)); @@ -719,7 +719,7 @@ public void pingAndWarmTest3() throws Exception { PingAndWarmResponse actualResponse = client.pingAndWarm(name, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); PingAndWarmRequest actualRequest = ((PingAndWarmRequest) actualRequests.get(0)); @@ -757,7 +757,7 @@ public void pingAndWarmTest4() throws Exception { PingAndWarmResponse actualResponse = client.pingAndWarm(name, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); PingAndWarmRequest actualRequest = ((PingAndWarmRequest) actualRequests.get(0)); @@ -797,7 +797,7 @@ public void readModifyWriteRowTest() throws Exception { 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)); @@ -839,7 +839,7 @@ public void readModifyWriteRowTest2() throws Exception { 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)); @@ -883,7 +883,7 @@ public void readModifyWriteRowTest3() throws Exception { client.readModifyWriteRow(tableName, rowKey, rules, appProfileId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockBigtable.getRequests(); + List actualRequests = mockBigtable.getRequests(); Assert.assertEquals(1, actualRequests.size()); ReadModifyWriteRowRequest actualRequest = ((ReadModifyWriteRowRequest) actualRequests.get(0)); @@ -929,7 +929,7 @@ public void readModifyWriteRowTest4() throws Exception { client.readModifyWriteRow(tableName, rowKey, rules, appProfileId); 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/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java index 727061f892..c5d6571a86 100644 --- a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java +++ b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockBigtable() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java index bc67264c49..5590a608c4 100644 --- a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java +++ b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java @@ -32,7 +32,7 @@ import com.google.bigtable.v2.ReadRowsResponse; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -43,7 +43,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockBigtableImpl extends BigtableImplBase { - private List requests; + private List requests; private Queue responses; public MockBigtableImpl() { @@ -51,15 +51,15 @@ public MockBigtableImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IAMCredentialsClientTest.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IAMCredentialsClientTest.java index 2884e4c02a..5d0e324ed3 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IAMCredentialsClientTest.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IAMCredentialsClientTest.java @@ -23,9 +23,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.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -97,7 +97,7 @@ public void generateAccessTokenTest() throws Exception { 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)); @@ -146,7 +146,7 @@ public void generateAccessTokenTest2() throws Exception { 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)); @@ -192,7 +192,7 @@ public void generateIdTokenTest() throws Exception { 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)); @@ -238,7 +238,7 @@ public void generateIdTokenTest2() throws Exception { 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)); @@ -285,7 +285,7 @@ public void signBlobTest() throws Exception { 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)); @@ -330,7 +330,7 @@ public void signBlobTest2() throws Exception { 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)); @@ -375,7 +375,7 @@ public void signJwtTest() throws Exception { 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)); @@ -420,7 +420,7 @@ public void signJwtTest2() throws Exception { 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)); diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java index 5998e6b2af..f99f69f9cb 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMCredentials() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java index 1a4f3bb9b1..b8d0805273 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.iam.credentials.v1.IAMCredentialsGrpc.IAMCredentialsImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMCredentialsImpl extends IAMCredentialsImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMCredentialsImpl() { @@ -37,15 +37,15 @@ public MockIAMCredentialsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClientTest.java b/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClientTest.java index 2f87738967..00a9097018 100644 --- a/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClientTest.java +++ b/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClientTest.java @@ -23,9 +23,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.FieldMask; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -99,7 +99,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -151,7 +151,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -196,7 +196,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java index 320757dfa7..723ee1a31a 100644 --- a/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java +++ b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java index 403b0aedae..46c364b905 100644 --- a/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java +++ b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -37,15 +37,15 @@ public MockIAMPolicyImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java index 414cf1f0b8..3dddd2b74a 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClientTest.java @@ -42,11 +42,11 @@ import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.FieldMask; import com.google.protobuf.Int64Value; +import com.google.protobuf.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -125,7 +125,7 @@ public void listKeyRingsTest() throws Exception { 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)); @@ -169,7 +169,7 @@ public void listKeyRingsTest2() throws Exception { 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)); @@ -213,7 +213,7 @@ public void listCryptoKeysTest() throws Exception { 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)); @@ -257,7 +257,7 @@ public void listCryptoKeysTest2() throws Exception { 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)); @@ -302,7 +302,7 @@ public void listCryptoKeyVersionsTest() throws Exception { 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)); @@ -348,7 +348,7 @@ public void listCryptoKeyVersionsTest2() throws Exception { 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)); @@ -393,7 +393,7 @@ public void listImportJobsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getImportJobsList().get(0), resources.get(0)); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListImportJobsRequest actualRequest = ((ListImportJobsRequest) actualRequests.get(0)); @@ -437,7 +437,7 @@ public void listImportJobsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getImportJobsList().get(0), resources.get(0)); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListImportJobsRequest actualRequest = ((ListImportJobsRequest) actualRequests.get(0)); @@ -476,7 +476,7 @@ public void getKeyRingTest() throws Exception { 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)); @@ -515,7 +515,7 @@ public void getKeyRingTest2() throws Exception { 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)); @@ -560,7 +560,7 @@ public void getCryptoKeyTest() throws Exception { 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)); @@ -606,7 +606,7 @@ public void getCryptoKeyTest2() throws Exception { 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)); @@ -663,7 +663,7 @@ public void getCryptoKeyVersionTest() throws Exception { 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)); @@ -720,7 +720,7 @@ public void getCryptoKeyVersionTest2() throws Exception { 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)); @@ -762,7 +762,7 @@ public void getPublicKeyTest() throws Exception { 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)); @@ -804,7 +804,7 @@ public void getPublicKeyTest2() throws Exception { 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)); @@ -851,7 +851,7 @@ public void getImportJobTest() throws Exception { ImportJob actualResponse = client.getImportJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetImportJobRequest actualRequest = ((GetImportJobRequest) actualRequests.get(0)); @@ -899,7 +899,7 @@ public void getImportJobTest2() throws Exception { ImportJob actualResponse = client.getImportJob(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetImportJobRequest actualRequest = ((GetImportJobRequest) actualRequests.get(0)); @@ -940,7 +940,7 @@ public void createKeyRingTest() throws Exception { 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)); @@ -985,7 +985,7 @@ public void createKeyRingTest2() throws Exception { 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)); @@ -1036,7 +1036,7 @@ public void createCryptoKeyTest() throws Exception { 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)); @@ -1087,7 +1087,7 @@ public void createCryptoKeyTest2() throws Exception { 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)); @@ -1148,7 +1148,7 @@ public void createCryptoKeyVersionTest() throws Exception { 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)); @@ -1208,7 +1208,7 @@ public void createCryptoKeyVersionTest2() throws Exception { 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)); @@ -1272,7 +1272,7 @@ public void importCryptoKeyVersionTest() throws Exception { CryptoKeyVersion actualResponse = client.importCryptoKeyVersion(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportCryptoKeyVersionRequest actualRequest = ((ImportCryptoKeyVersionRequest) actualRequests.get(0)); @@ -1331,7 +1331,7 @@ public void createImportJobTest() throws Exception { ImportJob actualResponse = client.createImportJob(parent, importJobId, importJob); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateImportJobRequest actualRequest = ((CreateImportJobRequest) actualRequests.get(0)); @@ -1384,7 +1384,7 @@ public void createImportJobTest2() throws Exception { ImportJob actualResponse = client.createImportJob(parent, importJobId, importJob); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateImportJobRequest actualRequest = ((CreateImportJobRequest) actualRequests.get(0)); @@ -1434,7 +1434,7 @@ public void updateCryptoKeyTest() throws Exception { 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)); @@ -1492,7 +1492,7 @@ public void updateCryptoKeyVersionTest() throws Exception { 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)); @@ -1538,7 +1538,7 @@ public void encryptTest() throws Exception { 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)); @@ -1583,7 +1583,7 @@ public void encryptTest2() throws Exception { 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)); @@ -1625,7 +1625,7 @@ public void decryptTest() throws Exception { 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)); @@ -1668,7 +1668,7 @@ public void decryptTest2() throws Exception { 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)); @@ -1714,7 +1714,7 @@ public void asymmetricSignTest() throws Exception { 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)); @@ -1760,7 +1760,7 @@ public void asymmetricSignTest2() throws Exception { 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)); @@ -1805,7 +1805,7 @@ public void asymmetricDecryptTest() throws Exception { 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)); @@ -1850,7 +1850,7 @@ public void asymmetricDecryptTest2() throws Exception { 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)); @@ -1898,7 +1898,7 @@ public void updateCryptoKeyPrimaryVersionTest() throws Exception { 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)); @@ -1948,7 +1948,7 @@ public void updateCryptoKeyPrimaryVersionTest2() throws Exception { 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)); @@ -2008,7 +2008,7 @@ public void destroyCryptoKeyVersionTest() throws Exception { 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)); @@ -2066,7 +2066,7 @@ public void destroyCryptoKeyVersionTest2() throws Exception { 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)); @@ -2124,7 +2124,7 @@ public void restoreCryptoKeyVersionTest() throws Exception { 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)); @@ -2182,7 +2182,7 @@ public void restoreCryptoKeyVersionTest2() throws Exception { 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)); @@ -2230,7 +2230,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockKeyManagementService.getRequests(); + List actualRequests = mockKeyManagementService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -2287,7 +2287,7 @@ public void listLocationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getLocationsList().get(0), resources.get(0)); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListLocationsRequest actualRequest = ((ListLocationsRequest) actualRequests.get(0)); @@ -2338,7 +2338,7 @@ public void getLocationTest() throws Exception { Location actualResponse = client.getLocation(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLocations.getRequests(); + List actualRequests = mockLocations.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetLocationRequest actualRequest = ((GetLocationRequest) actualRequests.get(0)); @@ -2380,7 +2380,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java index 7d7613bc81..e229ac9ff6 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java index a6f63ba41b..f9d4b2d94d 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java @@ -22,7 +22,7 @@ import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -41,15 +41,15 @@ public MockIAMPolicyImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java index 83b6188727..944a56637f 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockKeyManagementService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java index 77d41dfdb7..f4ebea2f40 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java @@ -20,7 +20,7 @@ import com.google.cloud.kms.v1.KeyManagementServiceGrpc.KeyManagementServiceImplBase; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.Policy; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -31,7 +31,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockKeyManagementServiceImpl extends KeyManagementServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockKeyManagementServiceImpl() { @@ -39,15 +39,15 @@ public MockKeyManagementServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java index 569ad9376d..82d17e691a 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLocations() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java index f24011c8fa..935e6eb9bd 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java @@ -22,7 +22,7 @@ import com.google.cloud.location.ListLocationsResponse; import com.google.cloud.location.Location; import com.google.cloud.location.LocationsGrpc.LocationsImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLocationsImpl extends LocationsImplBase { - private List requests; + private List requests; private Queue responses; public MockLocationsImpl() { @@ -41,15 +41,15 @@ public MockLocationsImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClientTest.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClientTest.java index 5889f34023..22eea13a1a 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClientTest.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClientTest.java @@ -44,9 +44,9 @@ import com.google.example.library.v1.Shelf; import com.google.example.library.v1.ShelfName; import com.google.example.library.v1.UpdateBookRequest; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.Arrays; @@ -112,7 +112,7 @@ public void createShelfTest() throws Exception { Shelf actualResponse = client.createShelf(shelf); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateShelfRequest actualRequest = ((CreateShelfRequest) actualRequests.get(0)); @@ -151,7 +151,7 @@ public void getShelfTest() throws Exception { Shelf actualResponse = client.getShelf(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetShelfRequest actualRequest = ((GetShelfRequest) actualRequests.get(0)); @@ -190,7 +190,7 @@ public void getShelfTest2() throws Exception { Shelf actualResponse = client.getShelf(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetShelfRequest actualRequest = ((GetShelfRequest) actualRequests.get(0)); @@ -238,7 +238,7 @@ public void listShelvesTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getShelvesList().get(0), resources.get(0)); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListShelvesRequest actualRequest = ((ListShelvesRequest) actualRequests.get(0)); @@ -277,7 +277,7 @@ public void deleteShelfTest() throws Exception { client.deleteShelf(name); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteShelfRequest actualRequest = ((DeleteShelfRequest) actualRequests.get(0)); @@ -311,7 +311,7 @@ public void deleteShelfTest2() throws Exception { client.deleteShelf(name); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteShelfRequest actualRequest = ((DeleteShelfRequest) actualRequests.get(0)); @@ -351,7 +351,7 @@ public void mergeShelvesTest() throws Exception { Shelf actualResponse = client.mergeShelves(name, otherShelf); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MergeShelvesRequest actualRequest = ((MergeShelvesRequest) actualRequests.get(0)); @@ -393,7 +393,7 @@ public void mergeShelvesTest2() throws Exception { Shelf actualResponse = client.mergeShelves(name, otherShelf); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MergeShelvesRequest actualRequest = ((MergeShelvesRequest) actualRequests.get(0)); @@ -435,7 +435,7 @@ public void mergeShelvesTest3() throws Exception { Shelf actualResponse = client.mergeShelves(name, otherShelf); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MergeShelvesRequest actualRequest = ((MergeShelvesRequest) actualRequests.get(0)); @@ -477,7 +477,7 @@ public void mergeShelvesTest4() throws Exception { Shelf actualResponse = client.mergeShelves(name, otherShelf); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MergeShelvesRequest actualRequest = ((MergeShelvesRequest) actualRequests.get(0)); @@ -521,7 +521,7 @@ public void createBookTest() throws Exception { Book actualResponse = client.createBook(parent, book); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBookRequest actualRequest = ((CreateBookRequest) actualRequests.get(0)); @@ -565,7 +565,7 @@ public void createBookTest2() throws Exception { Book actualResponse = client.createBook(parent, book); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBookRequest actualRequest = ((CreateBookRequest) actualRequests.get(0)); @@ -608,7 +608,7 @@ public void getBookTest() throws Exception { Book actualResponse = client.getBook(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBookRequest actualRequest = ((GetBookRequest) actualRequests.get(0)); @@ -649,7 +649,7 @@ public void getBookTest2() throws Exception { Book actualResponse = client.getBook(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBookRequest actualRequest = ((GetBookRequest) actualRequests.get(0)); @@ -693,7 +693,7 @@ public void listBooksTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBooksList().get(0), resources.get(0)); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBooksRequest actualRequest = ((ListBooksRequest) actualRequests.get(0)); @@ -737,7 +737,7 @@ public void listBooksTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBooksList().get(0), resources.get(0)); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBooksRequest actualRequest = ((ListBooksRequest) actualRequests.get(0)); @@ -771,7 +771,7 @@ public void deleteBookTest() throws Exception { client.deleteBook(name); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBookRequest actualRequest = ((DeleteBookRequest) actualRequests.get(0)); @@ -805,7 +805,7 @@ public void deleteBookTest2() throws Exception { client.deleteBook(name); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBookRequest actualRequest = ((DeleteBookRequest) actualRequests.get(0)); @@ -847,7 +847,7 @@ public void updateBookTest() throws Exception { Book actualResponse = client.updateBook(book, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateBookRequest actualRequest = ((UpdateBookRequest) actualRequests.get(0)); @@ -891,7 +891,7 @@ public void moveBookTest() throws Exception { Book actualResponse = client.moveBook(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MoveBookRequest actualRequest = ((MoveBookRequest) actualRequests.get(0)); @@ -935,7 +935,7 @@ public void moveBookTest2() throws Exception { Book actualResponse = client.moveBook(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MoveBookRequest actualRequest = ((MoveBookRequest) actualRequests.get(0)); @@ -979,7 +979,7 @@ public void moveBookTest3() throws Exception { Book actualResponse = client.moveBook(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MoveBookRequest actualRequest = ((MoveBookRequest) actualRequests.get(0)); @@ -1023,7 +1023,7 @@ public void moveBookTest4() throws Exception { Book actualResponse = client.moveBook(name, otherShelfName); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockLibraryService.getRequests(); + List actualRequests = mockLibraryService.getRequests(); Assert.assertEquals(1, actualRequests.size()); MoveBookRequest actualRequest = ((MoveBookRequest) actualRequests.get(0)); diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java index b8617750ed..cc4d2178b6 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLibraryService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java index 3be3da3235..ec2df9b687 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java @@ -33,8 +33,8 @@ import com.google.example.library.v1.MoveBookRequest; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.UpdateBookRequest; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -45,7 +45,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLibraryServiceImpl extends LibraryServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockLibraryServiceImpl() { @@ -53,15 +53,15 @@ public MockLibraryServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClientTest.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClientTest.java index 98cff97a04..c2dabbdb23 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClientTest.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClientTest.java @@ -83,10 +83,10 @@ import com.google.logging.v2.UpdateSinkRequest; import com.google.logging.v2.UpdateViewRequest; 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.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -161,7 +161,7 @@ public void listBucketsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -206,7 +206,7 @@ public void listBucketsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -250,7 +250,7 @@ public void listBucketsTest3() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -294,7 +294,7 @@ public void listBucketsTest4() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -338,7 +338,7 @@ public void listBucketsTest5() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -391,7 +391,7 @@ public void getBucketTest() throws Exception { LogBucket actualResponse = client.getBucket(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBucketRequest actualRequest = ((GetBucketRequest) actualRequests.get(0)); @@ -449,7 +449,7 @@ public void createBucketTest() throws Exception { LogBucket actualResponse = client.createBucket(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBucketRequest actualRequest = ((CreateBucketRequest) actualRequests.get(0)); @@ -511,7 +511,7 @@ public void updateBucketTest() throws Exception { LogBucket actualResponse = client.updateBucket(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateBucketRequest actualRequest = ((UpdateBucketRequest) actualRequests.get(0)); @@ -559,7 +559,7 @@ public void deleteBucketTest() throws Exception { client.deleteBucket(request); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBucketRequest actualRequest = ((DeleteBucketRequest) actualRequests.get(0)); @@ -603,7 +603,7 @@ public void undeleteBucketTest() throws Exception { client.undeleteBucket(request); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UndeleteBucketRequest actualRequest = ((UndeleteBucketRequest) actualRequests.get(0)); @@ -652,7 +652,7 @@ public void listViewsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getViewsList().get(0), resources.get(0)); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListViewsRequest actualRequest = ((ListViewsRequest) actualRequests.get(0)); @@ -703,7 +703,7 @@ public void getViewTest() throws Exception { LogView actualResponse = client.getView(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetViewRequest actualRequest = ((GetViewRequest) actualRequests.get(0)); @@ -759,7 +759,7 @@ public void createViewTest() throws Exception { LogView actualResponse = client.createView(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateViewRequest actualRequest = ((CreateViewRequest) actualRequests.get(0)); @@ -816,7 +816,7 @@ public void updateViewTest() throws Exception { LogView actualResponse = client.updateView(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateViewRequest actualRequest = ((UpdateViewRequest) actualRequests.get(0)); @@ -863,7 +863,7 @@ public void deleteViewTest() throws Exception { client.deleteView(request); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteViewRequest actualRequest = ((DeleteViewRequest) actualRequests.get(0)); @@ -913,7 +913,7 @@ public void listSinksTest() throws Exception { 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)); @@ -957,7 +957,7 @@ public void listSinksTest2() throws Exception { 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)); @@ -1001,7 +1001,7 @@ public void listSinksTest3() throws Exception { 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)); @@ -1045,7 +1045,7 @@ public void listSinksTest4() throws Exception { 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)); @@ -1089,7 +1089,7 @@ public void listSinksTest5() throws Exception { 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)); @@ -1136,7 +1136,7 @@ public void getSinkTest() throws Exception { 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)); @@ -1183,7 +1183,7 @@ public void getSinkTest2() throws Exception { 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)); @@ -1231,7 +1231,7 @@ public void createSinkTest() throws Exception { 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)); @@ -1281,7 +1281,7 @@ public void createSinkTest2() throws Exception { 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)); @@ -1331,7 +1331,7 @@ public void createSinkTest3() throws Exception { 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)); @@ -1381,7 +1381,7 @@ public void createSinkTest4() throws Exception { 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)); @@ -1431,7 +1431,7 @@ public void createSinkTest5() throws Exception { 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)); @@ -1481,7 +1481,7 @@ public void updateSinkTest() throws Exception { 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)); @@ -1531,7 +1531,7 @@ public void updateSinkTest2() throws Exception { 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)); @@ -1582,7 +1582,7 @@ public void updateSinkTest3() throws Exception { 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)); @@ -1635,7 +1635,7 @@ public void updateSinkTest4() throws Exception { 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)); @@ -1673,7 +1673,7 @@ public void deleteSinkTest() throws Exception { client.deleteSink(sinkName); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSinkRequest actualRequest = ((DeleteSinkRequest) actualRequests.get(0)); @@ -1707,7 +1707,7 @@ public void deleteSinkTest2() throws Exception { client.deleteSink(sinkName); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSinkRequest actualRequest = ((DeleteSinkRequest) actualRequests.get(0)); @@ -1751,7 +1751,7 @@ public void listExclusionsTest() throws Exception { 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)); @@ -1795,7 +1795,7 @@ public void listExclusionsTest2() throws Exception { 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)); @@ -1839,7 +1839,7 @@ public void listExclusionsTest3() throws Exception { 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)); @@ -1883,7 +1883,7 @@ public void listExclusionsTest4() throws Exception { 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)); @@ -1927,7 +1927,7 @@ public void listExclusionsTest5() throws Exception { 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)); @@ -1970,7 +1970,7 @@ public void getExclusionTest() throws Exception { 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)); @@ -2013,7 +2013,7 @@ public void getExclusionTest2() throws Exception { 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)); @@ -2057,7 +2057,7 @@ public void createExclusionTest() throws Exception { 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)); @@ -2103,7 +2103,7 @@ public void createExclusionTest2() throws Exception { 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)); @@ -2149,7 +2149,7 @@ public void createExclusionTest3() throws Exception { 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)); @@ -2195,7 +2195,7 @@ public void createExclusionTest4() throws Exception { 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)); @@ -2241,7 +2241,7 @@ public void createExclusionTest5() throws Exception { 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)); @@ -2288,7 +2288,7 @@ public void updateExclusionTest() throws Exception { 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)); @@ -2337,7 +2337,7 @@ public void updateExclusionTest2() throws Exception { 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)); @@ -2375,7 +2375,7 @@ public void deleteExclusionTest() throws Exception { client.deleteExclusion(name); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteExclusionRequest actualRequest = ((DeleteExclusionRequest) actualRequests.get(0)); @@ -2409,7 +2409,7 @@ public void deleteExclusionTest2() throws Exception { client.deleteExclusion(name); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteExclusionRequest actualRequest = ((DeleteExclusionRequest) actualRequests.get(0)); @@ -2452,7 +2452,7 @@ public void getCmekSettingsTest() throws Exception { CmekSettings actualResponse = client.getCmekSettings(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetCmekSettingsRequest actualRequest = ((GetCmekSettingsRequest) actualRequests.get(0)); @@ -2500,7 +2500,7 @@ public void updateCmekSettingsTest() throws Exception { CmekSettings actualResponse = client.updateCmekSettings(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateCmekSettingsRequest actualRequest = ((UpdateCmekSettingsRequest) actualRequests.get(0)); @@ -2549,7 +2549,7 @@ public void getSettingsTest() throws Exception { Settings actualResponse = client.getSettings(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSettingsRequest actualRequest = ((GetSettingsRequest) actualRequests.get(0)); @@ -2591,7 +2591,7 @@ public void getSettingsTest2() throws Exception { Settings actualResponse = client.getSettings(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSettingsRequest actualRequest = ((GetSettingsRequest) actualRequests.get(0)); @@ -2634,7 +2634,7 @@ public void updateSettingsTest() throws Exception { Settings actualResponse = client.updateSettings(settings, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSettingsRequest actualRequest = ((UpdateSettingsRequest) actualRequests.get(0)); @@ -2683,7 +2683,7 @@ public void copyLogEntriesTest() throws Exception { CopyLogEntriesResponse actualResponse = client.copyLogEntriesAsync(request).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockConfigServiceV2.getRequests(); + List actualRequests = mockConfigServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); CopyLogEntriesRequest actualRequest = ((CopyLogEntriesRequest) actualRequests.get(0)); diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClientTest.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClientTest.java index 5299f96735..887ada0bd8 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClientTest.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClientTest.java @@ -51,9 +51,9 @@ import com.google.logging.v2.TailLogEntriesResponse; import com.google.logging.v2.WriteLogEntriesRequest; import com.google.logging.v2.WriteLogEntriesResponse; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Duration; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.StatusRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -118,7 +118,7 @@ public void deleteLogTest() throws Exception { client.deleteLog(logName); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogRequest actualRequest = ((DeleteLogRequest) actualRequests.get(0)); @@ -152,7 +152,7 @@ public void deleteLogTest2() throws Exception { client.deleteLog(logName); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogRequest actualRequest = ((DeleteLogRequest) actualRequests.get(0)); @@ -191,7 +191,7 @@ public void writeLogEntriesTest() throws Exception { 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)); @@ -236,7 +236,7 @@ public void writeLogEntriesTest2() throws Exception { 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)); @@ -289,7 +289,7 @@ public void listLogEntriesTest() throws Exception { 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)); @@ -343,7 +343,7 @@ public void listMonitoredResourceDescriptorsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getResourceDescriptorsList().get(0), resources.get(0)); - List actualRequests = mockLoggingServiceV2.getRequests(); + List actualRequests = mockLoggingServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListMonitoredResourceDescriptorsRequest actualRequest = ((ListMonitoredResourceDescriptorsRequest) actualRequests.get(0)); @@ -393,7 +393,7 @@ public void listLogsTest() throws Exception { 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)); @@ -437,7 +437,7 @@ public void listLogsTest2() throws Exception { 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)); @@ -481,7 +481,7 @@ public void listLogsTest3() throws Exception { 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)); @@ -525,7 +525,7 @@ public void listLogsTest4() throws Exception { 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)); @@ -569,7 +569,7 @@ public void listLogsTest5() throws Exception { 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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClientTest.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClientTest.java index 34c333cdcc..45bff5f4e2 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClientTest.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClientTest.java @@ -37,8 +37,8 @@ import com.google.logging.v2.LogMetricName; 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.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -111,7 +111,7 @@ public void listLogMetricsTest() throws Exception { 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)); @@ -155,7 +155,7 @@ public void listLogMetricsTest2() throws Exception { 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)); @@ -202,7 +202,7 @@ public void getLogMetricTest() throws Exception { 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)); @@ -249,7 +249,7 @@ public void getLogMetricTest2() throws Exception { 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)); @@ -297,7 +297,7 @@ public void createLogMetricTest() throws Exception { 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)); @@ -347,7 +347,7 @@ public void createLogMetricTest2() throws Exception { 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)); @@ -397,7 +397,7 @@ public void updateLogMetricTest() throws Exception { 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)); @@ -447,7 +447,7 @@ public void updateLogMetricTest2() throws Exception { 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)); @@ -483,7 +483,7 @@ public void deleteLogMetricTest() throws Exception { client.deleteLogMetric(metricName); - List actualRequests = mockMetricsServiceV2.getRequests(); + List actualRequests = mockMetricsServiceV2.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteLogMetricRequest actualRequest = ((DeleteLogMetricRequest) actualRequests.get(0)); @@ -517,7 +517,7 @@ public void deleteLogMetricTest2() throws Exception { 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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java index 4307b38185..437fcb0325 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockConfigServiceV2() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java index 4228dd7b5a..eed73ec1f2 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java @@ -55,8 +55,8 @@ import com.google.logging.v2.UpdateSinkRequest; import com.google.logging.v2.UpdateViewRequest; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -67,7 +67,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockConfigServiceV2Impl extends ConfigServiceV2ImplBase { - private List requests; + private List requests; private Queue responses; public MockConfigServiceV2Impl() { @@ -75,15 +75,15 @@ public MockConfigServiceV2Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java index 3a0d1f388b..aa559c3eb3 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLoggingServiceV2() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java index cfff19d231..b9c299e2ee 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java @@ -29,8 +29,8 @@ import com.google.logging.v2.TailLogEntriesResponse; 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.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -41,7 +41,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLoggingServiceV2Impl extends LoggingServiceV2ImplBase { - private List requests; + private List requests; private Queue responses; public MockLoggingServiceV2Impl() { @@ -49,15 +49,15 @@ public MockLoggingServiceV2Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java index d4bb1d5af7..2ecfab1798 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockMetricsServiceV2() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java index 597b93be7c..6c26aea17d 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java @@ -25,8 +25,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.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -37,7 +37,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockMetricsServiceV2Impl extends MetricsServiceV2ImplBase { - private List requests; + private List requests; private Queue responses; public MockMetricsServiceV2Impl() { @@ -45,15 +45,15 @@ public MockMetricsServiceV2Impl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java index ee510a051e..770453ebfa 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java index f686ce75c5..c820f602f3 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java @@ -23,7 +23,7 @@ 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.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -34,7 +34,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -42,15 +42,15 @@ public MockIAMPolicyImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java index 239ed03690..e841ca6224 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockPublisher() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java index 5b2148c36d..badfc5e37a 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java @@ -17,8 +17,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.Message; import com.google.pubsub.v1.DeleteTopicRequest; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -44,7 +44,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockPublisherImpl extends PublisherImplBase { - private List requests; + private List requests; private Queue responses; public MockPublisherImpl() { @@ -52,15 +52,15 @@ public MockPublisherImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java index 838d5fbc68..876d053185 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockSchemaService() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java index c2324f0b71..3ca3d85249 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java @@ -17,8 +17,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.Message; import com.google.pubsub.v1.CommitSchemaRequest; import com.google.pubsub.v1.CreateSchemaRequest; import com.google.pubsub.v1.DeleteSchemaRequest; @@ -45,7 +45,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockSchemaServiceImpl extends SchemaServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockSchemaServiceImpl() { @@ -53,15 +53,15 @@ public MockSchemaServiceImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java index 067dcd8615..1b61bbd8fd 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockSubscriber() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java index e466178eb9..4a39b40a39 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java @@ -17,8 +17,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.Message; import com.google.pubsub.v1.AcknowledgeRequest; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -52,7 +52,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockSubscriberImpl extends SubscriberImplBase { - private List requests; + private List requests; private Queue responses; public MockSubscriberImpl() { @@ -60,15 +60,15 @@ public MockSubscriberImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java index fd24a2b9d8..b0a147ab5c 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java @@ -35,10 +35,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.Message; import com.google.protobuf.Timestamp; import com.google.pubsub.v1.CommitSchemaRequest; import com.google.pubsub.v1.CreateSchemaRequest; @@ -132,7 +132,7 @@ public void createSchemaTest() throws Exception { Schema actualResponse = client.createSchema(parent, schema, schemaId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSchemaRequest actualRequest = ((CreateSchemaRequest) actualRequests.get(0)); @@ -179,7 +179,7 @@ public void createSchemaTest2() throws Exception { Schema actualResponse = client.createSchema(parent, schema, schemaId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateSchemaRequest actualRequest = ((CreateSchemaRequest) actualRequests.get(0)); @@ -224,7 +224,7 @@ public void getSchemaTest() throws Exception { Schema actualResponse = client.getSchema(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSchemaRequest actualRequest = ((GetSchemaRequest) actualRequests.get(0)); @@ -265,7 +265,7 @@ public void getSchemaTest2() throws Exception { Schema actualResponse = client.getSchema(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSchemaRequest actualRequest = ((GetSchemaRequest) actualRequests.get(0)); @@ -309,7 +309,7 @@ public void listSchemasTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSchemasRequest actualRequest = ((ListSchemasRequest) actualRequests.get(0)); @@ -353,7 +353,7 @@ public void listSchemasTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSchemasRequest actualRequest = ((ListSchemasRequest) actualRequests.get(0)); @@ -397,7 +397,7 @@ public void listSchemaRevisionsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSchemaRevisionsRequest actualRequest = ((ListSchemaRevisionsRequest) actualRequests.get(0)); @@ -441,7 +441,7 @@ public void listSchemaRevisionsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSchemasList().get(0), resources.get(0)); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListSchemaRevisionsRequest actualRequest = ((ListSchemaRevisionsRequest) actualRequests.get(0)); @@ -483,7 +483,7 @@ public void commitSchemaTest() throws Exception { Schema actualResponse = client.commitSchema(name, schema); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CommitSchemaRequest actualRequest = ((CommitSchemaRequest) actualRequests.get(0)); @@ -527,7 +527,7 @@ public void commitSchemaTest2() throws Exception { Schema actualResponse = client.commitSchema(name, schema); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); CommitSchemaRequest actualRequest = ((CommitSchemaRequest) actualRequests.get(0)); @@ -571,7 +571,7 @@ public void rollbackSchemaTest() throws Exception { Schema actualResponse = client.rollbackSchema(name, revisionId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); RollbackSchemaRequest actualRequest = ((RollbackSchemaRequest) actualRequests.get(0)); @@ -615,7 +615,7 @@ public void rollbackSchemaTest2() throws Exception { Schema actualResponse = client.rollbackSchema(name, revisionId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); RollbackSchemaRequest actualRequest = ((RollbackSchemaRequest) actualRequests.get(0)); @@ -659,7 +659,7 @@ public void deleteSchemaRevisionTest() throws Exception { Schema actualResponse = client.deleteSchemaRevision(name, revisionId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSchemaRevisionRequest actualRequest = ((DeleteSchemaRevisionRequest) actualRequests.get(0)); @@ -704,7 +704,7 @@ public void deleteSchemaRevisionTest2() throws Exception { Schema actualResponse = client.deleteSchemaRevision(name, revisionId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSchemaRevisionRequest actualRequest = ((DeleteSchemaRevisionRequest) actualRequests.get(0)); @@ -741,7 +741,7 @@ public void deleteSchemaTest() throws Exception { client.deleteSchema(name); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSchemaRequest actualRequest = ((DeleteSchemaRequest) actualRequests.get(0)); @@ -775,7 +775,7 @@ public void deleteSchemaTest2() throws Exception { client.deleteSchema(name); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSchemaRequest actualRequest = ((DeleteSchemaRequest) actualRequests.get(0)); @@ -811,7 +811,7 @@ public void validateSchemaTest() throws Exception { ValidateSchemaResponse actualResponse = client.validateSchema(parent, schema); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ValidateSchemaRequest actualRequest = ((ValidateSchemaRequest) actualRequests.get(0)); @@ -849,7 +849,7 @@ public void validateSchemaTest2() throws Exception { ValidateSchemaResponse actualResponse = client.validateSchema(parent, schema); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ValidateSchemaRequest actualRequest = ((ValidateSchemaRequest) actualRequests.get(0)); @@ -891,7 +891,7 @@ public void validateMessageTest() throws Exception { ValidateMessageResponse actualResponse = client.validateMessage(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSchemaService.getRequests(); + List actualRequests = mockSchemaService.getRequests(); Assert.assertEquals(1, actualRequests.size()); ValidateMessageRequest actualRequest = ((ValidateMessageRequest) actualRequests.get(0)); @@ -946,7 +946,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -998,7 +998,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -1043,7 +1043,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java index 54cd0f750c..1a07a5191a 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java @@ -39,11 +39,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.Message; import com.google.protobuf.Timestamp; import com.google.pubsub.v1.AcknowledgeRequest; import com.google.pubsub.v1.BigQueryConfig; @@ -166,7 +166,7 @@ public void createSubscriptionTest() throws Exception { 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)); @@ -229,7 +229,7 @@ public void createSubscriptionTest2() throws Exception { 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)); @@ -292,7 +292,7 @@ public void createSubscriptionTest3() throws Exception { 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)); @@ -355,7 +355,7 @@ public void createSubscriptionTest4() throws Exception { 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)); @@ -414,7 +414,7 @@ public void getSubscriptionTest() throws Exception { 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)); @@ -467,7 +467,7 @@ public void getSubscriptionTest2() throws Exception { 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)); @@ -524,7 +524,7 @@ public void updateSubscriptionTest() throws Exception { Subscription actualResponse = client.updateSubscription(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSubscriptionRequest actualRequest = ((UpdateSubscriptionRequest) actualRequests.get(0)); @@ -573,7 +573,7 @@ public void listSubscriptionsTest() throws Exception { 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)); @@ -617,7 +617,7 @@ public void listSubscriptionsTest2() throws Exception { 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)); @@ -651,7 +651,7 @@ public void deleteSubscriptionTest() throws Exception { client.deleteSubscription(subscription); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = ((DeleteSubscriptionRequest) actualRequests.get(0)); @@ -685,7 +685,7 @@ public void deleteSubscriptionTest2() throws Exception { client.deleteSubscription(subscription); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSubscriptionRequest actualRequest = ((DeleteSubscriptionRequest) actualRequests.get(0)); @@ -721,7 +721,7 @@ public void modifyAckDeadlineTest() throws Exception { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = ((ModifyAckDeadlineRequest) actualRequests.get(0)); @@ -761,7 +761,7 @@ public void modifyAckDeadlineTest2() throws Exception { client.modifyAckDeadline(subscription, ackIds, ackDeadlineSeconds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyAckDeadlineRequest actualRequest = ((ModifyAckDeadlineRequest) actualRequests.get(0)); @@ -800,7 +800,7 @@ public void acknowledgeTest() throws Exception { client.acknowledge(subscription, ackIds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = ((AcknowledgeRequest) actualRequests.get(0)); @@ -837,7 +837,7 @@ public void acknowledgeTest2() throws Exception { client.acknowledge(subscription, ackIds); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); AcknowledgeRequest actualRequest = ((AcknowledgeRequest) actualRequests.get(0)); @@ -876,7 +876,7 @@ public void pullTest() throws Exception { PullResponse actualResponse = client.pull(subscription, maxMessages); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); @@ -915,7 +915,7 @@ public void pullTest2() throws Exception { PullResponse actualResponse = client.pull(subscription, maxMessages); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); PullRequest actualRequest = ((PullRequest) actualRequests.get(0)); @@ -955,7 +955,7 @@ public void pullTest3() throws Exception { 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)); @@ -997,7 +997,7 @@ public void pullTest4() throws Exception { 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)); @@ -1111,7 +1111,7 @@ public void modifyPushConfigTest() throws Exception { client.modifyPushConfig(subscription, pushConfig); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = ((ModifyPushConfigRequest) actualRequests.get(0)); @@ -1148,7 +1148,7 @@ public void modifyPushConfigTest2() throws Exception { client.modifyPushConfig(subscription, pushConfig); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); ModifyPushConfigRequest actualRequest = ((ModifyPushConfigRequest) actualRequests.get(0)); @@ -1191,7 +1191,7 @@ public void getSnapshotTest() throws Exception { Snapshot actualResponse = client.getSnapshot(snapshot); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = ((GetSnapshotRequest) actualRequests.get(0)); @@ -1232,7 +1232,7 @@ public void getSnapshotTest2() throws Exception { Snapshot actualResponse = client.getSnapshot(snapshot); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetSnapshotRequest actualRequest = ((GetSnapshotRequest) actualRequests.get(0)); @@ -1276,7 +1276,7 @@ public void listSnapshotsTest() throws Exception { 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)); @@ -1320,7 +1320,7 @@ public void listSnapshotsTest2() throws Exception { 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)); @@ -1362,7 +1362,7 @@ public void createSnapshotTest() throws Exception { 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)); @@ -1406,7 +1406,7 @@ public void createSnapshotTest2() throws Exception { 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)); @@ -1450,7 +1450,7 @@ public void createSnapshotTest3() throws Exception { 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)); @@ -1494,7 +1494,7 @@ public void createSnapshotTest4() throws Exception { 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)); @@ -1541,7 +1541,7 @@ public void updateSnapshotTest() throws Exception { Snapshot actualResponse = client.updateSnapshot(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateSnapshotRequest actualRequest = ((UpdateSnapshotRequest) actualRequests.get(0)); @@ -1580,7 +1580,7 @@ public void deleteSnapshotTest() throws Exception { client.deleteSnapshot(snapshot); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = ((DeleteSnapshotRequest) actualRequests.get(0)); @@ -1614,7 +1614,7 @@ public void deleteSnapshotTest2() throws Exception { client.deleteSnapshot(snapshot); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteSnapshotRequest actualRequest = ((DeleteSnapshotRequest) actualRequests.get(0)); @@ -1652,7 +1652,7 @@ public void seekTest() throws Exception { SeekResponse actualResponse = client.seek(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockSubscriber.getRequests(); + List actualRequests = mockSubscriber.getRequests(); Assert.assertEquals(1, actualRequests.size()); SeekRequest actualRequest = ((SeekRequest) actualRequests.get(0)); @@ -1703,7 +1703,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -1755,7 +1755,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -1800,7 +1800,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClientTest.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClientTest.java index cf9aae1138..1eddf99525 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClientTest.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClientTest.java @@ -36,11 +36,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.Message; import com.google.pubsub.v1.DeleteTopicRequest; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -137,7 +137,7 @@ public void createTopicTest() throws Exception { 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)); @@ -181,7 +181,7 @@ public void createTopicTest2() throws Exception { 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)); @@ -229,7 +229,7 @@ public void updateTopicTest() throws Exception { Topic actualResponse = client.updateTopic(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateTopicRequest actualRequest = ((UpdateTopicRequest) actualRequests.get(0)); @@ -271,7 +271,7 @@ public void publishTest() throws Exception { 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)); @@ -310,7 +310,7 @@ public void publishTest2() throws Exception { 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)); @@ -356,7 +356,7 @@ public void getTopicTest() throws Exception { 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)); @@ -400,7 +400,7 @@ public void getTopicTest2() throws Exception { 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)); @@ -444,7 +444,7 @@ public void listTopicsTest() throws Exception { 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)); @@ -488,7 +488,7 @@ public void listTopicsTest2() throws Exception { 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)); @@ -532,7 +532,7 @@ public void listTopicSubscriptionsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTopicSubscriptionsRequest actualRequest = ((ListTopicSubscriptionsRequest) actualRequests.get(0)); @@ -577,7 +577,7 @@ public void listTopicSubscriptionsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSubscriptionsList().get(0), resources.get(0)); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTopicSubscriptionsRequest actualRequest = ((ListTopicSubscriptionsRequest) actualRequests.get(0)); @@ -622,7 +622,7 @@ public void listTopicSnapshotsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTopicSnapshotsRequest actualRequest = ((ListTopicSnapshotsRequest) actualRequests.get(0)); @@ -666,7 +666,7 @@ public void listTopicSnapshotsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getSnapshotsList().get(0), resources.get(0)); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListTopicSnapshotsRequest actualRequest = ((ListTopicSnapshotsRequest) actualRequests.get(0)); @@ -700,7 +700,7 @@ public void deleteTopicTest() throws Exception { client.deleteTopic(topic); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTopicRequest actualRequest = ((DeleteTopicRequest) actualRequests.get(0)); @@ -734,7 +734,7 @@ public void deleteTopicTest2() throws Exception { client.deleteTopic(topic); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteTopicRequest actualRequest = ((DeleteTopicRequest) actualRequests.get(0)); @@ -772,7 +772,7 @@ public void detachSubscriptionTest() throws Exception { DetachSubscriptionResponse actualResponse = client.detachSubscription(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockPublisher.getRequests(); + List actualRequests = mockPublisher.getRequests(); Assert.assertEquals(1, actualRequests.size()); DetachSubscriptionRequest actualRequest = ((DetachSubscriptionRequest) actualRequests.get(0)); @@ -821,7 +821,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -873,7 +873,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockIAMPolicy.getRequests(); + List actualRequests = mockIAMPolicy.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -918,7 +918,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(request); 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/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java index 955934ecde..d62d2ae764 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClientTest.java @@ -28,10 +28,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.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -106,7 +106,7 @@ public void listInstancesTest() throws Exception { 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)); @@ -150,7 +150,7 @@ public void listInstancesTest2() throws Exception { 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)); @@ -213,7 +213,7 @@ public void getInstanceTest() throws Exception { 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)); @@ -276,7 +276,7 @@ public void getInstanceTest2() throws Exception { 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)); @@ -312,7 +312,7 @@ public void getInstanceAuthStringTest() throws Exception { InstanceAuthString actualResponse = client.getInstanceAuthString(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceAuthStringRequest actualRequest = ((GetInstanceAuthStringRequest) actualRequests.get(0)); @@ -349,7 +349,7 @@ public void getInstanceAuthStringTest2() throws Exception { InstanceAuthString actualResponse = client.getInstanceAuthString(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetInstanceAuthStringRequest actualRequest = ((GetInstanceAuthStringRequest) actualRequests.get(0)); @@ -421,7 +421,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)); @@ -498,7 +498,7 @@ public void createInstanceTest2() 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)); @@ -574,7 +574,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)); @@ -648,7 +648,7 @@ public void upgradeInstanceTest() throws Exception { Instance actualResponse = client.upgradeInstanceAsync(name, redisVersion).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpgradeInstanceRequest actualRequest = ((UpgradeInstanceRequest) actualRequests.get(0)); @@ -722,7 +722,7 @@ public void upgradeInstanceTest2() throws Exception { Instance actualResponse = client.upgradeInstanceAsync(name, redisVersion).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpgradeInstanceRequest actualRequest = ((UpgradeInstanceRequest) actualRequests.get(0)); @@ -796,7 +796,7 @@ public void importInstanceTest() throws Exception { Instance actualResponse = client.importInstanceAsync(name, inputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); ImportInstanceRequest actualRequest = ((ImportInstanceRequest) actualRequests.get(0)); @@ -870,7 +870,7 @@ public void exportInstanceTest() throws Exception { Instance actualResponse = client.exportInstanceAsync(name, outputConfig).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); ExportInstanceRequest actualRequest = ((ExportInstanceRequest) actualRequests.get(0)); @@ -945,7 +945,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)); @@ -1021,7 +1021,7 @@ public void failoverInstanceTest2() 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)); @@ -1066,7 +1066,7 @@ public void deleteInstanceTest() throws Exception { client.deleteInstanceAsync(name).get(); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteInstanceRequest actualRequest = ((DeleteInstanceRequest) actualRequests.get(0)); @@ -1108,7 +1108,7 @@ public void deleteInstanceTest2() throws Exception { client.deleteInstanceAsync(name).get(); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteInstanceRequest actualRequest = ((DeleteInstanceRequest) actualRequests.get(0)); @@ -1183,7 +1183,7 @@ public void rescheduleMaintenanceTest() throws Exception { client.rescheduleMaintenanceAsync(name, rescheduleType, scheduleTime).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); RescheduleMaintenanceRequest actualRequest = ((RescheduleMaintenanceRequest) actualRequests.get(0)); @@ -1264,7 +1264,7 @@ public void rescheduleMaintenanceTest2() throws Exception { client.rescheduleMaintenanceAsync(name, rescheduleType, scheduleTime).get(); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockCloudRedis.getRequests(); + List actualRequests = mockCloudRedis.getRequests(); Assert.assertEquals(1, actualRequests.size()); RescheduleMaintenanceRequest actualRequest = ((RescheduleMaintenanceRequest) actualRequests.get(0)); diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java index a7fe90d365..d8282703ad 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockCloudRedis() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java index a247c252fa..486d2211df 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java @@ -19,7 +19,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.redis.v1beta1.CloudRedisGrpc.CloudRedisImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockCloudRedisImpl extends CloudRedisImplBase { - private List requests; + private List requests; private Queue responses; public MockCloudRedisImpl() { @@ -38,15 +38,15 @@ public MockCloudRedisImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java index da6553da1d..41992f458d 100644 --- a/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java +++ b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.api.gax.grpc.testing.MockGrpcService; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockStorage() { } @Override - public List getRequests() { + public List getRequests() { return serviceImpl.getRequests(); } @Override - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { serviceImpl.addResponse(response); } diff --git a/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java index 3807dd67eb..b91fbda861 100644 --- a/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java +++ b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.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.Message; import com.google.storage.v2.StorageGrpc.StorageImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -35,7 +35,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockStorageImpl extends StorageImplBase { - private List requests; + private List requests; private Queue responses; public MockStorageImpl() { @@ -43,15 +43,15 @@ public MockStorageImpl() { responses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addResponse(AbstractMessage response) { + public void addResponse(Message response) { responses.add(response); } - public void setResponses(List responses) { + public void setResponses(List responses) { this.responses = new LinkedList(responses); } diff --git a/test/integration/goldens/storage/src/com/google/storage/v2/StorageClientTest.java b/test/integration/goldens/storage/src/com/google/storage/v2/StorageClientTest.java index c8ed843e85..ad3b8f68e0 100644 --- a/test/integration/goldens/storage/src/com/google/storage/v2/StorageClientTest.java +++ b/test/integration/goldens/storage/src/com/google/storage/v2/StorageClientTest.java @@ -42,10 +42,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.Message; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -110,7 +110,7 @@ public void deleteBucketTest() throws Exception { client.deleteBucket(name); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBucketRequest actualRequest = ((DeleteBucketRequest) actualRequests.get(0)); @@ -144,7 +144,7 @@ public void deleteBucketTest2() throws Exception { client.deleteBucket(name); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteBucketRequest actualRequest = ((DeleteBucketRequest) actualRequests.get(0)); @@ -209,7 +209,7 @@ public void getBucketTest() throws Exception { Bucket actualResponse = client.getBucket(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBucketRequest actualRequest = ((GetBucketRequest) actualRequests.get(0)); @@ -274,7 +274,7 @@ public void getBucketTest2() throws Exception { Bucket actualResponse = client.getBucket(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetBucketRequest actualRequest = ((GetBucketRequest) actualRequests.get(0)); @@ -341,7 +341,7 @@ public void createBucketTest() throws Exception { Bucket actualResponse = client.createBucket(parent, bucket, bucketId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBucketRequest actualRequest = ((CreateBucketRequest) actualRequests.get(0)); @@ -412,7 +412,7 @@ public void createBucketTest2() throws Exception { Bucket actualResponse = client.createBucket(parent, bucket, bucketId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateBucketRequest actualRequest = ((CreateBucketRequest) actualRequests.get(0)); @@ -460,7 +460,7 @@ public void listBucketsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -504,7 +504,7 @@ public void listBucketsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getBucketsList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListBucketsRequest actualRequest = ((ListBucketsRequest) actualRequests.get(0)); @@ -569,7 +569,7 @@ public void lockBucketRetentionPolicyTest() throws Exception { Bucket actualResponse = client.lockBucketRetentionPolicy(bucket); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); LockBucketRetentionPolicyRequest actualRequest = ((LockBucketRetentionPolicyRequest) actualRequests.get(0)); @@ -635,7 +635,7 @@ public void lockBucketRetentionPolicyTest2() throws Exception { Bucket actualResponse = client.lockBucketRetentionPolicy(bucket); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); LockBucketRetentionPolicyRequest actualRequest = ((LockBucketRetentionPolicyRequest) actualRequests.get(0)); @@ -678,7 +678,7 @@ public void getIamPolicyTest() throws Exception { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -720,7 +720,7 @@ public void getIamPolicyTest2() throws Exception { Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetIamPolicyRequest actualRequest = ((GetIamPolicyRequest) actualRequests.get(0)); @@ -763,7 +763,7 @@ public void setIamPolicyTest() throws Exception { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -808,7 +808,7 @@ public void setIamPolicyTest2() throws Exception { Policy actualResponse = client.setIamPolicy(resource, policy); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); SetIamPolicyRequest actualRequest = ((SetIamPolicyRequest) actualRequests.get(0)); @@ -848,7 +848,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = ((TestIamPermissionsRequest) actualRequests.get(0)); @@ -888,7 +888,7 @@ public void testIamPermissionsTest2() throws Exception { TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); TestIamPermissionsRequest actualRequest = ((TestIamPermissionsRequest) actualRequests.get(0)); @@ -956,7 +956,7 @@ public void updateBucketTest() throws Exception { Bucket actualResponse = client.updateBucket(bucket, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateBucketRequest actualRequest = ((UpdateBucketRequest) actualRequests.get(0)); @@ -992,7 +992,7 @@ public void deleteNotificationTest() throws Exception { client.deleteNotification(name); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteNotificationRequest actualRequest = ((DeleteNotificationRequest) actualRequests.get(0)); @@ -1026,7 +1026,7 @@ public void deleteNotificationTest2() throws Exception { client.deleteNotification(name); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteNotificationRequest actualRequest = ((DeleteNotificationRequest) actualRequests.get(0)); @@ -1070,7 +1070,7 @@ public void getNotificationTest() throws Exception { Notification actualResponse = client.getNotification(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetNotificationRequest actualRequest = ((GetNotificationRequest) actualRequests.get(0)); @@ -1114,7 +1114,7 @@ public void getNotificationTest2() throws Exception { Notification actualResponse = client.getNotification(name); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetNotificationRequest actualRequest = ((GetNotificationRequest) actualRequests.get(0)); @@ -1159,7 +1159,7 @@ public void createNotificationTest() throws Exception { Notification actualResponse = client.createNotification(parent, notification); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateNotificationRequest actualRequest = ((CreateNotificationRequest) actualRequests.get(0)); @@ -1206,7 +1206,7 @@ public void createNotificationTest2() throws Exception { Notification actualResponse = client.createNotification(parent, notification); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateNotificationRequest actualRequest = ((CreateNotificationRequest) actualRequests.get(0)); @@ -1252,7 +1252,7 @@ public void listNotificationsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getNotificationsList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNotificationsRequest actualRequest = ((ListNotificationsRequest) actualRequests.get(0)); @@ -1296,7 +1296,7 @@ public void listNotificationsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getNotificationsList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListNotificationsRequest actualRequest = ((ListNotificationsRequest) actualRequests.get(0)); @@ -1374,7 +1374,7 @@ public void composeObjectTest() throws Exception { Object actualResponse = client.composeObject(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ComposeObjectRequest actualRequest = ((ComposeObjectRequest) actualRequests.get(0)); @@ -1431,7 +1431,7 @@ public void deleteObjectTest() throws Exception { client.deleteObject(bucket, object); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteObjectRequest actualRequest = ((DeleteObjectRequest) actualRequests.get(0)); @@ -1469,7 +1469,7 @@ public void deleteObjectTest2() throws Exception { client.deleteObject(bucket, object, generation); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteObjectRequest actualRequest = ((DeleteObjectRequest) actualRequests.get(0)); @@ -1509,7 +1509,7 @@ public void cancelResumableWriteTest() throws Exception { CancelResumableWriteResponse actualResponse = client.cancelResumableWrite(uploadId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CancelResumableWriteRequest actualRequest = ((CancelResumableWriteRequest) actualRequests.get(0)); @@ -1577,7 +1577,7 @@ public void getObjectTest() throws Exception { Object actualResponse = client.getObject(bucket, object); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetObjectRequest actualRequest = ((GetObjectRequest) actualRequests.get(0)); @@ -1647,7 +1647,7 @@ public void getObjectTest2() throws Exception { Object actualResponse = client.getObject(bucket, object, generation); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetObjectRequest actualRequest = ((GetObjectRequest) actualRequests.get(0)); @@ -1789,7 +1789,7 @@ public void updateObjectTest() throws Exception { Object actualResponse = client.updateObject(object, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateObjectRequest actualRequest = ((UpdateObjectRequest) actualRequests.get(0)); @@ -1893,7 +1893,7 @@ public void listObjectsTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getObjectsList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListObjectsRequest actualRequest = ((ListObjectsRequest) actualRequests.get(0)); @@ -1937,7 +1937,7 @@ public void listObjectsTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getObjectsList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListObjectsRequest actualRequest = ((ListObjectsRequest) actualRequests.get(0)); @@ -2006,7 +2006,7 @@ public void rewriteObjectTest() throws Exception { RewriteResponse actualResponse = client.rewriteObject(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); RewriteObjectRequest actualRequest = ((RewriteObjectRequest) actualRequests.get(0)); @@ -2111,7 +2111,7 @@ public void startResumableWriteTest() throws Exception { StartResumableWriteResponse actualResponse = client.startResumableWrite(request); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); StartResumableWriteRequest actualRequest = ((StartResumableWriteRequest) actualRequests.get(0)); @@ -2154,7 +2154,7 @@ public void queryWriteStatusTest() throws Exception { QueryWriteStatusResponse actualResponse = client.queryWriteStatus(uploadId); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); QueryWriteStatusRequest actualRequest = ((QueryWriteStatusRequest) actualRequests.get(0)); @@ -2190,7 +2190,7 @@ public void getServiceAccountTest() throws Exception { ServiceAccount actualResponse = client.getServiceAccount(project); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetServiceAccountRequest actualRequest = ((GetServiceAccountRequest) actualRequests.get(0)); @@ -2226,7 +2226,7 @@ public void getServiceAccountTest2() throws Exception { ServiceAccount actualResponse = client.getServiceAccount(project); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetServiceAccountRequest actualRequest = ((GetServiceAccountRequest) actualRequests.get(0)); @@ -2266,7 +2266,7 @@ public void createHmacKeyTest() throws Exception { CreateHmacKeyResponse actualResponse = client.createHmacKey(project, serviceAccountEmail); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateHmacKeyRequest actualRequest = ((CreateHmacKeyRequest) actualRequests.get(0)); @@ -2308,7 +2308,7 @@ public void createHmacKeyTest2() throws Exception { CreateHmacKeyResponse actualResponse = client.createHmacKey(project, serviceAccountEmail); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); CreateHmacKeyRequest actualRequest = ((CreateHmacKeyRequest) actualRequests.get(0)); @@ -2345,7 +2345,7 @@ public void deleteHmacKeyTest() throws Exception { client.deleteHmacKey(accessId, project); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteHmacKeyRequest actualRequest = ((DeleteHmacKeyRequest) actualRequests.get(0)); @@ -2382,7 +2382,7 @@ public void deleteHmacKeyTest2() throws Exception { client.deleteHmacKey(accessId, project); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); DeleteHmacKeyRequest actualRequest = ((DeleteHmacKeyRequest) actualRequests.get(0)); @@ -2430,7 +2430,7 @@ public void getHmacKeyTest() throws Exception { HmacKeyMetadata actualResponse = client.getHmacKey(accessId, project); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetHmacKeyRequest actualRequest = ((GetHmacKeyRequest) actualRequests.get(0)); @@ -2478,7 +2478,7 @@ public void getHmacKeyTest2() throws Exception { HmacKeyMetadata actualResponse = client.getHmacKey(accessId, project); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); GetHmacKeyRequest actualRequest = ((GetHmacKeyRequest) actualRequests.get(0)); @@ -2524,7 +2524,7 @@ public void listHmacKeysTest() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getHmacKeysList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListHmacKeysRequest actualRequest = ((ListHmacKeysRequest) actualRequests.get(0)); @@ -2568,7 +2568,7 @@ public void listHmacKeysTest2() throws Exception { Assert.assertEquals(1, resources.size()); Assert.assertEquals(expectedResponse.getHmacKeysList().get(0), resources.get(0)); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); ListHmacKeysRequest actualRequest = ((ListHmacKeysRequest) actualRequests.get(0)); @@ -2614,7 +2614,7 @@ public void updateHmacKeyTest() throws Exception { HmacKeyMetadata actualResponse = client.updateHmacKey(hmacKey, updateMask); Assert.assertEquals(expectedResponse, actualResponse); - List actualRequests = mockStorage.getRequests(); + List actualRequests = mockStorage.getRequests(); Assert.assertEquals(1, actualRequests.size()); UpdateHmacKeyRequest actualRequest = ((UpdateHmacKeyRequest) actualRequests.get(0));