From 20a34f738ac5acf7df9152288cedbdd15f2b51b4 Mon Sep 17 00:00:00 2001 From: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com> Date: Mon, 7 Jun 2021 15:16:18 -0400 Subject: [PATCH] fix: Remove unneeded check of list nullness from extractResources method --- ...tractServiceStubSettingsClassComposer.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index fb2d350011..7b2355133b 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -579,29 +579,12 @@ private static Expr createPagedListDescriptorAssignExpr( String.format("get%sList", JavaStyle.toUpperCamelCase(repeatedFieldName))) .setReturnType(returnType) .build(); - Expr conditionExpr = - RelationalOperationExpr.equalToWithExprs(getResponsesListExpr, ValueExpr.createNullExpr()); - Expr thenExpr = - MethodInvocationExpr.builder() - .setStaticReferenceType( - TypeNode.withReference(ConcreteReference.withClazz(ImmutableList.class))) - .setGenerics(Arrays.asList(repeatedResponseType.reference())) - .setMethodName("of") - .setReturnType(returnType) - .build(); - - returnExpr = - TernaryExpr.builder() - .setConditionExpr(conditionExpr) - .setThenExpr(thenExpr) - .setElseExpr(getResponsesListExpr) - .build(); anonClassMethods.add( methodStarterBuilder .setReturnType(returnType) .setName("extractResources") .setArguments(payloadVarExpr.toBuilder().setIsDecl(true).build()) - .setReturnExpr(returnExpr) + .setReturnExpr(getResponsesListExpr) .build()); // Create the anonymous class.