From 3f531bd46404e11baa1e564721ee5731ca532b6f Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Fri, 12 Mar 2021 16:14:20 -0800 Subject: [PATCH] [ggj] fix(engx): Handle nulls with poll() in MockServiceImpl (#693) * fix(mixins): handle unit tests for mixin pagination methods * fix(engx): Handle nulls with poll() in MockServiceImpl --- .../MockServiceImplClassComposer.java | 24 +++-- .../composer/goldens/MockEchoImpl.golden | 30 +++--- .../goldens/asset/MockAssetServiceImpl.java | 50 +++++----- .../credentials/MockIAMCredentialsImpl.java | 16 ++-- .../goldens/iam/MockIAMPolicyImpl.java | 12 +-- .../goldens/kms/MockIAMPolicyImpl.java | 12 +-- .../kms/MockKeyManagementServiceImpl.java | 96 +++++++++---------- .../goldens/kms/MockLocationsImpl.java | 8 +- .../library/MockLibraryServiceImpl.java | 52 +++++----- .../logging/MockConfigServiceV2Impl.java | 92 +++++++++--------- .../logging/MockLoggingServiceV2Impl.java | 22 ++--- .../logging/MockMetricsServiceV2Impl.java | 20 ++-- .../goldens/redis/MockCloudRedisImpl.java | 36 +++---- 13 files changed, 247 insertions(+), 223 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java index 2f5b777a6f..20b1f3f71e 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java @@ -28,9 +28,11 @@ import com.google.api.generator.engine.ast.MethodDefinition; import com.google.api.generator.engine.ast.MethodInvocationExpr; import com.google.api.generator.engine.ast.NewObjectExpr; +import com.google.api.generator.engine.ast.RelationalOperationExpr; import com.google.api.generator.engine.ast.ScopeNode; import com.google.api.generator.engine.ast.Statement; import com.google.api.generator.engine.ast.StringObjectValue; +import com.google.api.generator.engine.ast.TernaryExpr; import com.google.api.generator.engine.ast.ThisObjectValue; import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.engine.ast.ValueExpr; @@ -304,7 +306,7 @@ private static MethodDefinition createGenericProtoMethodOverride(Method protoMet .setVariableExpr(localResponseVarExpr.toBuilder().setIsDecl(true).build()) .setValueExpr( MethodInvocationExpr.builder() - .setMethodName("remove") + .setMethodName("poll") .setExprReferenceExpr(responsesVarExpr) .setReturnType(objectType) .build()) @@ -485,15 +487,23 @@ private static Statement createHandleObjectStatement( } TypeNode exceptionType = TypeNode.withReference(ConcreteReference.withClazz(Exception.class)); + // Constructs `response == null ? "" : response.getClass().getName()`. Expr actualResponseTypeString = - MethodInvocationExpr.builder() - .setExprReferenceExpr( + TernaryExpr.builder() + .setConditionExpr( + RelationalOperationExpr.equalToWithExprs( + localResponseVarExpr, ValueExpr.createNullExpr())) + .setThenExpr(ValueExpr.withValue(StringObjectValue.withValue("null"))) + .setElseExpr( MethodInvocationExpr.builder() - .setExprReferenceExpr(localResponseVarExpr) - .setMethodName("getClass") + .setExprReferenceExpr( + MethodInvocationExpr.builder() + .setExprReferenceExpr(localResponseVarExpr) + .setMethodName("getClass") + .build()) + .setMethodName("getName") + .setReturnType(TypeNode.STRING) .build()) - .setMethodName("getName") - .setReturnType(TypeNode.STRING) .build(); Function typeToStrFn = t -> diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/MockEchoImpl.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/MockEchoImpl.golden index 6d78ee2827..50da1d568c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/MockEchoImpl.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/MockEchoImpl.golden @@ -45,7 +45,7 @@ public class MockEchoImpl extends EchoImplBase { @Override public void echo(EchoRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof EchoResponse) { requests.add(request); responseObserver.onNext(((EchoResponse) response)); @@ -57,7 +57,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method Echo, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), EchoResponse.class.getName(), Exception.class.getName()))); } @@ -65,7 +65,7 @@ public class MockEchoImpl extends EchoImplBase { @Override public void expand(ExpandRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof EchoResponse) { requests.add(request); responseObserver.onNext(((EchoResponse) response)); @@ -77,7 +77,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method Expand, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), EchoResponse.class.getName(), Exception.class.getName()))); } @@ -100,7 +100,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method Collect, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), EchoResponse.class.getName(), Exception.class.getName()))); } @@ -136,7 +136,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method Chat, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), EchoResponse.class.getName(), Exception.class.getName()))); } @@ -173,7 +173,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method ChatAgain, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), EchoResponse.class.getName(), Exception.class.getName()))); } @@ -195,7 +195,7 @@ public class MockEchoImpl extends EchoImplBase { @Override public void pagedExpand( PagedExpandRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof PagedExpandResponse) { requests.add(request); responseObserver.onNext(((PagedExpandResponse) response)); @@ -207,7 +207,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method PagedExpand, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), PagedExpandResponse.class.getName(), Exception.class.getName()))); } @@ -216,7 +216,7 @@ public class MockEchoImpl extends EchoImplBase { @Override public void simplePagedExpand( PagedExpandRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof PagedExpandResponse) { requests.add(request); responseObserver.onNext(((PagedExpandResponse) response)); @@ -228,7 +228,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method SimplePagedExpand, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), PagedExpandResponse.class.getName(), Exception.class.getName()))); } @@ -236,7 +236,7 @@ public class MockEchoImpl extends EchoImplBase { @Override public void wait(WaitRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -248,7 +248,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method Wait, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -256,7 +256,7 @@ public class MockEchoImpl extends EchoImplBase { @Override public void block(BlockRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof BlockResponse) { requests.add(request); responseObserver.onNext(((BlockResponse) response)); @@ -268,7 +268,7 @@ public class MockEchoImpl extends EchoImplBase { new IllegalArgumentException( String.format( "Unrecognized response type %s for method Block, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), BlockResponse.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/asset/MockAssetServiceImpl.java b/test/integration/goldens/asset/MockAssetServiceImpl.java index 17a70d2a2c..27b5f4021b 100644 --- a/test/integration/goldens/asset/MockAssetServiceImpl.java +++ b/test/integration/goldens/asset/MockAssetServiceImpl.java @@ -63,7 +63,7 @@ public void reset() { @Override public void exportAssets( ExportAssetsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -75,7 +75,7 @@ public void exportAssets( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ExportAssets, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -85,7 +85,7 @@ public void exportAssets( public void batchGetAssetsHistory( BatchGetAssetsHistoryRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof BatchGetAssetsHistoryResponse) { requests.add(request); responseObserver.onNext(((BatchGetAssetsHistoryResponse) response)); @@ -97,7 +97,7 @@ public void batchGetAssetsHistory( new IllegalArgumentException( String.format( "Unrecognized response type %s for method BatchGetAssetsHistory, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), BatchGetAssetsHistoryResponse.class.getName(), Exception.class.getName()))); } @@ -105,7 +105,7 @@ public void batchGetAssetsHistory( @Override public void createFeed(CreateFeedRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Feed) { requests.add(request); responseObserver.onNext(((Feed) response)); @@ -117,13 +117,15 @@ public void createFeed(CreateFeedRequest request, StreamObserver responseO new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateFeed, expected %s or %s", - response.getClass().getName(), Feed.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Feed.class.getName(), + Exception.class.getName()))); } } @Override public void getFeed(GetFeedRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Feed) { requests.add(request); responseObserver.onNext(((Feed) response)); @@ -135,14 +137,16 @@ public void getFeed(GetFeedRequest request, StreamObserver responseObserve new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetFeed, expected %s or %s", - response.getClass().getName(), Feed.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Feed.class.getName(), + Exception.class.getName()))); } } @Override public void listFeeds( ListFeedsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListFeedsResponse) { requests.add(request); responseObserver.onNext(((ListFeedsResponse) response)); @@ -154,7 +158,7 @@ public void listFeeds( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListFeeds, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListFeedsResponse.class.getName(), Exception.class.getName()))); } @@ -162,7 +166,7 @@ public void listFeeds( @Override public void updateFeed(UpdateFeedRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Feed) { requests.add(request); responseObserver.onNext(((Feed) response)); @@ -174,13 +178,15 @@ public void updateFeed(UpdateFeedRequest request, StreamObserver responseO new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateFeed, expected %s or %s", - response.getClass().getName(), Feed.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Feed.class.getName(), + Exception.class.getName()))); } } @Override public void deleteFeed(DeleteFeedRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -192,7 +198,7 @@ public void deleteFeed(DeleteFeedRequest request, StreamObserver response new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteFeed, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -202,7 +208,7 @@ public void deleteFeed(DeleteFeedRequest request, StreamObserver response public void searchAllResources( SearchAllResourcesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof SearchAllResourcesResponse) { requests.add(request); responseObserver.onNext(((SearchAllResourcesResponse) response)); @@ -214,7 +220,7 @@ public void searchAllResources( new IllegalArgumentException( String.format( "Unrecognized response type %s for method SearchAllResources, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), SearchAllResourcesResponse.class.getName(), Exception.class.getName()))); } @@ -224,7 +230,7 @@ public void searchAllResources( public void searchAllIamPolicies( SearchAllIamPoliciesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof SearchAllIamPoliciesResponse) { requests.add(request); responseObserver.onNext(((SearchAllIamPoliciesResponse) response)); @@ -236,7 +242,7 @@ public void searchAllIamPolicies( new IllegalArgumentException( String.format( "Unrecognized response type %s for method SearchAllIamPolicies, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), SearchAllIamPoliciesResponse.class.getName(), Exception.class.getName()))); } @@ -245,7 +251,7 @@ public void searchAllIamPolicies( @Override public void analyzeIamPolicy( AnalyzeIamPolicyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof AnalyzeIamPolicyResponse) { requests.add(request); responseObserver.onNext(((AnalyzeIamPolicyResponse) response)); @@ -257,7 +263,7 @@ public void analyzeIamPolicy( new IllegalArgumentException( String.format( "Unrecognized response type %s for method AnalyzeIamPolicy, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), AnalyzeIamPolicyResponse.class.getName(), Exception.class.getName()))); } @@ -266,7 +272,7 @@ public void analyzeIamPolicy( @Override public void analyzeIamPolicyLongrunning( AnalyzeIamPolicyLongrunningRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -278,7 +284,7 @@ public void analyzeIamPolicyLongrunning( new IllegalArgumentException( String.format( "Unrecognized response type %s for method AnalyzeIamPolicyLongrunning, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/credentials/MockIAMCredentialsImpl.java b/test/integration/goldens/credentials/MockIAMCredentialsImpl.java index 42ae7d9f5d..6d135bfc95 100644 --- a/test/integration/goldens/credentials/MockIAMCredentialsImpl.java +++ b/test/integration/goldens/credentials/MockIAMCredentialsImpl.java @@ -62,7 +62,7 @@ public void reset() { public void generateAccessToken( GenerateAccessTokenRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof GenerateAccessTokenResponse) { requests.add(request); responseObserver.onNext(((GenerateAccessTokenResponse) response)); @@ -74,7 +74,7 @@ public void generateAccessToken( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GenerateAccessToken, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), GenerateAccessTokenResponse.class.getName(), Exception.class.getName()))); } @@ -83,7 +83,7 @@ public void generateAccessToken( @Override public void generateIdToken( GenerateIdTokenRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof GenerateIdTokenResponse) { requests.add(request); responseObserver.onNext(((GenerateIdTokenResponse) response)); @@ -95,7 +95,7 @@ public void generateIdToken( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GenerateIdToken, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), GenerateIdTokenResponse.class.getName(), Exception.class.getName()))); } @@ -103,7 +103,7 @@ public void generateIdToken( @Override public void signBlob(SignBlobRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof SignBlobResponse) { requests.add(request); responseObserver.onNext(((SignBlobResponse) response)); @@ -115,7 +115,7 @@ public void signBlob(SignBlobRequest request, StreamObserver r new IllegalArgumentException( String.format( "Unrecognized response type %s for method SignBlob, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), SignBlobResponse.class.getName(), Exception.class.getName()))); } @@ -123,7 +123,7 @@ public void signBlob(SignBlobRequest request, StreamObserver r @Override public void signJwt(SignJwtRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof SignJwtResponse) { requests.add(request); responseObserver.onNext(((SignJwtResponse) response)); @@ -135,7 +135,7 @@ public void signJwt(SignJwtRequest request, StreamObserver resp new IllegalArgumentException( String.format( "Unrecognized response type %s for method SignJwt, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), SignJwtResponse.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/iam/MockIAMPolicyImpl.java b/test/integration/goldens/iam/MockIAMPolicyImpl.java index be1c62eb33..fc661c900c 100644 --- a/test/integration/goldens/iam/MockIAMPolicyImpl.java +++ b/test/integration/goldens/iam/MockIAMPolicyImpl.java @@ -60,7 +60,7 @@ public void reset() { @Override public void setIamPolicy(SetIamPolicyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Policy) { requests.add(request); responseObserver.onNext(((Policy) response)); @@ -72,7 +72,7 @@ public void setIamPolicy(SetIamPolicyRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method SetIamPolicy, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Policy.class.getName(), Exception.class.getName()))); } @@ -80,7 +80,7 @@ public void setIamPolicy(SetIamPolicyRequest request, StreamObserver res @Override public void getIamPolicy(GetIamPolicyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Policy) { requests.add(request); responseObserver.onNext(((Policy) response)); @@ -92,7 +92,7 @@ public void getIamPolicy(GetIamPolicyRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetIamPolicy, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Policy.class.getName(), Exception.class.getName()))); } @@ -102,7 +102,7 @@ public void getIamPolicy(GetIamPolicyRequest request, StreamObserver res public void testIamPermissions( TestIamPermissionsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof TestIamPermissionsResponse) { requests.add(request); responseObserver.onNext(((TestIamPermissionsResponse) response)); @@ -114,7 +114,7 @@ public void testIamPermissions( new IllegalArgumentException( String.format( "Unrecognized response type %s for method TestIamPermissions, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), TestIamPermissionsResponse.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/kms/MockIAMPolicyImpl.java b/test/integration/goldens/kms/MockIAMPolicyImpl.java index be1c62eb33..fc661c900c 100644 --- a/test/integration/goldens/kms/MockIAMPolicyImpl.java +++ b/test/integration/goldens/kms/MockIAMPolicyImpl.java @@ -60,7 +60,7 @@ public void reset() { @Override public void setIamPolicy(SetIamPolicyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Policy) { requests.add(request); responseObserver.onNext(((Policy) response)); @@ -72,7 +72,7 @@ public void setIamPolicy(SetIamPolicyRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method SetIamPolicy, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Policy.class.getName(), Exception.class.getName()))); } @@ -80,7 +80,7 @@ public void setIamPolicy(SetIamPolicyRequest request, StreamObserver res @Override public void getIamPolicy(GetIamPolicyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Policy) { requests.add(request); responseObserver.onNext(((Policy) response)); @@ -92,7 +92,7 @@ public void getIamPolicy(GetIamPolicyRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetIamPolicy, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Policy.class.getName(), Exception.class.getName()))); } @@ -102,7 +102,7 @@ public void getIamPolicy(GetIamPolicyRequest request, StreamObserver res public void testIamPermissions( TestIamPermissionsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof TestIamPermissionsResponse) { requests.add(request); responseObserver.onNext(((TestIamPermissionsResponse) response)); @@ -114,7 +114,7 @@ public void testIamPermissions( new IllegalArgumentException( String.format( "Unrecognized response type %s for method TestIamPermissions, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), TestIamPermissionsResponse.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/kms/MockKeyManagementServiceImpl.java b/test/integration/goldens/kms/MockKeyManagementServiceImpl.java index 12480f5a51..ea5e33c816 100644 --- a/test/integration/goldens/kms/MockKeyManagementServiceImpl.java +++ b/test/integration/goldens/kms/MockKeyManagementServiceImpl.java @@ -63,7 +63,7 @@ public void reset() { @Override public void listKeyRings( ListKeyRingsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListKeyRingsResponse) { requests.add(request); responseObserver.onNext(((ListKeyRingsResponse) response)); @@ -75,7 +75,7 @@ public void listKeyRings( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListKeyRings, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListKeyRingsResponse.class.getName(), Exception.class.getName()))); } @@ -84,7 +84,7 @@ public void listKeyRings( @Override public void listCryptoKeys( ListCryptoKeysRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListCryptoKeysResponse) { requests.add(request); responseObserver.onNext(((ListCryptoKeysResponse) response)); @@ -96,7 +96,7 @@ public void listCryptoKeys( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListCryptoKeys, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListCryptoKeysResponse.class.getName(), Exception.class.getName()))); } @@ -106,7 +106,7 @@ public void listCryptoKeys( public void listCryptoKeyVersions( ListCryptoKeyVersionsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListCryptoKeyVersionsResponse) { requests.add(request); responseObserver.onNext(((ListCryptoKeyVersionsResponse) response)); @@ -118,7 +118,7 @@ public void listCryptoKeyVersions( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListCryptoKeyVersions, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListCryptoKeyVersionsResponse.class.getName(), Exception.class.getName()))); } @@ -127,7 +127,7 @@ public void listCryptoKeyVersions( @Override public void listImportJobs( ListImportJobsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListImportJobsResponse) { requests.add(request); responseObserver.onNext(((ListImportJobsResponse) response)); @@ -139,7 +139,7 @@ public void listImportJobs( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListImportJobs, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListImportJobsResponse.class.getName(), Exception.class.getName()))); } @@ -147,7 +147,7 @@ public void listImportJobs( @Override public void getKeyRing(GetKeyRingRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof KeyRing) { requests.add(request); responseObserver.onNext(((KeyRing) response)); @@ -159,7 +159,7 @@ public void getKeyRing(GetKeyRingRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetKeyRing, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), KeyRing.class.getName(), Exception.class.getName()))); } @@ -168,7 +168,7 @@ public void getKeyRing(GetKeyRingRequest request, StreamObserver respon @Override public void getCryptoKey( GetCryptoKeyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKey) { requests.add(request); responseObserver.onNext(((CryptoKey) response)); @@ -180,7 +180,7 @@ public void getCryptoKey( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetCryptoKey, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKey.class.getName(), Exception.class.getName()))); } @@ -189,7 +189,7 @@ public void getCryptoKey( @Override public void getCryptoKeyVersion( GetCryptoKeyVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKeyVersion) { requests.add(request); responseObserver.onNext(((CryptoKeyVersion) response)); @@ -201,7 +201,7 @@ public void getCryptoKeyVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetCryptoKeyVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKeyVersion.class.getName(), Exception.class.getName()))); } @@ -210,7 +210,7 @@ public void getCryptoKeyVersion( @Override public void getPublicKey( GetPublicKeyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof PublicKey) { requests.add(request); responseObserver.onNext(((PublicKey) response)); @@ -222,7 +222,7 @@ public void getPublicKey( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetPublicKey, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), PublicKey.class.getName(), Exception.class.getName()))); } @@ -231,7 +231,7 @@ public void getPublicKey( @Override public void getImportJob( GetImportJobRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ImportJob) { requests.add(request); responseObserver.onNext(((ImportJob) response)); @@ -243,7 +243,7 @@ public void getImportJob( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetImportJob, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ImportJob.class.getName(), Exception.class.getName()))); } @@ -252,7 +252,7 @@ public void getImportJob( @Override public void createKeyRing( CreateKeyRingRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof KeyRing) { requests.add(request); responseObserver.onNext(((KeyRing) response)); @@ -264,7 +264,7 @@ public void createKeyRing( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateKeyRing, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), KeyRing.class.getName(), Exception.class.getName()))); } @@ -273,7 +273,7 @@ public void createKeyRing( @Override public void createCryptoKey( CreateCryptoKeyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKey) { requests.add(request); responseObserver.onNext(((CryptoKey) response)); @@ -285,7 +285,7 @@ public void createCryptoKey( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateCryptoKey, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKey.class.getName(), Exception.class.getName()))); } @@ -294,7 +294,7 @@ public void createCryptoKey( @Override public void createCryptoKeyVersion( CreateCryptoKeyVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKeyVersion) { requests.add(request); responseObserver.onNext(((CryptoKeyVersion) response)); @@ -306,7 +306,7 @@ public void createCryptoKeyVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateCryptoKeyVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKeyVersion.class.getName(), Exception.class.getName()))); } @@ -315,7 +315,7 @@ public void createCryptoKeyVersion( @Override public void importCryptoKeyVersion( ImportCryptoKeyVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKeyVersion) { requests.add(request); responseObserver.onNext(((CryptoKeyVersion) response)); @@ -327,7 +327,7 @@ public void importCryptoKeyVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ImportCryptoKeyVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKeyVersion.class.getName(), Exception.class.getName()))); } @@ -336,7 +336,7 @@ public void importCryptoKeyVersion( @Override public void createImportJob( CreateImportJobRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ImportJob) { requests.add(request); responseObserver.onNext(((ImportJob) response)); @@ -348,7 +348,7 @@ public void createImportJob( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateImportJob, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ImportJob.class.getName(), Exception.class.getName()))); } @@ -357,7 +357,7 @@ public void createImportJob( @Override public void updateCryptoKey( UpdateCryptoKeyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKey) { requests.add(request); responseObserver.onNext(((CryptoKey) response)); @@ -369,7 +369,7 @@ public void updateCryptoKey( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateCryptoKey, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKey.class.getName(), Exception.class.getName()))); } @@ -378,7 +378,7 @@ public void updateCryptoKey( @Override public void updateCryptoKeyVersion( UpdateCryptoKeyVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKeyVersion) { requests.add(request); responseObserver.onNext(((CryptoKeyVersion) response)); @@ -390,7 +390,7 @@ public void updateCryptoKeyVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateCryptoKeyVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKeyVersion.class.getName(), Exception.class.getName()))); } @@ -398,7 +398,7 @@ public void updateCryptoKeyVersion( @Override public void encrypt(EncryptRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof EncryptResponse) { requests.add(request); responseObserver.onNext(((EncryptResponse) response)); @@ -410,7 +410,7 @@ public void encrypt(EncryptRequest request, StreamObserver resp new IllegalArgumentException( String.format( "Unrecognized response type %s for method Encrypt, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), EncryptResponse.class.getName(), Exception.class.getName()))); } @@ -418,7 +418,7 @@ public void encrypt(EncryptRequest request, StreamObserver resp @Override public void decrypt(DecryptRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof DecryptResponse) { requests.add(request); responseObserver.onNext(((DecryptResponse) response)); @@ -430,7 +430,7 @@ public void decrypt(DecryptRequest request, StreamObserver resp new IllegalArgumentException( String.format( "Unrecognized response type %s for method Decrypt, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), DecryptResponse.class.getName(), Exception.class.getName()))); } @@ -439,7 +439,7 @@ public void decrypt(DecryptRequest request, StreamObserver resp @Override public void asymmetricSign( AsymmetricSignRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof AsymmetricSignResponse) { requests.add(request); responseObserver.onNext(((AsymmetricSignResponse) response)); @@ -451,7 +451,7 @@ public void asymmetricSign( new IllegalArgumentException( String.format( "Unrecognized response type %s for method AsymmetricSign, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), AsymmetricSignResponse.class.getName(), Exception.class.getName()))); } @@ -461,7 +461,7 @@ public void asymmetricSign( public void asymmetricDecrypt( AsymmetricDecryptRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof AsymmetricDecryptResponse) { requests.add(request); responseObserver.onNext(((AsymmetricDecryptResponse) response)); @@ -473,7 +473,7 @@ public void asymmetricDecrypt( new IllegalArgumentException( String.format( "Unrecognized response type %s for method AsymmetricDecrypt, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), AsymmetricDecryptResponse.class.getName(), Exception.class.getName()))); } @@ -482,7 +482,7 @@ public void asymmetricDecrypt( @Override public void updateCryptoKeyPrimaryVersion( UpdateCryptoKeyPrimaryVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKey) { requests.add(request); responseObserver.onNext(((CryptoKey) response)); @@ -494,7 +494,7 @@ public void updateCryptoKeyPrimaryVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateCryptoKeyPrimaryVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKey.class.getName(), Exception.class.getName()))); } @@ -503,7 +503,7 @@ public void updateCryptoKeyPrimaryVersion( @Override public void destroyCryptoKeyVersion( DestroyCryptoKeyVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKeyVersion) { requests.add(request); responseObserver.onNext(((CryptoKeyVersion) response)); @@ -515,7 +515,7 @@ public void destroyCryptoKeyVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method DestroyCryptoKeyVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKeyVersion.class.getName(), Exception.class.getName()))); } @@ -524,7 +524,7 @@ public void destroyCryptoKeyVersion( @Override public void restoreCryptoKeyVersion( RestoreCryptoKeyVersionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CryptoKeyVersion) { requests.add(request); responseObserver.onNext(((CryptoKeyVersion) response)); @@ -536,7 +536,7 @@ public void restoreCryptoKeyVersion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method RestoreCryptoKeyVersion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CryptoKeyVersion.class.getName(), Exception.class.getName()))); } @@ -544,7 +544,7 @@ public void restoreCryptoKeyVersion( @Override public void getIamPolicy(GetIamPolicyRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Policy) { requests.add(request); responseObserver.onNext(((Policy) response)); @@ -556,7 +556,7 @@ public void getIamPolicy(GetIamPolicyRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetIamPolicy, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Policy.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/kms/MockLocationsImpl.java b/test/integration/goldens/kms/MockLocationsImpl.java index d2c5e0f8ab..a510c09831 100644 --- a/test/integration/goldens/kms/MockLocationsImpl.java +++ b/test/integration/goldens/kms/MockLocationsImpl.java @@ -61,7 +61,7 @@ public void reset() { @Override public void listLocations( ListLocationsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListLocationsResponse) { requests.add(request); responseObserver.onNext(((ListLocationsResponse) response)); @@ -73,7 +73,7 @@ public void listLocations( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListLocations, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListLocationsResponse.class.getName(), Exception.class.getName()))); } @@ -81,7 +81,7 @@ public void listLocations( @Override public void getLocation(GetLocationRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Location) { requests.add(request); responseObserver.onNext(((Location) response)); @@ -93,7 +93,7 @@ public void getLocation(GetLocationRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetLocation, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Location.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/library/MockLibraryServiceImpl.java b/test/integration/goldens/library/MockLibraryServiceImpl.java index f16b5f2924..e25f089399 100644 --- a/test/integration/goldens/library/MockLibraryServiceImpl.java +++ b/test/integration/goldens/library/MockLibraryServiceImpl.java @@ -76,7 +76,7 @@ public void reset() { @Override public void createShelf(CreateShelfRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Shelf) { requests.add(request); responseObserver.onNext(((Shelf) response)); @@ -88,7 +88,7 @@ public void createShelf(CreateShelfRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateShelf, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Shelf.class.getName(), Exception.class.getName()))); } @@ -96,7 +96,7 @@ public void createShelf(CreateShelfRequest request, StreamObserver respon @Override public void getShelf(GetShelfRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Shelf) { requests.add(request); responseObserver.onNext(((Shelf) response)); @@ -108,7 +108,7 @@ public void getShelf(GetShelfRequest request, StreamObserver responseObse new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetShelf, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Shelf.class.getName(), Exception.class.getName()))); } @@ -117,7 +117,7 @@ public void getShelf(GetShelfRequest request, StreamObserver responseObse @Override public void listShelves( ListShelvesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListShelvesResponse) { requests.add(request); responseObserver.onNext(((ListShelvesResponse) response)); @@ -129,7 +129,7 @@ public void listShelves( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListShelves, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListShelvesResponse.class.getName(), Exception.class.getName()))); } @@ -137,7 +137,7 @@ public void listShelves( @Override public void deleteShelf(DeleteShelfRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -149,7 +149,7 @@ public void deleteShelf(DeleteShelfRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteShelf, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -157,7 +157,7 @@ public void deleteShelf(DeleteShelfRequest request, StreamObserver respon @Override public void mergeShelves(MergeShelvesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Shelf) { requests.add(request); responseObserver.onNext(((Shelf) response)); @@ -169,7 +169,7 @@ public void mergeShelves(MergeShelvesRequest request, StreamObserver resp new IllegalArgumentException( String.format( "Unrecognized response type %s for method MergeShelves, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Shelf.class.getName(), Exception.class.getName()))); } @@ -177,7 +177,7 @@ public void mergeShelves(MergeShelvesRequest request, StreamObserver resp @Override public void createBook(CreateBookRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Book) { requests.add(request); responseObserver.onNext(((Book) response)); @@ -189,13 +189,15 @@ public void createBook(CreateBookRequest request, StreamObserver responseO new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateBook, expected %s or %s", - response.getClass().getName(), Book.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Book.class.getName(), + Exception.class.getName()))); } } @Override public void getBook(GetBookRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Book) { requests.add(request); responseObserver.onNext(((Book) response)); @@ -207,14 +209,16 @@ public void getBook(GetBookRequest request, StreamObserver responseObserve new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetBook, expected %s or %s", - response.getClass().getName(), Book.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Book.class.getName(), + Exception.class.getName()))); } } @Override public void listBooks( ListBooksRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListBooksResponse) { requests.add(request); responseObserver.onNext(((ListBooksResponse) response)); @@ -226,7 +230,7 @@ public void listBooks( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListBooks, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListBooksResponse.class.getName(), Exception.class.getName()))); } @@ -234,7 +238,7 @@ public void listBooks( @Override public void deleteBook(DeleteBookRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -246,7 +250,7 @@ public void deleteBook(DeleteBookRequest request, StreamObserver response new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteBook, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -254,7 +258,7 @@ public void deleteBook(DeleteBookRequest request, StreamObserver response @Override public void updateBook(UpdateBookRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Book) { requests.add(request); responseObserver.onNext(((Book) response)); @@ -266,13 +270,15 @@ public void updateBook(UpdateBookRequest request, StreamObserver responseO new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateBook, expected %s or %s", - response.getClass().getName(), Book.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Book.class.getName(), + Exception.class.getName()))); } } @Override public void moveBook(MoveBookRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Book) { requests.add(request); responseObserver.onNext(((Book) response)); @@ -284,7 +290,9 @@ public void moveBook(MoveBookRequest request, StreamObserver responseObser new IllegalArgumentException( String.format( "Unrecognized response type %s for method MoveBook, expected %s or %s", - response.getClass().getName(), Book.class.getName(), Exception.class.getName()))); + response == null ? "null" : response.getClass().getName(), + Book.class.getName(), + Exception.class.getName()))); } } } diff --git a/test/integration/goldens/logging/MockConfigServiceV2Impl.java b/test/integration/goldens/logging/MockConfigServiceV2Impl.java index 345c4ff03a..406467a56b 100644 --- a/test/integration/goldens/logging/MockConfigServiceV2Impl.java +++ b/test/integration/goldens/logging/MockConfigServiceV2Impl.java @@ -94,7 +94,7 @@ public void reset() { @Override public void listBuckets( ListBucketsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListBucketsResponse) { requests.add(request); responseObserver.onNext(((ListBucketsResponse) response)); @@ -106,7 +106,7 @@ public void listBuckets( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListBuckets, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListBucketsResponse.class.getName(), Exception.class.getName()))); } @@ -114,7 +114,7 @@ public void listBuckets( @Override public void getBucket(GetBucketRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogBucket) { requests.add(request); responseObserver.onNext(((LogBucket) response)); @@ -126,7 +126,7 @@ public void getBucket(GetBucketRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetBucket, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogBucket.class.getName(), Exception.class.getName()))); } @@ -135,7 +135,7 @@ public void getBucket(GetBucketRequest request, StreamObserver respon @Override public void createBucket( CreateBucketRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogBucket) { requests.add(request); responseObserver.onNext(((LogBucket) response)); @@ -147,7 +147,7 @@ public void createBucket( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateBucket, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogBucket.class.getName(), Exception.class.getName()))); } @@ -156,7 +156,7 @@ public void createBucket( @Override public void updateBucket( UpdateBucketRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogBucket) { requests.add(request); responseObserver.onNext(((LogBucket) response)); @@ -168,7 +168,7 @@ public void updateBucket( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateBucket, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogBucket.class.getName(), Exception.class.getName()))); } @@ -176,7 +176,7 @@ public void updateBucket( @Override public void deleteBucket(DeleteBucketRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -188,7 +188,7 @@ public void deleteBucket(DeleteBucketRequest request, StreamObserver resp new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteBucket, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -197,7 +197,7 @@ public void deleteBucket(DeleteBucketRequest request, StreamObserver resp @Override public void undeleteBucket( UndeleteBucketRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -209,7 +209,7 @@ public void undeleteBucket( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UndeleteBucket, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -218,7 +218,7 @@ public void undeleteBucket( @Override public void listViews( ListViewsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListViewsResponse) { requests.add(request); responseObserver.onNext(((ListViewsResponse) response)); @@ -230,7 +230,7 @@ public void listViews( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListViews, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListViewsResponse.class.getName(), Exception.class.getName()))); } @@ -238,7 +238,7 @@ public void listViews( @Override public void getView(GetViewRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogView) { requests.add(request); responseObserver.onNext(((LogView) response)); @@ -250,7 +250,7 @@ public void getView(GetViewRequest request, StreamObserver responseObse new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetView, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogView.class.getName(), Exception.class.getName()))); } @@ -258,7 +258,7 @@ public void getView(GetViewRequest request, StreamObserver responseObse @Override public void createView(CreateViewRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogView) { requests.add(request); responseObserver.onNext(((LogView) response)); @@ -270,7 +270,7 @@ public void createView(CreateViewRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateView, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogView.class.getName(), Exception.class.getName()))); } @@ -278,7 +278,7 @@ public void createView(CreateViewRequest request, StreamObserver respon @Override public void updateView(UpdateViewRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogView) { requests.add(request); responseObserver.onNext(((LogView) response)); @@ -290,7 +290,7 @@ public void updateView(UpdateViewRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateView, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogView.class.getName(), Exception.class.getName()))); } @@ -298,7 +298,7 @@ public void updateView(UpdateViewRequest request, StreamObserver respon @Override public void deleteView(DeleteViewRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -310,7 +310,7 @@ public void deleteView(DeleteViewRequest request, StreamObserver response new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteView, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -319,7 +319,7 @@ public void deleteView(DeleteViewRequest request, StreamObserver response @Override public void listSinks( ListSinksRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListSinksResponse) { requests.add(request); responseObserver.onNext(((ListSinksResponse) response)); @@ -331,7 +331,7 @@ public void listSinks( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListSinks, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListSinksResponse.class.getName(), Exception.class.getName()))); } @@ -339,7 +339,7 @@ public void listSinks( @Override public void getSink(GetSinkRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogSink) { requests.add(request); responseObserver.onNext(((LogSink) response)); @@ -351,7 +351,7 @@ public void getSink(GetSinkRequest request, StreamObserver responseObse new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetSink, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogSink.class.getName(), Exception.class.getName()))); } @@ -359,7 +359,7 @@ public void getSink(GetSinkRequest request, StreamObserver responseObse @Override public void createSink(CreateSinkRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogSink) { requests.add(request); responseObserver.onNext(((LogSink) response)); @@ -371,7 +371,7 @@ public void createSink(CreateSinkRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateSink, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogSink.class.getName(), Exception.class.getName()))); } @@ -379,7 +379,7 @@ public void createSink(CreateSinkRequest request, StreamObserver respon @Override public void updateSink(UpdateSinkRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogSink) { requests.add(request); responseObserver.onNext(((LogSink) response)); @@ -391,7 +391,7 @@ public void updateSink(UpdateSinkRequest request, StreamObserver respon new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateSink, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogSink.class.getName(), Exception.class.getName()))); } @@ -399,7 +399,7 @@ public void updateSink(UpdateSinkRequest request, StreamObserver respon @Override public void deleteSink(DeleteSinkRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -411,7 +411,7 @@ public void deleteSink(DeleteSinkRequest request, StreamObserver response new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteSink, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -420,7 +420,7 @@ public void deleteSink(DeleteSinkRequest request, StreamObserver response @Override public void listExclusions( ListExclusionsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListExclusionsResponse) { requests.add(request); responseObserver.onNext(((ListExclusionsResponse) response)); @@ -432,7 +432,7 @@ public void listExclusions( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListExclusions, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListExclusionsResponse.class.getName(), Exception.class.getName()))); } @@ -441,7 +441,7 @@ public void listExclusions( @Override public void getExclusion( GetExclusionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogExclusion) { requests.add(request); responseObserver.onNext(((LogExclusion) response)); @@ -453,7 +453,7 @@ public void getExclusion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetExclusion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogExclusion.class.getName(), Exception.class.getName()))); } @@ -462,7 +462,7 @@ public void getExclusion( @Override public void createExclusion( CreateExclusionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogExclusion) { requests.add(request); responseObserver.onNext(((LogExclusion) response)); @@ -474,7 +474,7 @@ public void createExclusion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateExclusion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogExclusion.class.getName(), Exception.class.getName()))); } @@ -483,7 +483,7 @@ public void createExclusion( @Override public void updateExclusion( UpdateExclusionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogExclusion) { requests.add(request); responseObserver.onNext(((LogExclusion) response)); @@ -495,7 +495,7 @@ public void updateExclusion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateExclusion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogExclusion.class.getName(), Exception.class.getName()))); } @@ -504,7 +504,7 @@ public void updateExclusion( @Override public void deleteExclusion( DeleteExclusionRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -516,7 +516,7 @@ public void deleteExclusion( new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteExclusion, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -525,7 +525,7 @@ public void deleteExclusion( @Override public void getCmekSettings( GetCmekSettingsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CmekSettings) { requests.add(request); responseObserver.onNext(((CmekSettings) response)); @@ -537,7 +537,7 @@ public void getCmekSettings( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetCmekSettings, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CmekSettings.class.getName(), Exception.class.getName()))); } @@ -546,7 +546,7 @@ public void getCmekSettings( @Override public void updateCmekSettings( UpdateCmekSettingsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof CmekSettings) { requests.add(request); responseObserver.onNext(((CmekSettings) response)); @@ -558,7 +558,7 @@ public void updateCmekSettings( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateCmekSettings, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), CmekSettings.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/logging/MockLoggingServiceV2Impl.java b/test/integration/goldens/logging/MockLoggingServiceV2Impl.java index 6a3a330981..e98eccb923 100644 --- a/test/integration/goldens/logging/MockLoggingServiceV2Impl.java +++ b/test/integration/goldens/logging/MockLoggingServiceV2Impl.java @@ -72,7 +72,7 @@ public void reset() { @Override public void deleteLog(DeleteLogRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -84,7 +84,7 @@ public void deleteLog(DeleteLogRequest request, StreamObserver responseOb new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteLog, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } @@ -93,7 +93,7 @@ public void deleteLog(DeleteLogRequest request, StreamObserver responseOb @Override public void writeLogEntries( WriteLogEntriesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof WriteLogEntriesResponse) { requests.add(request); responseObserver.onNext(((WriteLogEntriesResponse) response)); @@ -105,7 +105,7 @@ public void writeLogEntries( new IllegalArgumentException( String.format( "Unrecognized response type %s for method WriteLogEntries, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), WriteLogEntriesResponse.class.getName(), Exception.class.getName()))); } @@ -114,7 +114,7 @@ public void writeLogEntries( @Override public void listLogEntries( ListLogEntriesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListLogEntriesResponse) { requests.add(request); responseObserver.onNext(((ListLogEntriesResponse) response)); @@ -126,7 +126,7 @@ public void listLogEntries( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListLogEntries, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListLogEntriesResponse.class.getName(), Exception.class.getName()))); } @@ -136,7 +136,7 @@ public void listLogEntries( public void listMonitoredResourceDescriptors( ListMonitoredResourceDescriptorsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListMonitoredResourceDescriptorsResponse) { requests.add(request); responseObserver.onNext(((ListMonitoredResourceDescriptorsResponse) response)); @@ -148,7 +148,7 @@ public void listMonitoredResourceDescriptors( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListMonitoredResourceDescriptors, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListMonitoredResourceDescriptorsResponse.class.getName(), Exception.class.getName()))); } @@ -156,7 +156,7 @@ public void listMonitoredResourceDescriptors( @Override public void listLogs(ListLogsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListLogsResponse) { requests.add(request); responseObserver.onNext(((ListLogsResponse) response)); @@ -168,7 +168,7 @@ public void listLogs(ListLogsRequest request, StreamObserver r new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListLogs, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListLogsResponse.class.getName(), Exception.class.getName()))); } @@ -192,7 +192,7 @@ public void onNext(TailLogEntriesRequest value) { new IllegalArgumentException( String.format( "Unrecognized response type %s for method TailLogEntries, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), TailLogEntriesResponse.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/logging/MockMetricsServiceV2Impl.java b/test/integration/goldens/logging/MockMetricsServiceV2Impl.java index 9cc5f79627..716d447707 100644 --- a/test/integration/goldens/logging/MockMetricsServiceV2Impl.java +++ b/test/integration/goldens/logging/MockMetricsServiceV2Impl.java @@ -69,7 +69,7 @@ public void reset() { @Override public void listLogMetrics( ListLogMetricsRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListLogMetricsResponse) { requests.add(request); responseObserver.onNext(((ListLogMetricsResponse) response)); @@ -81,7 +81,7 @@ public void listLogMetrics( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListLogMetrics, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListLogMetricsResponse.class.getName(), Exception.class.getName()))); } @@ -90,7 +90,7 @@ public void listLogMetrics( @Override public void getLogMetric( GetLogMetricRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogMetric) { requests.add(request); responseObserver.onNext(((LogMetric) response)); @@ -102,7 +102,7 @@ public void getLogMetric( new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetLogMetric, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogMetric.class.getName(), Exception.class.getName()))); } @@ -111,7 +111,7 @@ public void getLogMetric( @Override public void createLogMetric( CreateLogMetricRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogMetric) { requests.add(request); responseObserver.onNext(((LogMetric) response)); @@ -123,7 +123,7 @@ public void createLogMetric( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateLogMetric, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogMetric.class.getName(), Exception.class.getName()))); } @@ -132,7 +132,7 @@ public void createLogMetric( @Override public void updateLogMetric( UpdateLogMetricRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof LogMetric) { requests.add(request); responseObserver.onNext(((LogMetric) response)); @@ -144,7 +144,7 @@ public void updateLogMetric( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateLogMetric, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), LogMetric.class.getName(), Exception.class.getName()))); } @@ -153,7 +153,7 @@ public void updateLogMetric( @Override public void deleteLogMetric( DeleteLogMetricRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Empty) { requests.add(request); responseObserver.onNext(((Empty) response)); @@ -165,7 +165,7 @@ public void deleteLogMetric( new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteLogMetric, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Empty.class.getName(), Exception.class.getName()))); } diff --git a/test/integration/goldens/redis/MockCloudRedisImpl.java b/test/integration/goldens/redis/MockCloudRedisImpl.java index 8cce05da5e..9c628feb81 100644 --- a/test/integration/goldens/redis/MockCloudRedisImpl.java +++ b/test/integration/goldens/redis/MockCloudRedisImpl.java @@ -62,7 +62,7 @@ public void reset() { @Override public void listInstances( ListInstancesRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof ListInstancesResponse) { requests.add(request); responseObserver.onNext(((ListInstancesResponse) response)); @@ -74,7 +74,7 @@ public void listInstances( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ListInstances, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), ListInstancesResponse.class.getName(), Exception.class.getName()))); } @@ -82,7 +82,7 @@ public void listInstances( @Override public void getInstance(GetInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Instance) { requests.add(request); responseObserver.onNext(((Instance) response)); @@ -94,7 +94,7 @@ public void getInstance(GetInstanceRequest request, StreamObserver res new IllegalArgumentException( String.format( "Unrecognized response type %s for method GetInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Instance.class.getName(), Exception.class.getName()))); } @@ -103,7 +103,7 @@ public void getInstance(GetInstanceRequest request, StreamObserver res @Override public void createInstance( CreateInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -115,7 +115,7 @@ public void createInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method CreateInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -124,7 +124,7 @@ public void createInstance( @Override public void updateInstance( UpdateInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -136,7 +136,7 @@ public void updateInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpdateInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -145,7 +145,7 @@ public void updateInstance( @Override public void upgradeInstance( UpgradeInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -157,7 +157,7 @@ public void upgradeInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method UpgradeInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -166,7 +166,7 @@ public void upgradeInstance( @Override public void importInstance( ImportInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -178,7 +178,7 @@ public void importInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ImportInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -187,7 +187,7 @@ public void importInstance( @Override public void exportInstance( ExportInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -199,7 +199,7 @@ public void exportInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method ExportInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -208,7 +208,7 @@ public void exportInstance( @Override public void failoverInstance( FailoverInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -220,7 +220,7 @@ public void failoverInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method FailoverInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); } @@ -229,7 +229,7 @@ public void failoverInstance( @Override public void deleteInstance( DeleteInstanceRequest request, StreamObserver responseObserver) { - Object response = responses.remove(); + Object response = responses.poll(); if (response instanceof Operation) { requests.add(request); responseObserver.onNext(((Operation) response)); @@ -241,7 +241,7 @@ public void deleteInstance( new IllegalArgumentException( String.format( "Unrecognized response type %s for method DeleteInstance, expected %s or %s", - response.getClass().getName(), + response == null ? "null" : response.getClass().getName(), Operation.class.getName(), Exception.class.getName()))); }