From 260d6686ef4620a0453fe30dcfd90632a9c35a45 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 17 Nov 2020 13:54:51 -0800
Subject: [PATCH] simplify the input parameters

---
 .../gapic/composer/ServiceClientCommentComposer.java          | 2 +-
 .../gapic/composer/ServiceClientSampleCodeComposer.java       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java
index 9ec1b6c1a5..98eb8a4b2c 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java
@@ -147,7 +147,7 @@ static List<CommentStatement> createClassHeaderComments(
     classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING);
     classHeaderJavadocBuilder.addSampleCode(
         ServiceClientSampleCodeComposer.composeClassHeaderEndpointSampleCode(
-            clientName, clientType, settingsName, settingsType));
+            clientType, settingsType));
 
     return Arrays.asList(
         CommentComposer.AUTO_GENERATED_CLASS_COMMENT,
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 05db494fbc..ee51d4cb57 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
@@ -95,9 +95,11 @@ public static String composeClassHeaderCredentialsSampleCode(
   }
 
   public static String composeClassHeaderEndpointSampleCode(
-      String clientName, TypeNode clientType, String settingsName, TypeNode settingsType) {
+      TypeNode clientType, TypeNode settingsType) {
     // Initialize client settings with builder() method.
     // e.g. EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build();
+    String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name());
+    String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name());
     VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType);
     MethodInvocationExpr newBuilderMethodExpr =
         MethodInvocationExpr.builder()