rebase master

summer-ji-eng · summer-ji-eng · commit 46ab043fcfac · 2020-11-18T15:03:35.000-08:00
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
@@ -261,12 +261,4 @@ private static JavaDocComment.Builder processProtobufComment(
 
     return commentBuilder;
   }
-
-  private static String getSettingsName(String serviceName) {
-    return String.format(SETTINGS_NAME_PATTERN, serviceName);
-  }
-
-  private static String getClientClassName(String serviceName) {
-    return String.format(CLASS_NAME_PATTERN, serviceName);
-  }
 }
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
@@ -99,59 +99,6 @@ public static String composeClassHeaderCredentialsSampleCode(
             ExprStatement.withExpr(initClientVarExpr)));
   }
 
-  public static String composeClassHeaderEndpointSampleCode(
-      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()
-            .setStaticReferenceType(settingsType)
-            .setMethodName("newBuilder")
-            .build();
-    MethodInvocationExpr credentialsMethodExpr =
-        MethodInvocationExpr.builder()
-            .setExprReferenceExpr(newBuilderMethodExpr)
-            .setArguments(ValueExpr.withValue(StringObjectValue.withValue("myEndpoint")))
-            .setMethodName("setEndpoint")
-            .build();
-    MethodInvocationExpr buildMethodExpr =
-        MethodInvocationExpr.builder()
-            .setExprReferenceExpr(credentialsMethodExpr)
-            .setReturnType(settingsType)
-            .setMethodName("build")
-            .build();
-
-    Expr initSettingsVarExpr =
-        AssignmentExpr.builder()
-            .setVariableExpr(settingsVarExpr.toBuilder().setIsDecl(true).build())
-            .setValueExpr(buildMethodExpr)
-            .build();
-
-    // Initialize client with create() method.
-    // e.g. EchoClient echoClient = EchoClient.create(echoSettings);
-    VariableExpr clientVarExpr = createVariableExpr(clientName, clientType);
-    MethodInvocationExpr createMethodExpr =
-        MethodInvocationExpr.builder()
-            .setStaticReferenceType(clientType)
-            .setArguments(settingsVarExpr)
-            .setMethodName("create")
-            .setReturnType(clientType)
-            .build();
-    Expr initClientVarExpr =
-        AssignmentExpr.builder()
-            .setVariableExpr(clientVarExpr.toBuilder().setIsDecl(true).build())
-            .setValueExpr(createMethodExpr)
-            .build();
-
-    return SampleCodeWriter.write(
-        Arrays.asList(
-            ExprStatement.withExpr(initSettingsVarExpr),
-            ExprStatement.withExpr(initClientVarExpr)));
-  }
-
   public static String composeClassHeaderEndpointSampleCode(
       TypeNode clientType, TypeNode settingsType) {
     // Initialize client settings with builder() method.

Original file line number	Diff line number	Diff line change
`@@ -261,12 +261,4 @@ private static JavaDocComment.Builder processProtobufComment(`
`261`	`261`
`262`	`262`	`return commentBuilder;`
`263`	`263`	`}`
`264`		`-`
`265`		`- private static String getSettingsName(String serviceName) {`
`266`		`- return String.format(SETTINGS_NAME_PATTERN, serviceName);`
`267`		`- }`
`268`		`-`
`269`		`- private static String getClientClassName(String serviceName) {`
`270`		`- return String.format(CLASS_NAME_PATTERN, serviceName);`
`271`		`- }`
`272`	`264`	`}`