@@ -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(
 
@@ -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));
-  }
 }
@@ -212,7 +212,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() {
     FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor();
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public void invalidComposeRpcMethodHeaderSampleCode_noRepeatedResponseTypeInPage`
`212`	`212`	`method, clientType, methodArguments, resourceNames, messageTypes));`
`213`	`213`	`}`
`214`	`214`
`215`		`- // ==========================================Unary RPC Method Sample Code=======================//`
	`215`	`+ // =======================================Unary RPC Method Sample Code=======================//`
`216`	`216`	`@Test`
`217`	`217`	`public void composeUnaryRpcMethodSampleCode_resourceNameMethodArgument() {`
`218`	`218`	`FileDescriptor echoFileDescriptor = EchoOuterClass.getDescriptor();`