From 1fb3d51a6309d5e3b804f7e5151de8d4001b1055 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Mon, 7 Dec 2020 23:26:43 -0800
Subject: [PATCH] Unwrap a helper function

---
 .../gapic/composer/ServiceClientClassComposer.java       | 1 -
 .../gapic/composer/ServiceClientSampleCodeComposer.java  | 9 ++++-----
 .../composer/ServiceClientSampleCodeComposerTest.java    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
index 9f0e01593a..35dff2c4d7 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
@@ -480,7 +480,6 @@ private static List<MethodDefinition> createServiceMethods(
       Map<String, TypeNode> types,
       Map<String, ResourceName> resourceNames) {
     List<MethodDefinition> javaMethods = new ArrayList<>();
-    String clientName = getClientClassName(service);
     for (Method method : service.methods()) {
       if (method.stream().equals(Stream.NONE)) {
         javaMethods.addAll(
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
index c7451494a3..e1cd3f8da3 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
@@ -316,7 +316,10 @@ static TryCatchStatement composeUnaryPagedRpcMethodSampleCode(
                     .setIsDecl(true)
                     .build())
             .setCollectionExpr(clientMethodIteratorAllExpr)
-            .setBody(Arrays.asList(createLineCommentStatement("doThingsWith(element);")))
+            .setBody(
+                Arrays.asList(
+                    CommentStatement.withComment(
+                        LineComment.withComment("doThingsWith(element);"))))
             .build();
 
     List<Statement> bodyStatements =
@@ -412,8 +415,4 @@ private static boolean isProtoEmptyType(TypeNode type) {
     return type.reference().pakkage().equals("com.google.protobuf")
         && type.reference().name().equals("Empty");
   }
-
-  private static CommentStatement createLineCommentStatement(String content) {
-    return CommentStatement.withComment(LineComment.withComment(content));
-  }
 }
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java
index 34ee0e2cb4..12703ab91a 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java
@@ -196,7 +196,7 @@ public void invalidComposeRpcMethodHeaderSampleCode_noRepeatedResponseTypeInPage
                 method, clientType, methodArguments, resourceNames, messageTypes));
   }
 
-  // ==========================================Unary RPC Method Sample Code=======================//
+  // =======================================Unary RPC Method Sample Code=======================//
   @Test
   public void composeUnaryRpcMethodSampleCode_resourceNameMethodArgument() {
     TypeNode clientType =