From 0539b799abceb5861219648c337c347e056e751d Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 17 Nov 2020 17:47:54 -0800
Subject: [PATCH 01/13] Implement pure rpc sample code

---
 .../composer/SampleCodeHelperComposer.java    | 65 +++++++++++++++++--
 .../gapic/composer/goldens/EchoClient.golden  | 22 +++++--
 .../composer/goldens/IdentityClient.golden    | 22 +++++--
 .../logging/LoggingServiceV2Client.java       | 46 ++++++++-----
 4 files changed, 120 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index b19c8186de..cb8062f371 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -16,8 +16,11 @@
 
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.CommentStatement;
+import com.google.api.generator.engine.ast.Expr;
+import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.LineComment;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
+import com.google.api.generator.engine.ast.Statement;
 import com.google.api.generator.engine.ast.TryCatchStatement;
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.engine.ast.Variable;
@@ -27,8 +30,10 @@
 import com.google.api.generator.gapic.utils.JavaStyle;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public final class SampleCodeHelperComposer {
+  private static String RESPONSE_VAR_NAME = "response";
 
   public static TryCatchStatement composeRpcMethodSampleCode(
       Method method, List<MethodArgument> arguments, TypeNode clientType) {
@@ -50,14 +55,30 @@ public static TryCatchStatement composeRpcMethodSampleCode(
 
   private static TryCatchStatement composeUnaryRpcMethodSampleCode(
       Method method, List<MethodArgument> arguments, TypeNode clientType) {
-    // TODO(summerji): compose sample code for unary rpc method.
-    VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
+    // Assign each method arguments with default value.
+    List<Statement> bodyStatements =
+        arguments.stream()
+            .map(
+                methodArg ->
+                    ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
+            .collect(Collectors.toList());
+    // Invoke current method based on return type.
+    // e.g. if return void, echoClient.echo(..); or,
+    // e.g. if return other type, EchoResponse response = echoClient.echo(...);
+    Expr invokeMethodExpr =
+        method.outputType().equals(TypeNode.VOID)
+            ? MethodInvocationExpr.builder()
+                .setExprReferenceExpr(createVariableDeclExpr(getClientName(clientType), clientType))
+                .setMethodName(method.name())
+                .setReturnType(clientType)
+                .build()
+            : createAssignExprForVariableWithClientMethod(
+                RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments);
+    bodyStatements.add(ExprStatement.withExpr(invokeMethodExpr));
+
     return TryCatchStatement.builder()
-        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
-        .setTryBody(
-            Arrays.asList(
-                createLineCommentStatement(
-                    "Note: Not implemented yet, placeholder for pure unary rpc method sample code.")))
+        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
+        .setTryBody(bodyStatements)
         .setIsSampleCode(true)
         .build();
   }
@@ -124,6 +145,36 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(
         .build();
   }
 
+  private static Expr assignMethodArgumentWithDefaultValue(MethodArgument argument) {
+    return AssignmentExpr.builder()
+        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.field().type()))
+        .setValueExpr(DefaultValueComposer.createDefaultValue(argument.field()))
+        .build();
+  }
+
+  private static Expr createAssignExprForVariableWithClientMethod(
+      String variableName,
+      TypeNode variableType,
+      TypeNode clientType,
+      String methodName,
+      List<MethodArgument> arguments) {
+    VariableExpr varExpr = createVariableExpr(variableName, variableType);
+    MethodInvocationExpr clientMethodInvocationExpr =
+        MethodInvocationExpr.builder()
+            .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
+            .setMethodName(methodName)
+            .setArguments(
+                arguments.stream()
+                    .map(arg -> createVariableExpr(arg.name(), arg.type()))
+                    .collect(Collectors.toList()))
+            .setReturnType(variableType)
+            .build();
+    return AssignmentExpr.builder()
+        .setVariableExpr(varExpr.toBuilder().setIsDecl(true).build())
+        .setValueExpr(clientMethodInvocationExpr)
+        .build();
+  }
+
   private static String getClientName(TypeNode clientType) {
     return JavaStyle.toLowerCamelCase(clientType.reference().name());
   }
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index bf4c69bc42..cf8ddf745a 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -147,7 +147,8 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   EchoResponse response = echoClient.Echo(parent);
    * }
    * }</pre>
    *
@@ -168,7 +169,8 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   Status error = Status.newBuilder().build();
+   *   EchoResponse response = echoClient.Echo(error);
    * }
    * }</pre>
    *
@@ -186,7 +188,8 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   EchoResponse response = echoClient.Echo(name);
    * }
    * }</pre>
    *
@@ -205,7 +208,8 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String content = "content951530617";
+   *   EchoResponse response = echoClient.Echo(content);
    * }
    * }</pre>
    *
@@ -223,7 +227,8 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   EchoResponse response = echoClient.Echo(name);
    * }
    * }</pre>
    *
@@ -241,7 +246,8 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   EchoResponse response = echoClient.Echo(parent);
    * }
    * }</pre>
    *
@@ -259,7 +265,9 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String content = "content951530617";
+   *   Severity severity = Severity.forNumber(0);
+   *   EchoResponse response = echoClient.Echo(content, severity);
    * }
    * }</pre>
    *
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
index 8a2661cde0..6f0d5c3da7 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
@@ -127,7 +127,10 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String display_name = "display_name1615086568";
+   *   String email = "email96619420";
+   *   User response = identityClient.CreateUser(parent, display_name, email);
    * }
    * }</pre>
    *
@@ -152,7 +155,16 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String display_name = "display_name1615086568";
+   *   String email = "email96619420";
+   *   int age = 96511;
+   *   String nickname = "nickname70690926";
+   *   boolean enable_notifications = true;
+   *   double height_feet = -1032737338;
+   *   User response =
+   *       identityClient.CreateUser(
+   *           parent, display_name, email, age, nickname, enable_notifications, height_feet);
    * }
    * }</pre>
    *
@@ -215,7 +227,8 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   User response = identityClient.GetUser(name);
    * }
    * }</pre>
    *
@@ -234,7 +247,8 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   User response = identityClient.GetUser(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 4eb843aea3..004a809770 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -78,7 +78,7 @@
  * <pre>{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
  *     LoggingServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
@@ -88,7 +88,7 @@
  *
  * <pre>{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
- *     LoggingServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
+ *     LoggingServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
  * }</pre>
@@ -157,7 +157,8 @@ public LoggingServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }</pre>
    *
@@ -187,7 +188,8 @@ public final Empty deleteLog(LogName logName) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }</pre>
    *
@@ -214,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -248,7 +250,12 @@ public final UnaryCallable<DeleteLogRequest, Empty> deleteLogCallable() {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   MonitoredResource resource = MonitoredResource.newBuilder().build();
+   *   Map<String, String> labels = new HashMap<>();
+   *   List<LogEntry> entries = new ArrayList<>();
+   *   WriteLogEntriesResponse response =
+   *       loggingServiceV2Client.WriteLogEntries(log_name, resource, labels, entries);
    * }
    * }</pre>
    *
@@ -318,7 +325,12 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   MonitoredResource resource = MonitoredResource.newBuilder().build();
+   *   Map<String, String> labels = new HashMap<>();
+   *   List<LogEntry> entries = new ArrayList<>();
+   *   WriteLogEntriesResponse response =
+   *       loggingServiceV2Client.WriteLogEntries(log_name, resource, labels, entries);
    * }
    * }</pre>
    *
@@ -388,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -423,7 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -466,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -511,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -556,7 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -582,7 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -608,7 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -634,7 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -660,7 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -683,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }</pre>
    *

From 98b41451c73e576a52736dad63012f6f8b5066d3 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 17 Nov 2020 20:28:36 -0800
Subject: [PATCH 02/13] refactor unary rpc method

---
 .../composer/SampleCodeHelperComposer.java    |  29 ++--
 .../composer/goldens/IdentityClient.golden    |   6 +-
 .../goldens/asset/AssetServiceClient.java     |  47 +++---
 .../logging/ConfigServiceV2Client.java        | 156 +++++++++++-------
 .../logging/LoggingServiceV2Client.java       |  22 +--
 .../goldens/redis/CloudRedisClient.java       |  54 +++---
 6 files changed, 189 insertions(+), 125 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index cb8062f371..bcaa2bbf57 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -55,6 +55,7 @@ public static TryCatchStatement composeRpcMethodSampleCode(
 
   private static TryCatchStatement composeUnaryRpcMethodSampleCode(
       Method method, List<MethodArgument> arguments, TypeNode clientType) {
+    // TODO(summerji): Add unit tests.
     // Assign each method arguments with default value.
     List<Statement> bodyStatements =
         arguments.stream()
@@ -65,16 +66,21 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
     // Invoke current method based on return type.
     // e.g. if return void, echoClient.echo(..); or,
     // e.g. if return other type, EchoResponse response = echoClient.echo(...);
-    Expr invokeMethodExpr =
-        method.outputType().equals(TypeNode.VOID)
-            ? MethodInvocationExpr.builder()
-                .setExprReferenceExpr(createVariableDeclExpr(getClientName(clientType), clientType))
-                .setMethodName(method.name())
-                .setReturnType(clientType)
-                .build()
-            : createAssignExprForVariableWithClientMethod(
-                RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments);
-    bodyStatements.add(ExprStatement.withExpr(invokeMethodExpr));
+    if (method.outputType().equals(TypeNode.VOID)) {
+      bodyStatements.add(
+          ExprStatement.withExpr(
+              MethodInvocationExpr.builder()
+                  .setExprReferenceExpr(
+                      createVariableDeclExpr(getClientName(clientType), clientType))
+                  .setMethodName(method.name())
+                  .setReturnType(clientType)
+                  .build()));
+    } else {
+      bodyStatements.add(
+          ExprStatement.withExpr(
+              createAssignExprForVariableWithClientMethod(
+                  RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments)));
+    }
 
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
@@ -86,6 +92,7 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
   private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
       Method method, List<MethodArgument> arguments, TypeNode clientType) {
     // TODO(summerji): compose sample code for unary lro rpc method.
+    // TODO(summerji): Add unit tests.
     VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
@@ -100,6 +107,7 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
   private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
       Method method, List<MethodArgument> arguments, TypeNode clientType) {
     // TODO(summerji): compose sample code for unary paged rpc method.
+    // TODO(summerji): Add unit tests.
     VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
@@ -114,6 +122,7 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
   private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode(
       Method method, TypeNode clientType) {
     // TODO(summerji): compose sample code for unary default rpc method.
+    // TODO(summerji): Add unit tests.
     VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     String content =
         String.format(
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
index 6f0d5c3da7..fa734a8cc4 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
@@ -312,7 +312,8 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = identityClient.DeleteUser(name);
    * }
    * }</pre>
    *
@@ -333,7 +334,8 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = identityClient.DeleteUser(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 779024d758..fb2d2b2181 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -78,7 +78,7 @@
  * <pre>{@code
  * AssetServiceSettings assetServiceSettings =
  *     AssetServiceSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }</pre>
@@ -87,7 +87,7 @@
  *
  * <pre>{@code
  * AssetServiceSettings assetServiceSettings =
- *     AssetServiceSettings.newBuilder().setEndpoint(myEndpoint).build();
+ *     AssetServiceSettings.newBuilder().setEndpoint("myEndpoint").build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }</pre>
  */
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -229,7 +229,7 @@ public final UnaryCallable<ExportAssetsRequest, Operation> exportAssetsCallable(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -264,7 +264,8 @@ public final BatchGetAssetsHistoryResponse batchGetAssetsHistory(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   Feed response = assetServiceClient.CreateFeed(parent);
    * }
    * }</pre>
    *
@@ -287,7 +288,7 @@ public final Feed createFeed(String parent) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -316,7 +317,8 @@ public final UnaryCallable<CreateFeedRequest, Feed> createFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }</pre>
    *
@@ -339,7 +341,8 @@ public final Feed getFeed(FeedName name) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }</pre>
    *
@@ -361,7 +364,7 @@ public final Feed getFeed(String name) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -390,7 +393,8 @@ public final UnaryCallable<GetFeedRequest, Feed> getFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   ListFeedsResponse response = assetServiceClient.ListFeeds(parent);
    * }
    * }</pre>
    *
@@ -412,7 +416,7 @@ public final ListFeedsResponse listFeeds(String parent) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -441,7 +445,8 @@ public final UnaryCallable<ListFeedsRequest, ListFeedsResponse> listFeedsCallabl
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   Feed feed = Feed.newBuilder().build();
+   *   Feed response = assetServiceClient.UpdateFeed(feed);
    * }
    * }</pre>
    *
@@ -463,7 +468,7 @@ public final Feed updateFeed(Feed feed) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -492,7 +497,8 @@ public final UnaryCallable<UpdateFeedRequest, Feed> updateFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }</pre>
    *
@@ -517,7 +523,8 @@ public final Empty deleteFeed(FeedName name) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }</pre>
    *
@@ -539,7 +546,7 @@ public final Empty deleteFeed(String name) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -570,7 +577,7 @@ public final UnaryCallable<DeleteFeedRequest, Empty> deleteFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -644,7 +651,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -692,7 +699,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -750,7 +757,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 233ac59bab..4706c5b199 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -76,7 +76,7 @@
  * <pre>{@code
  * ConfigServiceV2Settings configServiceV2Settings =
  *     ConfigServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
@@ -86,7 +86,7 @@
  *
  * <pre>{@code
  * ConfigServiceV2Settings configServiceV2Settings =
- *     ConfigServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
+ *     ConfigServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
  * }</pre>
@@ -153,7 +153,7 @@ public ConfigServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -182,7 +182,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -211,7 +211,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -240,7 +240,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -269,7 +269,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -335,7 +335,7 @@ public final UnaryCallable<ListBucketsRequest, ListBucketsResponse> listBucketsC
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -373,7 +373,7 @@ public final UnaryCallable<GetBucketRequest, LogBucket> getBucketCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -411,7 +411,7 @@ public final UnaryCallable<UpdateBucketRequest, LogBucket> updateBucketCallable(
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -436,7 +436,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -461,7 +461,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -486,7 +486,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -511,7 +511,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -572,7 +572,8 @@ public final UnaryCallable<ListSinksRequest, ListSinksResponse> listSinksCallabl
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }</pre>
    *
@@ -600,7 +601,8 @@ public final LogSink getSink(LogSinkName sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }</pre>
    *
@@ -625,7 +627,7 @@ public final LogSink getSink(String sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -657,7 +659,9 @@ public final UnaryCallable<GetSinkRequest, LogSink> getSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }</pre>
    *
@@ -689,7 +693,9 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }</pre>
    *
@@ -721,7 +727,9 @@ public final LogSink createSink(FolderName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }</pre>
    *
@@ -753,7 +761,9 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }</pre>
    *
@@ -785,7 +795,9 @@ public final LogSink createSink(ProjectName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }</pre>
    *
@@ -814,7 +826,7 @@ public final LogSink createSink(String parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -850,7 +862,9 @@ public final UnaryCallable<CreateSinkRequest, LogSink> createSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
    * }</pre>
    *
@@ -886,7 +900,9 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
    * }</pre>
    *
@@ -919,7 +935,10 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
    * }
    * }</pre>
    *
@@ -965,7 +984,10 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
    * }
    * }</pre>
    *
@@ -1011,7 +1033,7 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1045,7 +1067,8 @@ public final UnaryCallable<UpdateSinkRequest, LogSink> updateSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }</pre>
    *
@@ -1075,7 +1098,8 @@ public final Empty deleteSink(LogSinkName sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }</pre>
    *
@@ -1102,7 +1126,7 @@ public final Empty deleteSink(String sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1132,7 +1156,7 @@ public final UnaryCallable<DeleteSinkRequest, Empty> deleteSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1157,7 +1181,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1182,7 +1206,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1207,7 +1231,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1232,7 +1256,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1254,7 +1278,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -1295,7 +1319,8 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }</pre>
    *
@@ -1323,7 +1348,8 @@ public final LogExclusion getExclusion(LogExclusionName name) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }</pre>
    *
@@ -1348,7 +1374,7 @@ public final LogExclusion getExclusion(String name) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1378,7 +1404,9 @@ public final UnaryCallable<GetExclusionRequest, LogExclusion> getExclusionCallab
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1408,7 +1436,9 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1438,7 +1468,9 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1468,7 +1500,9 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1498,7 +1532,9 @@ public final LogExclusion createExclusion(ProjectName parent, LogExclusion exclu
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1525,7 +1561,7 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion)
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1555,7 +1591,10 @@ public final UnaryCallable<CreateExclusionRequest, LogExclusion> createExclusion
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
    * }
    * }</pre>
    *
@@ -1594,7 +1633,10 @@ public final LogExclusion updateExclusion(
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
    * }
    * }</pre>
    *
@@ -1633,7 +1675,7 @@ public final LogExclusion updateExclusion(
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1662,7 +1704,8 @@ public final UnaryCallable<UpdateExclusionRequest, LogExclusion> updateExclusion
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }</pre>
    *
@@ -1690,7 +1733,8 @@ public final Empty deleteExclusion(LogExclusionName name) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }</pre>
    *
@@ -1715,7 +1759,7 @@ public final Empty deleteExclusion(String name) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1750,7 +1794,7 @@ public final UnaryCallable<DeleteExclusionRequest, Empty> deleteExclusionCallabl
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1796,7 +1840,7 @@ public final UnaryCallable<GetCmekSettingsRequest, CmekSettings> getCmekSettings
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 004a809770..d6349aa8ce 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -435,7 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -478,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -523,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -568,7 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -594,7 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -620,7 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -646,7 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -672,7 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -695,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 4dcb5689bf..ec803709ce 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -98,7 +98,7 @@
  * <pre>{@code
  * CloudRedisSettings cloudRedisSettings =
  *     CloudRedisSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }</pre>
@@ -107,7 +107,7 @@
  *
  * <pre>{@code
  * CloudRedisSettings cloudRedisSettings =
- *     CloudRedisSettings.newBuilder().setEndpoint(myEndpoint).build();
+ *     CloudRedisSettings.newBuilder().setEndpoint("myEndpoint").build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }</pre>
  */
@@ -192,7 +192,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -226,7 +226,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -317,7 +317,8 @@ public final UnaryCallable<ListInstancesRequest, ListInstancesResponse> listInst
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }</pre>
    *
@@ -342,7 +343,8 @@ public final Instance getInstance(InstanceName name) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }</pre>
    *
@@ -364,7 +366,7 @@ public final Instance getInstance(String name) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -404,7 +406,7 @@ public final UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -453,7 +455,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -502,7 +504,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -569,7 +571,7 @@ public final UnaryCallable<CreateInstanceRequest, Operation> createInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -599,7 +601,7 @@ public final OperationFuture<Instance, OperationMetadata> updateInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -648,7 +650,7 @@ public final UnaryCallable<UpdateInstanceRequest, Operation> updateInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -676,7 +678,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -701,7 +703,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -748,7 +750,7 @@ public final UnaryCallable<UpgradeInstanceRequest, Operation> upgradeInstanceCal
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -779,7 +781,7 @@ public final OperationFuture<Instance, OperationMetadata> importInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -837,7 +839,7 @@ public final UnaryCallable<ImportInstanceRequest, Operation> importInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -867,7 +869,7 @@ public final OperationFuture<Instance, OperationMetadata> exportInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -919,7 +921,7 @@ public final UnaryCallable<ExportInstanceRequest, Operation> exportInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -949,7 +951,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -979,7 +981,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *
@@ -1022,7 +1024,7 @@ public final UnaryCallable<FailoverInstanceRequest, Operation> failoverInstanceC
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1047,7 +1049,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Insta
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1069,7 +1071,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Strin
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }</pre>
    *

From 2f1d5ed7284683c11e496f876cd010b4486e27dc Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 17 Nov 2020 21:01:35 -0800
Subject: [PATCH 03/13] fix revert changed

---
 .../gapic/composer/goldens/EchoClient.golden     |  6 +++---
 .../goldens/asset/AssetServiceClient.java        |  6 +++---
 .../goldens/logging/ConfigServiceV2Client.java   |  6 +++---
 .../goldens/logging/LoggingServiceV2Client.java  |  6 +++---
 .../goldens/redis/CloudRedisClient.java          | 16 ++++++++--------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index cf8ddf745a..3fd20dfae5 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -287,7 +287,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -334,7 +334,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }</pre>
    *
@@ -364,7 +364,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index fb2d2b2181..14792aeb80 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -651,7 +651,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -757,7 +757,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 4706c5b199..827ebda1e6 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1278,7 +1278,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index d6349aa8ce..3385101e0d 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -478,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -523,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -695,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index ec803709ce..3f3d444812 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -504,7 +504,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -601,7 +601,7 @@ public final OperationFuture<Instance, OperationMetadata> updateInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -703,7 +703,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -781,7 +781,7 @@ public final OperationFuture<Instance, OperationMetadata> importInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -869,7 +869,7 @@ public final OperationFuture<Instance, OperationMetadata> exportInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -981,7 +981,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1071,7 +1071,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Strin
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *

From 237a6dac492e69c8e0d04aee1e751a96fe345316 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 17 Nov 2020 23:46:34 -0800
Subject: [PATCH 04/13] refactor signature pass Map<String, ResourceName>
 resourceNames

---
 .../gapic/composer/ClassComposer.java         |  4 +-
 .../generator/gapic/composer/Composer.java    | 31 ++++++++-----
 ...pcServiceCallableFactoryClassComposer.java |  4 +-
 .../GrpcServiceStubClassComposer.java         |  4 +-
 .../composer/MockServiceClassComposer.java    |  4 +-
 .../MockServiceImplClassComposer.java         |  4 +-
 .../composer/SampleCodeHelperComposer.java    | 36 ++++++++++-----
 .../composer/ServiceClientClassComposer.java  | 41 ++++++++++++-----
 .../ServiceClientCommentComposer.java         | 14 ++++--
 .../ServiceClientSampleCodeComposer.java      | 13 ++++--
 .../ServiceSettingsClassComposer.java         |  4 +-
 .../composer/ServiceStubClassComposer.java    |  4 +-
 ...rviceCallableFactoryClassComposerTest.java |  3 +-
 .../GrpcServiceStubClassComposerTest.java     |  9 ++--
 .../MockServiceClassComposerTest.java         |  3 +-
 .../MockServiceImplClassComposerTest.java     |  3 +-
 .../ServiceClientClassComposerTest.java       |  6 ++-
 .../ServiceSettingsClassComposerTest.java     |  3 +-
 .../ServiceStubClassComposerTest.java         |  3 +-
 .../gapic/composer/goldens/EchoClient.golden  |  4 +-
 .../composer/goldens/IdentityClient.golden    |  4 +-
 .../goldens/asset/AssetServiceClient.java     |  4 +-
 .../logging/ConfigServiceV2Client.java        | 30 ++++++------
 .../logging/LoggingServiceV2Client.java       |  4 +-
 .../logging/MetricsServiceV2Client.java       | 46 ++++++++++++-------
 .../goldens/redis/CloudRedisClient.java       |  2 +-
 26 files changed, 189 insertions(+), 98 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
index 131020c562..7f8b5e860d 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
@@ -16,9 +16,11 @@
 
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import java.util.Map;
 
 public interface ClassComposer {
-  GapicClass generate(Service service, Map<String, Message> messageTypes);
+  GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes);
 }
diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java
index 02e1dc9bcc..b4281f483c 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java
@@ -60,8 +60,8 @@ public static List<GapicClass> generateServiceClasses(
       @Nonnull Map<String, ResourceName> resourceNames,
       @Nonnull Map<String, Message> messageTypes) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes));
-    clazzes.addAll(generateClientSettingsClasses(service, messageTypes));
+    clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes, resourceNames));
+    clazzes.addAll(generateClientSettingsClasses(service, messageTypes, resourceNames));
     clazzes.addAll(generateMocksAndTestClasses(service, resourceNames, messageTypes));
     // TODO(miraleung): Generate test classes.
     return clazzes;
@@ -76,29 +76,38 @@ public static List<GapicClass> generateResourceNameHelperClasses(
   }
 
   public static List<GapicClass> generateStubClasses(
-      Service service, GapicServiceConfig serviceConfig, Map<String, Message> messageTypes) {
+      Service service,
+      GapicServiceConfig serviceConfig,
+      Map<String, Message> messageTypes,
+      Map<String, ResourceName> resourceNames) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(ServiceStubClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(ServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes));
     clazzes.add(
         ServiceStubSettingsClassComposer.instance().generate(service, serviceConfig, messageTypes));
-    clazzes.add(GrpcServiceCallableFactoryClassComposer.instance().generate(service, messageTypes));
-    clazzes.add(GrpcServiceStubClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(
+        GrpcServiceCallableFactoryClassComposer.instance()
+            .generate(service, resourceNames, messageTypes));
+    clazzes.add(
+        GrpcServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes));
     return clazzes;
   }
 
   public static List<GapicClass> generateClientSettingsClasses(
-      Service service, Map<String, Message> messageTypes) {
+      Service service, Map<String, Message> messageTypes, Map<String, ResourceName> resourceNames) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(ServiceClientClassComposer.instance().generate(service, messageTypes));
-    clazzes.add(ServiceSettingsClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(
+        ServiceClientClassComposer.instance().generate(service, resourceNames, messageTypes));
+    clazzes.add(
+        ServiceSettingsClassComposer.instance().generate(service, resourceNames, messageTypes));
     return clazzes;
   }
 
   public static List<GapicClass> generateMocksAndTestClasses(
       Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes) {
     List<GapicClass> clazzes = new ArrayList<>();
-    clazzes.add(MockServiceClassComposer.instance().generate(service, messageTypes));
-    clazzes.add(MockServiceImplClassComposer.instance().generate(service, messageTypes));
+    clazzes.add(MockServiceClassComposer.instance().generate(service, resourceNames, messageTypes));
+    clazzes.add(
+        MockServiceImplClassComposer.instance().generate(service, resourceNames, messageTypes));
     clazzes.add(
         ServiceClientTestClassComposer.instance().generate(service, resourceNames, messageTypes));
     return clazzes;
diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java
index 5d1f054e2f..1bcfdc8b6a 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java
@@ -42,6 +42,7 @@
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.common.base.Preconditions;
 import com.google.longrunning.Operation;
@@ -64,7 +65,8 @@ public static GrpcServiceCallableFactoryClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     Map<String, TypeNode> types = createTypes(service);
     String className = String.format("Grpc%sCallableFactory", service.name());
     GapicClass.Kind kind = Kind.STUB;
diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
index 2fe59e9a7d..c952e9fc0b 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
@@ -51,6 +51,7 @@
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
 import com.google.api.generator.gapic.model.Method;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Preconditions;
@@ -112,7 +113,8 @@ public static GrpcServiceStubClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     String pakkage = service.pakkage() + ".stub";
     Map<String, TypeNode> types = createDynamicTypes(service, pakkage);
     String className = getThisClassName(service.name());
diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java
index 5e1a5057f5..8677431d00 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java
@@ -33,6 +33,7 @@
 import com.google.api.generator.gapic.model.GapicClass;
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.protobuf.AbstractMessage;
 import io.grpc.ServerServiceDefinition;
@@ -55,7 +56,8 @@ public static MockServiceClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     Map<String, TypeNode> types = createTypes(service);
     String className = String.format(MOCK_SERVICE_NAME_PATTERN, service.name());
     GapicClass.Kind kind = Kind.TEST;
diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java
index 000e133a1a..6240f9db43 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java
@@ -42,6 +42,7 @@
 import com.google.api.generator.gapic.model.Message;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.Method.Stream;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.longrunning.Operation;
@@ -94,7 +95,8 @@ public static MockServiceImplClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     Map<String, TypeNode> types = createDynamicTypes(service);
     String className = String.format(MOCK_SERVICE_IMPL_NAME_PATTERN, service.name());
     GapicClass.Kind kind = Kind.TEST;
diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index bcaa2bbf57..25d19a7367 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -16,6 +16,7 @@
 
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.CommentStatement;
+import com.google.api.generator.engine.ast.ConcreteReference;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.LineComment;
@@ -27,16 +28,22 @@
 import com.google.api.generator.engine.ast.VariableExpr;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.MethodArgument;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.utils.JavaStyle;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public final class SampleCodeHelperComposer {
   private static String RESPONSE_VAR_NAME = "response";
 
   public static TryCatchStatement composeRpcMethodSampleCode(
-      Method method, List<MethodArgument> arguments, TypeNode clientType) {
+      Method method,
+      List<MethodArgument> arguments,
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     // Default Unary RPC method.
     if (arguments.isEmpty()) {
       return composeUnaryRpcDefaultMethodSampleCode(method, clientType);
@@ -50,18 +57,22 @@ public static TryCatchStatement composeRpcMethodSampleCode(
       return composeLroUnaryRpcMethodSampleCode(method, arguments, clientType);
     }
     // Pure Unary RPC method.
-    return composeUnaryRpcMethodSampleCode(method, arguments, clientType);
+    return composeUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames);
   }
 
   private static TryCatchStatement composeUnaryRpcMethodSampleCode(
-      Method method, List<MethodArgument> arguments, TypeNode clientType) {
+      Method method,
+      List<MethodArgument> arguments,
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     // TODO(summerji): Add unit tests.
     // Assign each method arguments with default value.
     List<Statement> bodyStatements =
         arguments.stream()
             .map(
                 methodArg ->
-                    ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
+                    ExprStatement.withExpr(
+                        assignMethodArgumentWithDefaultValue(methodArg, resourceNames)))
             .collect(Collectors.toList());
     // Invoke current method based on return type.
     // e.g. if return void, echoClient.echo(..); or,
@@ -154,10 +165,11 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(
         .build();
   }
 
-  private static Expr assignMethodArgumentWithDefaultValue(MethodArgument argument) {
+  private static Expr assignMethodArgumentWithDefaultValue(
+      MethodArgument argument, Map<String, ResourceName> resourceNames) {
     return AssignmentExpr.builder()
-        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.field().type()))
-        .setValueExpr(DefaultValueComposer.createDefaultValue(argument.field()))
+        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.type()))
+        .setValueExpr(DefaultValueComposer.createDefaultValue(argument, resourceNames))
         .build();
   }
 
@@ -172,10 +184,7 @@ private static Expr createAssignExprForVariableWithClientMethod(
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
             .setMethodName(methodName)
-            .setArguments(
-                arguments.stream()
-                    .map(arg -> createVariableExpr(arg.name(), arg.type()))
-                    .collect(Collectors.toList()))
+            .setArguments(mapMethodArgumentsToVariableExprs(arguments))
             .setReturnType(variableType)
             .build();
     return AssignmentExpr.builder()
@@ -184,6 +193,11 @@ private static Expr createAssignExprForVariableWithClientMethod(
         .build();
   }
 
+  private static List<Expr> mapMethodArgumentsToVariableExprs(List<MethodArgument> arguments) {
+    return arguments.stream().map(arg -> createVariableExpr(arg.name(), arg.type())).collect(
+        Collectors.toList());
+  }
+
   private static String getClientName(TypeNode clientType) {
     return JavaStyle.toLowerCamelCase(clientType.reference().name());
   }
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 bbd6945e8a..7b3a425580 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
@@ -62,6 +62,7 @@
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.Method.Stream;
 import com.google.api.generator.gapic.model.MethodArgument;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.annotations.VisibleForTesting;
@@ -109,7 +110,8 @@ public static ServiceClientClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> messageTypes) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes) {
     Map<String, TypeNode> types = createTypes(service, messageTypes);
     String className = String.format("%sClient", service.name());
     GapicClass.Kind kind = Kind.MAIN;
@@ -129,7 +131,8 @@ public GapicClass generate(Service service, Map<String, Message> messageTypes) {
             .setName(className)
             .setImplementsTypes(createClassImplements(types))
             .setStatements(createFieldDeclarations(service, types, hasLroClient))
-            .setMethods(createClassMethods(service, messageTypes, types, hasLroClient))
+            .setMethods(
+                createClassMethods(service, messageTypes, types, resourceNames, hasLroClient))
             .setNestedClasses(createNestedPagingClasses(service, messageTypes, types))
             .build();
     return GapicClass.create(kind, classDef);
@@ -152,12 +155,19 @@ private static List<MethodDefinition> createClassMethods(
       Service service,
       Map<String, Message> messageTypes,
       Map<String, TypeNode> types,
+      Map<String, ResourceName> resourceNames,
       boolean hasLroClient) {
     List<MethodDefinition> methods = new ArrayList<>();
     methods.addAll(createStaticCreatorMethods(service, types));
     methods.addAll(createConstructorMethods(service, types, hasLroClient));
     methods.addAll(createGetterMethods(service, types, hasLroClient));
-    methods.addAll(createServiceMethods(service, messageTypes, types));
+    methods.addAll(
+        createServiceMethods(
+            service,
+            messageTypes,
+            types,
+            types.get(getClientClassName(service.name())),
+            resourceNames));
     methods.addAll(createBackgroundResourceMethods(service, types));
     return methods;
   }
@@ -469,13 +479,17 @@ private static List<MethodDefinition> createGetterMethods(
   }
 
   private static List<MethodDefinition> createServiceMethods(
-      Service service, Map<String, Message> messageTypes, Map<String, TypeNode> types) {
+      Service service,
+      Map<String, Message> messageTypes,
+      Map<String, TypeNode> types,
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     List<MethodDefinition> javaMethods = new ArrayList<>();
-    TypeNode clientType = types.get(getClientClassName(service.name()));
     for (Method method : service.methods()) {
       if (method.stream().equals(Stream.NONE)) {
-        javaMethods.addAll(createMethodVariants(method, messageTypes, types, clientType));
-        javaMethods.add(createMethodDefaultMethod(method, types, clientType));
+        javaMethods.addAll(
+            createMethodVariants(method, messageTypes, types, clientType, resourceNames));
+        javaMethods.add(createMethodDefaultMethod(method, types, clientType, resourceNames));
       }
       if (method.hasLro()) {
         javaMethods.add(createLroCallableMethod(service.name(), method, types));
@@ -492,7 +506,8 @@ private static List<MethodDefinition> createMethodVariants(
       Method method,
       Map<String, Message> messageTypes,
       Map<String, TypeNode> types,
-      TypeNode clientType) {
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     List<MethodDefinition> javaMethods = new ArrayList<>();
     String methodName = JavaStyle.toLowerCamelCase(method.name());
     TypeNode methodInputType = method.inputType();
@@ -557,7 +572,7 @@ private static List<MethodDefinition> createMethodVariants(
           MethodDefinition.builder()
               .setHeaderCommentStatements(
                   ServiceClientCommentComposer.createRpcMethodHeaderComment(
-                      method, signature, clientType))
+                      method, signature, clientType, resourceNames))
               .setScope(ScopeNode.PUBLIC)
               .setIsFinal(true)
               .setReturnType(methodOutputType)
@@ -572,7 +587,10 @@ private static List<MethodDefinition> createMethodVariants(
   }
 
   private static MethodDefinition createMethodDefaultMethod(
-      Method method, Map<String, TypeNode> types, TypeNode clientType) {
+      Method method,
+      Map<String, TypeNode> types,
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     String methodName = JavaStyle.toLowerCamelCase(method.name());
     TypeNode methodInputType = method.inputType();
     TypeNode methodOutputType =
@@ -616,7 +634,8 @@ private static MethodDefinition createMethodDefaultMethod(
             .build();
     return MethodDefinition.builder()
         .setHeaderCommentStatements(
-            ServiceClientCommentComposer.createRpcMethodHeaderComment(method, clientType))
+            ServiceClientCommentComposer.createRpcMethodHeaderComment(
+                method, clientType, resourceNames))
         .setScope(ScopeNode.PUBLIC)
         .setIsFinal(true)
         .setReturnType(methodOutputType)
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 f57ad32906..65fb2cc170 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
@@ -19,12 +19,14 @@
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.MethodArgument;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Strings;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -160,7 +162,10 @@ static CommentStatement createCreateMethodStubArgComment(
   }
 
   static List<CommentStatement> createRpcMethodHeaderComment(
-      Method method, List<MethodArgument> methodArguments, TypeNode clientType) {
+      Method method,
+      List<MethodArgument> methodArguments,
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     JavaDocComment.Builder methodJavadocBuilder = JavaDocComment.builder();
 
     if (method.hasDescription()) {
@@ -171,7 +176,7 @@ static List<CommentStatement> createRpcMethodHeaderComment(
     methodJavadocBuilder.addParagraph(METHOD_DESCRIPTION_SAMPLE_CODE_SUMMARY_STRING);
     methodJavadocBuilder.addSampleCode(
         ServiceClientSampleCodeComposer.composeRpcMethodHeaderSampleCode(
-            method, methodArguments, clientType));
+            method, methodArguments, clientType, resourceNames));
 
     if (methodArguments.isEmpty()) {
       methodJavadocBuilder.addParam(
@@ -192,8 +197,9 @@ static List<CommentStatement> createRpcMethodHeaderComment(
         CommentStatement.withComment(methodJavadocBuilder.build()));
   }
 
-  static List<CommentStatement> createRpcMethodHeaderComment(Method method, TypeNode clientType) {
-    return createRpcMethodHeaderComment(method, Collections.emptyList(), clientType);
+  static List<CommentStatement> createRpcMethodHeaderComment(
+      Method method, TypeNode clientType, Map<String, ResourceName> resourceNames) {
+    return createRpcMethodHeaderComment(method, Collections.emptyList(), clientType, resourceNames);
   }
 
   static CommentStatement createMethodNoArgComment(String 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
index 3549e99582..7ce82998a1 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
@@ -1,6 +1,6 @@
 // Copyright 2020 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "License");\
+// Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -27,9 +27,12 @@
 import com.google.api.generator.gapic.composer.samplecode.SampleCodeWriter;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.MethodArgument;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class ServiceClientSampleCodeComposer {
   // TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer.
@@ -160,9 +163,13 @@ public static String composeClassHeaderEndpointSampleCode(
   }
 
   public static String composeRpcMethodHeaderSampleCode(
-      Method method, List<MethodArgument> arguments, TypeNode clientType) {
+      Method method,
+      List<MethodArgument> arguments,
+      TypeNode clientType,
+      Map<String, ResourceName> resourceNames) {
     return SampleCodeWriter.write(
-        SampleCodeHelperComposer.composeRpcMethodSampleCode(method, arguments, clientType));
+        SampleCodeHelperComposer.composeRpcMethodSampleCode(
+            method, arguments, clientType, resourceNames));
   }
 
   // ======================================== Helpers ==========================================//
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java
index 3cf805932f..68dd8fe8fa 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java
@@ -55,6 +55,7 @@
 import com.google.api.generator.gapic.model.Message;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.Method.Stream;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Preconditions;
@@ -93,7 +94,8 @@ public static ServiceSettingsClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> ignore) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
     String pakkage = service.pakkage();
     Map<String, TypeNode> types = createDynamicTypes(service);
     String className = getThisClassName(service.name());
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
index ce1f79727e..4aa3b1e53f 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
@@ -35,6 +35,7 @@
 import com.google.api.generator.gapic.model.GapicClass.Kind;
 import com.google.api.generator.gapic.model.Message;
 import com.google.api.generator.gapic.model.Method;
+import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.longrunning.Operation;
@@ -57,7 +58,8 @@ public static ServiceStubClassComposer instance() {
   }
 
   @Override
-  public GapicClass generate(Service service, Map<String, Message> messageTypes) {
+  public GapicClass generate(
+      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes) {
     Map<String, TypeNode> types = createTypes(service, messageTypes);
     String className = String.format("%sStub", service.name());
     GapicClass.Kind kind = Kind.STUB;
diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java
index bc1f8d0c09..c1187dd0f8 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java
@@ -59,7 +59,8 @@ public void generateServiceClasses() {
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
-        GrpcServiceCallableFactoryClassComposer.instance().generate(echoProtoService, messageTypes);
+        GrpcServiceCallableFactoryClassComposer.instance()
+            .generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
index 47c7767d45..03527dd8f8 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
@@ -55,7 +55,8 @@ public void generateGrpcServiceStubClass_simple() {
             echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     Service echoProtoService = services.get(0);
     GapicClass clazz =
-        GrpcServiceStubClassComposer.instance().generate(echoProtoService, messageTypes);
+        GrpcServiceStubClassComposer.instance()
+            .generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
@@ -82,7 +83,8 @@ public void generateGrpcServiceStubClass_httpBindings() {
             outputResourceNames);
     Service testingProtoService = services.get(0);
     GapicClass clazz =
-        GrpcServiceStubClassComposer.instance().generate(testingProtoService, messageTypes);
+        GrpcServiceStubClassComposer.instance()
+            .generate(testingProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
@@ -115,7 +117,8 @@ public void generateGrpcServiceStubClass_httpBindingsWithSubMessageFields() {
             outputResourceNames);
 
     Service service = services.get(0);
-    GapicClass clazz = GrpcServiceStubClassComposer.instance().generate(service, messageTypes);
+    GapicClass clazz =
+        GrpcServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
index 61785acb7b..e8dfb79704 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
@@ -58,7 +58,8 @@ public void generateServiceClasses() {
             echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
-    GapicClass clazz = MockServiceClassComposer.instance().generate(echoProtoService, messageTypes);
+    GapicClass clazz =
+        MockServiceClassComposer.instance().generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
index 624126bb96..a5bdd6fd3b 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
@@ -59,7 +59,8 @@ public void generateServiceClasses() {
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
-        MockServiceImplClassComposer.instance().generate(echoProtoService, messageTypes);
+        MockServiceImplClassComposer.instance()
+            .generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
index 1a882a6a30..79b9ee7043 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
@@ -53,7 +53,8 @@ public void generateServiceClasses() {
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
-        ServiceClientClassComposer.instance().generate(echoProtoService, messageTypes);
+        ServiceClientClassComposer.instance()
+            .generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
@@ -76,7 +77,8 @@ public void generateServiceClasses_methodSignatureHasNestedFields() {
             fileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service protoService = services.get(0);
-    GapicClass clazz = ServiceClientClassComposer.instance().generate(protoService, messageTypes);
+    GapicClass clazz =
+        ServiceClientClassComposer.instance().generate(protoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
index bd7b41eb16..5f32693747 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
@@ -59,7 +59,8 @@ public void generateServiceClasses() {
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
-        ServiceSettingsClassComposer.instance().generate(echoProtoService, messageTypes);
+        ServiceSettingsClassComposer.instance()
+            .generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
index 2e7a390b0b..62ac11c04e 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
@@ -58,7 +58,8 @@ public void generateServiceClasses() {
             echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
-    GapicClass clazz = ServiceStubClassComposer.instance().generate(echoProtoService, messageTypes);
+    GapicClass clazz =
+        ServiceStubClassComposer.instance().generate(echoProtoService, resourceNames, messageTypes);
 
     JavaWriterVisitor visitor = new JavaWriterVisitor();
     clazz.classDefinition().accept(visitor);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index 3fd20dfae5..00c7938e1c 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -147,7 +147,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   String parent = "parent-995424086";
+   *   ResourceName parent = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
    *   EchoResponse response = echoClient.Echo(parent);
    * }
    * }</pre>
@@ -188,7 +188,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   String name = "name3373707";
+   *   FoobarName name = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
    *   EchoResponse response = echoClient.Echo(name);
    * }
    * }</pre>
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
index fa734a8cc4..8dc8c7dca0 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
@@ -227,7 +227,7 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   String name = "name3373707";
+   *   UserName name = UserName.of("[USER]");
    *   User response = identityClient.GetUser(name);
    * }
    * }</pre>
@@ -312,7 +312,7 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   String name = "name3373707";
+   *   UserName name = UserName.of("[USER]");
    *   Empty response = identityClient.DeleteUser(name);
    * }
    * }</pre>
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 14792aeb80..c086f9a693 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -317,7 +317,7 @@ public final UnaryCallable<CreateFeedRequest, Feed> createFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String name = "name3373707";
+   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
    *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }</pre>
@@ -497,7 +497,7 @@ public final UnaryCallable<UpdateFeedRequest, Feed> updateFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String name = "name3373707";
+   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
    *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }</pre>
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 827ebda1e6..ed28beeef0 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -572,7 +572,7 @@ public final UnaryCallable<ListSinksRequest, ListSinksResponse> listSinksCallabl
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }</pre>
@@ -659,7 +659,7 @@ public final UnaryCallable<GetSinkRequest, LogSink> getSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -693,7 +693,7 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -727,7 +727,7 @@ public final LogSink createSink(FolderName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -761,7 +761,7 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -862,7 +862,7 @@ public final UnaryCallable<CreateSinkRequest, LogSink> createSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
@@ -935,7 +935,7 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
@@ -1067,7 +1067,7 @@ public final UnaryCallable<UpdateSinkRequest, LogSink> updateSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }</pre>
@@ -1319,7 +1319,7 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String name = "name3373707";
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }</pre>
@@ -1404,7 +1404,7 @@ public final UnaryCallable<GetExclusionRequest, LogExclusion> getExclusionCallab
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1436,7 +1436,7 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1468,7 +1468,7 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1500,7 +1500,7 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1591,7 +1591,7 @@ public final UnaryCallable<CreateExclusionRequest, LogExclusion> createExclusion
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String name = "name3373707";
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
@@ -1704,7 +1704,7 @@ public final UnaryCallable<UpdateExclusionRequest, LogExclusion> updateExclusion
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String name = "name3373707";
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }</pre>
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 3385101e0d..9309a543a7 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -157,7 +157,7 @@ public LoggingServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String log_name = "log_name2013526694";
+   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
    *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }</pre>
@@ -250,7 +250,7 @@ public final UnaryCallable<DeleteLogRequest, Empty> deleteLogCallable() {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String log_name = "log_name2013526694";
+   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
    *   MonitoredResource resource = MonitoredResource.newBuilder().build();
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 8fc69a838a..f072ec6551 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -75,7 +75,7 @@
  * <pre>{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
  *     MetricsServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
@@ -85,7 +85,7 @@
  *
  * <pre>{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
- *     MetricsServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
+ *     MetricsServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
  * }</pre>
@@ -152,7 +152,7 @@ public MetricsServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -176,7 +176,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -238,7 +238,8 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -262,7 +263,8 @@ public final LogMetric getLogMetric(LogMetricName metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -284,7 +286,7 @@ public final LogMetric getLogMetric(String metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -313,7 +315,9 @@ public final UnaryCallable<GetLogMetricRequest, LogMetric> getLogMetricCallable(
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
    * }
    * }</pre>
    *
@@ -341,7 +345,9 @@ public final LogMetric createLogMetric(ProjectName parent, LogMetric metric) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
    * }
    * }</pre>
    *
@@ -366,7 +372,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -395,7 +401,9 @@ public final UnaryCallable<CreateLogMetricRequest, LogMetric> createLogMetricCal
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
    * }
    * }</pre>
    *
@@ -424,7 +432,9 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
    * }
    * }</pre>
    *
@@ -450,7 +460,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -479,7 +489,8 @@ public final UnaryCallable<UpdateLogMetricRequest, LogMetric> updateLogMetricCal
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -503,7 +514,8 @@ public final Empty deleteLogMetric(LogMetricName metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -525,7 +537,7 @@ public final Empty deleteLogMetric(String metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 3f3d444812..cf6045a524 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -317,7 +317,7 @@ public final UnaryCallable<ListInstancesRequest, ListInstancesResponse> listInst
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
    *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }</pre>

From 0a850616e36ce38e388df7ab03d587ac24a8ac52 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Wed, 18 Nov 2020 00:00:44 -0800
Subject: [PATCH 05/13] run google format

---
 .../generator/gapic/composer/SampleCodeHelperComposer.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 25d19a7367..41585658ff 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -16,7 +16,6 @@
 
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.CommentStatement;
-import com.google.api.generator.engine.ast.ConcreteReference;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.LineComment;
@@ -30,7 +29,6 @@
 import com.google.api.generator.gapic.model.MethodArgument;
 import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.utils.JavaStyle;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -194,8 +192,9 @@ private static Expr createAssignExprForVariableWithClientMethod(
   }
 
   private static List<Expr> mapMethodArgumentsToVariableExprs(List<MethodArgument> arguments) {
-    return arguments.stream().map(arg -> createVariableExpr(arg.name(), arg.type())).collect(
-        Collectors.toList());
+    return arguments.stream()
+        .map(arg -> createVariableExpr(arg.name(), arg.type()))
+        .collect(Collectors.toList());
   }
 
   private static String getClientName(TypeNode clientType) {

From 4e5fceff9a2ca85ea1fc289aa51255e5abd23d0b Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Thu, 19 Nov 2020 21:38:45 -0800
Subject: [PATCH 06/13] refactor

---
 .../gapic/composer/ClassComposer.java         |  2 +
 .../composer/SampleCodeHelperComposer.java    | 39 +++++------
 .../ServiceClientSampleCodeComposer.java      |  1 -
 .../gapic/composer/goldens/EchoClient.golden  |  6 +-
 .../goldens/asset/AssetServiceClient.java     | 26 ++++----
 .../logging/ConfigServiceV2Client.java        | 64 +++++++++----------
 .../logging/LoggingServiceV2Client.java       | 26 ++++----
 .../logging/MetricsServiceV2Client.java       | 18 +++---
 .../goldens/redis/CloudRedisClient.java       | 48 +++++++-------
 9 files changed, 113 insertions(+), 117 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
index 7f8b5e860d..460832be19 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
@@ -22,5 +22,7 @@
 
 public interface ClassComposer {
   GapicClass generate(
+      // TODO(miraleung): clean up the hierarchy to avoid pass another parameter (resourceNames is
+      // only used for composing sample code).
       Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes);
 }
diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 41585658ff..a445764f90 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -20,7 +20,6 @@
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.LineComment;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
-import com.google.api.generator.engine.ast.Statement;
 import com.google.api.generator.engine.ast.TryCatchStatement;
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.engine.ast.Variable;
@@ -64,36 +63,32 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
       TypeNode clientType,
       Map<String, ResourceName> resourceNames) {
     // TODO(summerji): Add unit tests.
+    VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     // Assign each method arguments with default value.
-    List<Statement> bodyStatements =
+    List<Expr> bodyExpr =
         arguments.stream()
-            .map(
-                methodArg ->
-                    ExprStatement.withExpr(
-                        assignMethodArgumentWithDefaultValue(methodArg, resourceNames)))
+            .map(methodArg -> assignMethodArgumentWithDefaultValue(methodArg, resourceNames))
             .collect(Collectors.toList());
     // Invoke current method based on return type.
     // e.g. if return void, echoClient.echo(..); or,
     // e.g. if return other type, EchoResponse response = echoClient.echo(...);
     if (method.outputType().equals(TypeNode.VOID)) {
-      bodyStatements.add(
-          ExprStatement.withExpr(
-              MethodInvocationExpr.builder()
-                  .setExprReferenceExpr(
-                      createVariableDeclExpr(getClientName(clientType), clientType))
-                  .setMethodName(method.name())
-                  .setReturnType(clientType)
-                  .build()));
+      bodyExpr.add(
+          MethodInvocationExpr.builder()
+              .setExprReferenceExpr(clientVarExpr)
+              .setMethodName(method.name())
+              .setReturnType(clientType)
+              .build());
     } else {
-      bodyStatements.add(
-          ExprStatement.withExpr(
-              createAssignExprForVariableWithClientMethod(
-                  RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments)));
+      bodyExpr.add(
+          createAssignExprForVariableWithClientMethod(
+              RESPONSE_VAR_NAME, method.outputType(), clientVarExpr, method.name(), arguments));
     }
 
     return TryCatchStatement.builder()
-        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
-        .setTryBody(bodyStatements)
+        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
+        .setTryBody(
+            bodyExpr.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList()))
         .setIsSampleCode(true)
         .build();
   }
@@ -174,13 +169,13 @@ private static Expr assignMethodArgumentWithDefaultValue(
   private static Expr createAssignExprForVariableWithClientMethod(
       String variableName,
       TypeNode variableType,
-      TypeNode clientType,
+      VariableExpr clientVarExpr,
       String methodName,
       List<MethodArgument> arguments) {
     VariableExpr varExpr = createVariableExpr(variableName, variableType);
     MethodInvocationExpr clientMethodInvocationExpr =
         MethodInvocationExpr.builder()
-            .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
+            .setExprReferenceExpr(clientVarExpr)
             .setMethodName(methodName)
             .setArguments(mapMethodArgumentsToVariableExprs(arguments))
             .setReturnType(variableType)
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 7ce82998a1..529f3b4d89 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
@@ -32,7 +32,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class ServiceClientSampleCodeComposer {
   // TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer.
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index 00c7938e1c..34bf7354dd 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -287,7 +287,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -334,7 +334,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -364,7 +364,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index c086f9a693..927fe90488 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -78,7 +78,7 @@
  * <pre>{@code
  * AssetServiceSettings assetServiceSettings =
  *     AssetServiceSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }</pre>
@@ -87,7 +87,7 @@
  *
  * <pre>{@code
  * AssetServiceSettings assetServiceSettings =
- *     AssetServiceSettings.newBuilder().setEndpoint("myEndpoint").build();
+ *     AssetServiceSettings.newBuilder().setEndpoint(myEndpoint).build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }</pre>
  */
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -229,7 +229,7 @@ public final UnaryCallable<ExportAssetsRequest, Operation> exportAssetsCallable(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -288,7 +288,7 @@ public final Feed createFeed(String parent) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -364,7 +364,7 @@ public final Feed getFeed(String name) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -416,7 +416,7 @@ public final ListFeedsResponse listFeeds(String parent) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -468,7 +468,7 @@ public final Feed updateFeed(Feed feed) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -546,7 +546,7 @@ public final Empty deleteFeed(String name) {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -577,7 +577,7 @@ public final UnaryCallable<DeleteFeedRequest, Empty> deleteFeedCallable() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -651,7 +651,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -699,7 +699,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -757,7 +757,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index ed28beeef0..4d284b0150 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -76,7 +76,7 @@
  * <pre>{@code
  * ConfigServiceV2Settings configServiceV2Settings =
  *     ConfigServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
@@ -86,7 +86,7 @@
  *
  * <pre>{@code
  * ConfigServiceV2Settings configServiceV2Settings =
- *     ConfigServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ *     ConfigServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
  * }</pre>
@@ -153,7 +153,7 @@ public ConfigServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -182,7 +182,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -211,7 +211,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -240,7 +240,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -269,7 +269,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -335,7 +335,7 @@ public final UnaryCallable<ListBucketsRequest, ListBucketsResponse> listBucketsC
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -373,7 +373,7 @@ public final UnaryCallable<GetBucketRequest, LogBucket> getBucketCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -411,7 +411,7 @@ public final UnaryCallable<UpdateBucketRequest, LogBucket> updateBucketCallable(
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -436,7 +436,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -461,7 +461,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -486,7 +486,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -511,7 +511,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -627,7 +627,7 @@ public final LogSink getSink(String sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -826,7 +826,7 @@ public final LogSink createSink(String parent, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1033,7 +1033,7 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1126,7 +1126,7 @@ public final Empty deleteSink(String sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1156,7 +1156,7 @@ public final UnaryCallable<DeleteSinkRequest, Empty> deleteSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1181,7 +1181,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1206,7 +1206,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1231,7 +1231,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1256,7 +1256,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1278,7 +1278,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1374,7 +1374,7 @@ public final LogExclusion getExclusion(String name) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1561,7 +1561,7 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion)
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1675,7 +1675,7 @@ public final LogExclusion updateExclusion(
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1759,7 +1759,7 @@ public final Empty deleteExclusion(String name) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1794,7 +1794,7 @@ public final UnaryCallable<DeleteExclusionRequest, Empty> deleteExclusionCallabl
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1840,7 +1840,7 @@ public final UnaryCallable<GetCmekSettingsRequest, CmekSettings> getCmekSettings
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 9309a543a7..a30d2a5f9e 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -78,7 +78,7 @@
  * <pre>{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
  *     LoggingServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
@@ -88,7 +88,7 @@
  *
  * <pre>{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
- *     LoggingServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ *     LoggingServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
  * }</pre>
@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -435,7 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -478,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -523,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -568,7 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -594,7 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -620,7 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -646,7 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -672,7 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -695,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index f072ec6551..b5295fbde0 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -75,7 +75,7 @@
  * <pre>{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
  *     MetricsServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
@@ -85,7 +85,7 @@
  *
  * <pre>{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
- *     MetricsServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ *     MetricsServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
  * }</pre>
@@ -152,7 +152,7 @@ public MetricsServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -176,7 +176,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -286,7 +286,7 @@ public final LogMetric getLogMetric(String metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -372,7 +372,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -460,7 +460,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -537,7 +537,7 @@ public final Empty deleteLogMetric(String metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index cf6045a524..2684febe00 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -98,7 +98,7 @@
  * <pre>{@code
  * CloudRedisSettings cloudRedisSettings =
  *     CloudRedisSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }</pre>
@@ -107,7 +107,7 @@
  *
  * <pre>{@code
  * CloudRedisSettings cloudRedisSettings =
- *     CloudRedisSettings.newBuilder().setEndpoint("myEndpoint").build();
+ *     CloudRedisSettings.newBuilder().setEndpoint(myEndpoint).build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }</pre>
  */
@@ -192,7 +192,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -226,7 +226,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -366,7 +366,7 @@ public final Instance getInstance(String name) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }</pre>
    *
@@ -406,7 +406,7 @@ public final UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -455,7 +455,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -504,7 +504,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -571,7 +571,7 @@ public final UnaryCallable<CreateInstanceRequest, Operation> createInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -601,7 +601,7 @@ public final OperationFuture<Instance, OperationMetadata> updateInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -650,7 +650,7 @@ public final UnaryCallable<UpdateInstanceRequest, Operation> updateInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -678,7 +678,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -703,7 +703,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -750,7 +750,7 @@ public final UnaryCallable<UpgradeInstanceRequest, Operation> upgradeInstanceCal
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -781,7 +781,7 @@ public final OperationFuture<Instance, OperationMetadata> importInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -839,7 +839,7 @@ public final UnaryCallable<ImportInstanceRequest, Operation> importInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -869,7 +869,7 @@ public final OperationFuture<Instance, OperationMetadata> exportInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -921,7 +921,7 @@ public final UnaryCallable<ExportInstanceRequest, Operation> exportInstanceCalla
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -951,7 +951,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -981,7 +981,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1024,7 +1024,7 @@ public final UnaryCallable<FailoverInstanceRequest, Operation> failoverInstanceC
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1049,7 +1049,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Insta
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }</pre>
    *
@@ -1071,7 +1071,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Strin
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *

From 6c11d8871af9977f8df0df6084e3fe0d1111844c Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Thu, 19 Nov 2020 23:06:05 -0800
Subject: [PATCH 07/13] refactor types

---
 .../gapic/composer/ServiceClientClassComposer.java     | 10 ++--------
 1 file changed, 2 insertions(+), 8 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 7b3a425580..aea35efb5f 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
@@ -161,13 +161,7 @@ private static List<MethodDefinition> createClassMethods(
     methods.addAll(createStaticCreatorMethods(service, types));
     methods.addAll(createConstructorMethods(service, types, hasLroClient));
     methods.addAll(createGetterMethods(service, types, hasLroClient));
-    methods.addAll(
-        createServiceMethods(
-            service,
-            messageTypes,
-            types,
-            types.get(getClientClassName(service.name())),
-            resourceNames));
+    methods.addAll(createServiceMethods(service, messageTypes, types, resourceNames));
     methods.addAll(createBackgroundResourceMethods(service, types));
     return methods;
   }
@@ -482,8 +476,8 @@ private static List<MethodDefinition> createServiceMethods(
       Service service,
       Map<String, Message> messageTypes,
       Map<String, TypeNode> types,
-      TypeNode clientType,
       Map<String, ResourceName> resourceNames) {
+    TypeNode clientType = types.get(getClientClassName(service.name()));
     List<MethodDefinition> javaMethods = new ArrayList<>();
     for (Method method : service.methods()) {
       if (method.stream().equals(Stream.NONE)) {

From 82bf2ab3ee698c1bd80508f8c2bd8fe13653682c Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Fri, 20 Nov 2020 01:41:20 -0800
Subject: [PATCH 08/13] lower method name

---
 .../composer/SampleCodeHelperComposer.java    |  2 +-
 .../gapic/composer/goldens/EchoClient.golden  | 14 +++---
 .../composer/goldens/IdentityClient.golden    | 12 ++---
 .../goldens/asset/AssetServiceClient.java     | 14 +++---
 .../logging/ConfigServiceV2Client.java        | 48 +++++++++----------
 .../logging/LoggingServiceV2Client.java       |  8 ++--
 .../logging/MetricsServiceV2Client.java       | 16 +++----
 .../goldens/redis/CloudRedisClient.java       |  4 +-
 8 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index a445764f90..a327efd261 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -176,7 +176,7 @@ private static Expr createAssignExprForVariableWithClientMethod(
     MethodInvocationExpr clientMethodInvocationExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(clientVarExpr)
-            .setMethodName(methodName)
+            .setMethodName(JavaStyle.toLowerCamelCase(methodName))
             .setArguments(mapMethodArgumentsToVariableExprs(arguments))
             .setReturnType(variableType)
             .build();
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index 34bf7354dd..91d56b1b62 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -148,7 +148,7 @@ public class EchoClient implements BackgroundResource {
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   ResourceName parent = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
-   *   EchoResponse response = echoClient.Echo(parent);
+   *   EchoResponse response = echoClient.echo(parent);
    * }
    * }</pre>
    *
@@ -170,7 +170,7 @@ public class EchoClient implements BackgroundResource {
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   Status error = Status.newBuilder().build();
-   *   EchoResponse response = echoClient.Echo(error);
+   *   EchoResponse response = echoClient.echo(error);
    * }
    * }</pre>
    *
@@ -189,7 +189,7 @@ public class EchoClient implements BackgroundResource {
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   FoobarName name = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
-   *   EchoResponse response = echoClient.Echo(name);
+   *   EchoResponse response = echoClient.echo(name);
    * }
    * }</pre>
    *
@@ -209,7 +209,7 @@ public class EchoClient implements BackgroundResource {
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   String content = "content951530617";
-   *   EchoResponse response = echoClient.Echo(content);
+   *   EchoResponse response = echoClient.echo(content);
    * }
    * }</pre>
    *
@@ -228,7 +228,7 @@ public class EchoClient implements BackgroundResource {
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   String name = "name3373707";
-   *   EchoResponse response = echoClient.Echo(name);
+   *   EchoResponse response = echoClient.echo(name);
    * }
    * }</pre>
    *
@@ -247,7 +247,7 @@ public class EchoClient implements BackgroundResource {
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   String parent = "parent-995424086";
-   *   EchoResponse response = echoClient.Echo(parent);
+   *   EchoResponse response = echoClient.echo(parent);
    * }
    * }</pre>
    *
@@ -267,7 +267,7 @@ public class EchoClient implements BackgroundResource {
    * try (EchoClient echoClient = EchoClient.create()) {
    *   String content = "content951530617";
    *   Severity severity = Severity.forNumber(0);
-   *   EchoResponse response = echoClient.Echo(content, severity);
+   *   EchoResponse response = echoClient.echo(content, severity);
    * }
    * }</pre>
    *
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
index 8dc8c7dca0..87478d10b4 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
@@ -130,7 +130,7 @@ public class IdentityClient implements BackgroundResource {
    *   String parent = "parent-995424086";
    *   String display_name = "display_name1615086568";
    *   String email = "email96619420";
-   *   User response = identityClient.CreateUser(parent, display_name, email);
+   *   User response = identityClient.createUser(parent, display_name, email);
    * }
    * }</pre>
    *
@@ -163,7 +163,7 @@ public class IdentityClient implements BackgroundResource {
    *   boolean enable_notifications = true;
    *   double height_feet = -1032737338;
    *   User response =
-   *       identityClient.CreateUser(
+   *       identityClient.createUser(
    *           parent, display_name, email, age, nickname, enable_notifications, height_feet);
    * }
    * }</pre>
@@ -228,7 +228,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   UserName name = UserName.of("[USER]");
-   *   User response = identityClient.GetUser(name);
+   *   User response = identityClient.getUser(name);
    * }
    * }</pre>
    *
@@ -248,7 +248,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   String name = "name3373707";
-   *   User response = identityClient.GetUser(name);
+   *   User response = identityClient.getUser(name);
    * }
    * }</pre>
    *
@@ -313,7 +313,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   UserName name = UserName.of("[USER]");
-   *   Empty response = identityClient.DeleteUser(name);
+   *   Empty response = identityClient.deleteUser(name);
    * }
    * }</pre>
    *
@@ -335,7 +335,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   String name = "name3373707";
-   *   Empty response = identityClient.DeleteUser(name);
+   *   Empty response = identityClient.deleteUser(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 927fe90488..6494cc2d62 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -265,7 +265,7 @@ public final BatchGetAssetsHistoryResponse batchGetAssetsHistory(
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String parent = "parent-995424086";
-   *   Feed response = assetServiceClient.CreateFeed(parent);
+   *   Feed response = assetServiceClient.createFeed(parent);
    * }
    * }</pre>
    *
@@ -318,7 +318,7 @@ public final UnaryCallable<CreateFeedRequest, Feed> createFeedCallable() {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
-   *   Feed response = assetServiceClient.GetFeed(name);
+   *   Feed response = assetServiceClient.getFeed(name);
    * }
    * }</pre>
    *
@@ -342,7 +342,7 @@ public final Feed getFeed(FeedName name) {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String name = "name3373707";
-   *   Feed response = assetServiceClient.GetFeed(name);
+   *   Feed response = assetServiceClient.getFeed(name);
    * }
    * }</pre>
    *
@@ -394,7 +394,7 @@ public final UnaryCallable<GetFeedRequest, Feed> getFeedCallable() {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String parent = "parent-995424086";
-   *   ListFeedsResponse response = assetServiceClient.ListFeeds(parent);
+   *   ListFeedsResponse response = assetServiceClient.listFeeds(parent);
    * }
    * }</pre>
    *
@@ -446,7 +446,7 @@ public final UnaryCallable<ListFeedsRequest, ListFeedsResponse> listFeedsCallabl
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   Feed feed = Feed.newBuilder().build();
-   *   Feed response = assetServiceClient.UpdateFeed(feed);
+   *   Feed response = assetServiceClient.updateFeed(feed);
    * }
    * }</pre>
    *
@@ -498,7 +498,7 @@ public final UnaryCallable<UpdateFeedRequest, Feed> updateFeedCallable() {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
-   *   Empty response = assetServiceClient.DeleteFeed(name);
+   *   Empty response = assetServiceClient.deleteFeed(name);
    * }
    * }</pre>
    *
@@ -524,7 +524,7 @@ public final Empty deleteFeed(FeedName name) {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String name = "name3373707";
-   *   Empty response = assetServiceClient.DeleteFeed(name);
+   *   Empty response = assetServiceClient.deleteFeed(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 4d284b0150..3a073518d4 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -573,7 +573,7 @@ public final UnaryCallable<ListSinksRequest, ListSinksResponse> listSinksCallabl
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
-   *   LogSink response = configServiceV2Client.GetSink(sink_name);
+   *   LogSink response = configServiceV2Client.getSink(sink_name);
    * }
    * }</pre>
    *
@@ -602,7 +602,7 @@ public final LogSink getSink(LogSinkName sinkName) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String sink_name = "sink_name-1391757129";
-   *   LogSink response = configServiceV2Client.GetSink(sink_name);
+   *   LogSink response = configServiceV2Client.getSink(sink_name);
    * }
    * }</pre>
    *
@@ -661,7 +661,7 @@ public final UnaryCallable<GetSinkRequest, LogSink> getSinkCallable() {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
+   *   LogSink response = configServiceV2Client.createSink(parent, sink);
    * }
    * }</pre>
    *
@@ -695,7 +695,7 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   FolderName parent = FolderName.of("[FOLDER]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
+   *   LogSink response = configServiceV2Client.createSink(parent, sink);
    * }
    * }</pre>
    *
@@ -729,7 +729,7 @@ public final LogSink createSink(FolderName parent, LogSink sink) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
+   *   LogSink response = configServiceV2Client.createSink(parent, sink);
    * }
    * }</pre>
    *
@@ -763,7 +763,7 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
+   *   LogSink response = configServiceV2Client.createSink(parent, sink);
    * }
    * }</pre>
    *
@@ -797,7 +797,7 @@ public final LogSink createSink(ProjectName parent, LogSink sink) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
+   *   LogSink response = configServiceV2Client.createSink(parent, sink);
    * }
    * }</pre>
    *
@@ -864,7 +864,7 @@ public final UnaryCallable<CreateSinkRequest, LogSink> createSinkCallable() {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
+   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink);
    * }
    * }</pre>
    *
@@ -902,7 +902,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String sink_name = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
+   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink);
    * }
    * }</pre>
    *
@@ -938,7 +938,7 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
-   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
+   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink, update_mask);
    * }
    * }</pre>
    *
@@ -987,7 +987,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up
    *   String sink_name = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
-   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
+   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink, update_mask);
    * }
    * }</pre>
    *
@@ -1068,7 +1068,7 @@ public final UnaryCallable<UpdateSinkRequest, LogSink> updateSinkCallable() {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
-   *   Empty response = configServiceV2Client.DeleteSink(sink_name);
+   *   Empty response = configServiceV2Client.deleteSink(sink_name);
    * }
    * }</pre>
    *
@@ -1099,7 +1099,7 @@ public final Empty deleteSink(LogSinkName sinkName) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String sink_name = "sink_name-1391757129";
-   *   Empty response = configServiceV2Client.DeleteSink(sink_name);
+   *   Empty response = configServiceV2Client.deleteSink(sink_name);
    * }
    * }</pre>
    *
@@ -1320,7 +1320,7 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
-   *   LogExclusion response = configServiceV2Client.GetExclusion(name);
+   *   LogExclusion response = configServiceV2Client.getExclusion(name);
    * }
    * }</pre>
    *
@@ -1349,7 +1349,7 @@ public final LogExclusion getExclusion(LogExclusionName name) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String name = "name3373707";
-   *   LogExclusion response = configServiceV2Client.GetExclusion(name);
+   *   LogExclusion response = configServiceV2Client.getExclusion(name);
    * }
    * }</pre>
    *
@@ -1406,7 +1406,7 @@ public final UnaryCallable<GetExclusionRequest, LogExclusion> getExclusionCallab
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
+   *   LogExclusion response = configServiceV2Client.createExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1438,7 +1438,7 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   FolderName parent = FolderName.of("[FOLDER]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
+   *   LogExclusion response = configServiceV2Client.createExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1470,7 +1470,7 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
+   *   LogExclusion response = configServiceV2Client.createExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1502,7 +1502,7 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
+   *   LogExclusion response = configServiceV2Client.createExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1534,7 +1534,7 @@ public final LogExclusion createExclusion(ProjectName parent, LogExclusion exclu
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
+   *   LogExclusion response = configServiceV2Client.createExclusion(parent, exclusion);
    * }
    * }</pre>
    *
@@ -1594,7 +1594,7 @@ public final UnaryCallable<CreateExclusionRequest, LogExclusion> createExclusion
    *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
+   *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, update_mask);
    * }
    * }</pre>
    *
@@ -1636,7 +1636,7 @@ public final LogExclusion updateExclusion(
    *   String name = "name3373707";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
+   *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, update_mask);
    * }
    * }</pre>
    *
@@ -1705,7 +1705,7 @@ public final UnaryCallable<UpdateExclusionRequest, LogExclusion> updateExclusion
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
-   *   Empty response = configServiceV2Client.DeleteExclusion(name);
+   *   Empty response = configServiceV2Client.deleteExclusion(name);
    * }
    * }</pre>
    *
@@ -1734,7 +1734,7 @@ public final Empty deleteExclusion(LogExclusionName name) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String name = "name3373707";
-   *   Empty response = configServiceV2Client.DeleteExclusion(name);
+   *   Empty response = configServiceV2Client.deleteExclusion(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index a30d2a5f9e..28291da06d 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -158,7 +158,7 @@ public LoggingServiceV2Stub getStub() {
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
-   *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
+   *   Empty response = loggingServiceV2Client.deleteLog(log_name);
    * }
    * }</pre>
    *
@@ -189,7 +189,7 @@ public final Empty deleteLog(LogName logName) {
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String log_name = "log_name2013526694";
-   *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
+   *   Empty response = loggingServiceV2Client.deleteLog(log_name);
    * }
    * }</pre>
    *
@@ -255,7 +255,7 @@ public final UnaryCallable<DeleteLogRequest, Empty> deleteLogCallable() {
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
    *   WriteLogEntriesResponse response =
-   *       loggingServiceV2Client.WriteLogEntries(log_name, resource, labels, entries);
+   *       loggingServiceV2Client.writeLogEntries(log_name, resource, labels, entries);
    * }
    * }</pre>
    *
@@ -330,7 +330,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
    *   WriteLogEntriesResponse response =
-   *       loggingServiceV2Client.WriteLogEntries(log_name, resource, labels, entries);
+   *       loggingServiceV2Client.writeLogEntries(log_name, resource, labels, entries);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index b5295fbde0..0b1f01ab63 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -239,7 +239,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
-   *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
+   *   LogMetric response = metricsServiceV2Client.getLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -264,7 +264,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) {
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String metric_name = "metric_name-1737602118";
-   *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
+   *   LogMetric response = metricsServiceV2Client.getLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -317,7 +317,7 @@ public final UnaryCallable<GetLogMetricRequest, LogMetric> getLogMetricCallable(
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogMetric metric = LogMetric.newBuilder().build();
-   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
+   *   LogMetric response = metricsServiceV2Client.createLogMetric(parent, metric);
    * }
    * }</pre>
    *
@@ -347,7 +347,7 @@ public final LogMetric createLogMetric(ProjectName parent, LogMetric metric) {
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   LogMetric metric = LogMetric.newBuilder().build();
-   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
+   *   LogMetric response = metricsServiceV2Client.createLogMetric(parent, metric);
    * }
    * }</pre>
    *
@@ -403,7 +403,7 @@ public final UnaryCallable<CreateLogMetricRequest, LogMetric> createLogMetricCal
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   LogMetric metric = LogMetric.newBuilder().build();
-   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
+   *   LogMetric response = metricsServiceV2Client.updateLogMetric(metric_name, metric);
    * }
    * }</pre>
    *
@@ -434,7 +434,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String metric_name = "metric_name-1737602118";
    *   LogMetric metric = LogMetric.newBuilder().build();
-   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
+   *   LogMetric response = metricsServiceV2Client.updateLogMetric(metric_name, metric);
    * }
    * }</pre>
    *
@@ -490,7 +490,7 @@ public final UnaryCallable<UpdateLogMetricRequest, LogMetric> updateLogMetricCal
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
-   *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
+   *   Empty response = metricsServiceV2Client.deleteLogMetric(metric_name);
    * }
    * }</pre>
    *
@@ -515,7 +515,7 @@ public final Empty deleteLogMetric(LogMetricName metricName) {
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String metric_name = "metric_name-1737602118";
-   *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
+   *   Empty response = metricsServiceV2Client.deleteLogMetric(metric_name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 2684febe00..7fb9c008a4 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -318,7 +318,7 @@ public final UnaryCallable<ListInstancesRequest, ListInstancesResponse> listInst
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
-   *   Instance response = cloudRedisClient.GetInstance(name);
+   *   Instance response = cloudRedisClient.getInstance(name);
    * }
    * }</pre>
    *
@@ -344,7 +344,7 @@ public final Instance getInstance(InstanceName name) {
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
-   *   Instance response = cloudRedisClient.GetInstance(name);
+   *   Instance response = cloudRedisClient.getInstance(name);
    * }
    * }</pre>
    *

From e24e9e317048425c2f81fc2feda71c53cd685d86 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Fri, 20 Nov 2020 02:06:03 -0800
Subject: [PATCH 09/13] fix method name to lower case

---
 .../composer/SampleCodeHelperComposer.java    |  3 ++-
 .../composer/goldens/IdentityClient.golden    |  8 +++----
 .../logging/ConfigServiceV2Client.java        | 24 +++++++++----------
 .../logging/LoggingServiceV2Client.java       |  8 +++----
 .../logging/MetricsServiceV2Client.java       | 12 +++++-----
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index a327efd261..3135c6f9d1 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -161,7 +161,8 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(
   private static Expr assignMethodArgumentWithDefaultValue(
       MethodArgument argument, Map<String, ResourceName> resourceNames) {
     return AssignmentExpr.builder()
-        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.type()))
+        .setVariableExpr(
+            createVariableDeclExpr(JavaStyle.toLowerCamelCase(argument.name()), argument.type()))
         .setValueExpr(DefaultValueComposer.createDefaultValue(argument, resourceNames))
         .build();
   }
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
index 87478d10b4..78f8890dff 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
@@ -128,7 +128,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   String parent = "parent-995424086";
-   *   String display_name = "display_name1615086568";
+   *   String displayName = "display_name1615086568";
    *   String email = "email96619420";
    *   User response = identityClient.createUser(parent, display_name, email);
    * }
@@ -156,12 +156,12 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   String parent = "parent-995424086";
-   *   String display_name = "display_name1615086568";
+   *   String displayName = "display_name1615086568";
    *   String email = "email96619420";
    *   int age = 96511;
    *   String nickname = "nickname70690926";
-   *   boolean enable_notifications = true;
-   *   double height_feet = -1032737338;
+   *   boolean enableNotifications = true;
+   *   double heightFeet = -1032737338;
    *   User response =
    *       identityClient.createUser(
    *           parent, display_name, email, age, nickname, enable_notifications, height_feet);
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 3a073518d4..bd7479be57 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -572,7 +572,7 @@ public final UnaryCallable<ListSinksRequest, ListSinksResponse> listSinksCallabl
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink response = configServiceV2Client.getSink(sink_name);
    * }
    * }</pre>
@@ -601,7 +601,7 @@ public final LogSink getSink(LogSinkName sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   String sinkName = "sink_name-1391757129";
    *   LogSink response = configServiceV2Client.getSink(sink_name);
    * }
    * }</pre>
@@ -862,7 +862,7 @@ public final UnaryCallable<CreateSinkRequest, LogSink> createSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.updateSink(sink_name, sink);
    * }
@@ -900,7 +900,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   String sinkName = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.updateSink(sink_name, sink);
    * }
@@ -935,9 +935,9 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   LogSink response = configServiceV2Client.updateSink(sink_name, sink, update_mask);
    * }
    * }</pre>
@@ -984,9 +984,9 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   String sinkName = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
-   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   LogSink response = configServiceV2Client.updateSink(sink_name, sink, update_mask);
    * }
    * }</pre>
@@ -1067,7 +1067,7 @@ public final UnaryCallable<UpdateSinkRequest, LogSink> updateSinkCallable() {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   Empty response = configServiceV2Client.deleteSink(sink_name);
    * }
    * }</pre>
@@ -1098,7 +1098,7 @@ public final Empty deleteSink(LogSinkName sinkName) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   String sinkName = "sink_name-1391757129";
    *   Empty response = configServiceV2Client.deleteSink(sink_name);
    * }
    * }</pre>
@@ -1593,7 +1593,7 @@ public final UnaryCallable<CreateExclusionRequest, LogExclusion> createExclusion
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, update_mask);
    * }
    * }</pre>
@@ -1635,7 +1635,7 @@ public final LogExclusion updateExclusion(
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String name = "name3373707";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
-   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, update_mask);
    * }
    * }</pre>
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 28291da06d..1560ba9564 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -157,7 +157,7 @@ public LoggingServiceV2Stub getStub() {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
+   *   LogName logName = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
    *   Empty response = loggingServiceV2Client.deleteLog(log_name);
    * }
    * }</pre>
@@ -188,7 +188,7 @@ public final Empty deleteLog(LogName logName) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String log_name = "log_name2013526694";
+   *   String logName = "log_name2013526694";
    *   Empty response = loggingServiceV2Client.deleteLog(log_name);
    * }
    * }</pre>
@@ -250,7 +250,7 @@ public final UnaryCallable<DeleteLogRequest, Empty> deleteLogCallable() {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
+   *   LogName logName = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
    *   MonitoredResource resource = MonitoredResource.newBuilder().build();
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
@@ -325,7 +325,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String log_name = "log_name2013526694";
+   *   String logName = "log_name2013526694";
    *   MonitoredResource resource = MonitoredResource.newBuilder().build();
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 0b1f01ab63..c5c75d67ae 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -238,7 +238,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   LogMetric response = metricsServiceV2Client.getLogMetric(metric_name);
    * }
    * }</pre>
@@ -263,7 +263,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String metric_name = "metric_name-1737602118";
+   *   String metricName = "metric_name-1737602118";
    *   LogMetric response = metricsServiceV2Client.getLogMetric(metric_name);
    * }
    * }</pre>
@@ -401,7 +401,7 @@ public final UnaryCallable<CreateLogMetricRequest, LogMetric> createLogMetricCal
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   LogMetric metric = LogMetric.newBuilder().build();
    *   LogMetric response = metricsServiceV2Client.updateLogMetric(metric_name, metric);
    * }
@@ -432,7 +432,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String metric_name = "metric_name-1737602118";
+   *   String metricName = "metric_name-1737602118";
    *   LogMetric metric = LogMetric.newBuilder().build();
    *   LogMetric response = metricsServiceV2Client.updateLogMetric(metric_name, metric);
    * }
@@ -489,7 +489,7 @@ public final UnaryCallable<UpdateLogMetricRequest, LogMetric> updateLogMetricCal
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   Empty response = metricsServiceV2Client.deleteLogMetric(metric_name);
    * }
    * }</pre>
@@ -514,7 +514,7 @@ public final Empty deleteLogMetric(LogMetricName metricName) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String metric_name = "metric_name-1737602118";
+   *   String metricName = "metric_name-1737602118";
    *   Empty response = metricsServiceV2Client.deleteLogMetric(metric_name);
    * }
    * }</pre>

From 5b11a7b1b69f27c7d785adc92ebf168fcb281272 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 24 Nov 2020 17:04:50 -0800
Subject: [PATCH 10/13] Add unit test

---
 .../gapic/composer/ClassComposer.java         |   2 +-
 .../composer/SampleCodeHelperComposer.java    |  89 +++-
 .../ServiceClientCommentComposer.java         |   2 -
 .../api/generator/gapic/composer/BUILD.bazel  |   2 +
 .../SampleCodeHelperComposerTest.java         | 471 ++++++++++++++++++
 .../composer/goldens/IdentityClient.golden    |   8 +-
 .../goldens/asset/AssetServiceClient.java     |   4 +-
 .../logging/ConfigServiceV2Client.java        |  24 +-
 .../logging/LoggingServiceV2Client.java       |   8 +-
 .../logging/MetricsServiceV2Client.java       |  12 +-
 10 files changed, 566 insertions(+), 56 deletions(-)
 create mode 100644 src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
index 460832be19..46b6180965 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
@@ -24,5 +24,5 @@ public interface ClassComposer {
   GapicClass generate(
       // TODO(miraleung): clean up the hierarchy to avoid pass another parameter (resourceNames is
       // only used for composing sample code).
-      Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes);
+      Service service, Map<String, Message> messageTypes, Map<String, ResourceName> resourceNames);
 }
diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 076314ae8d..370cda4369 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -28,19 +28,26 @@
 import com.google.api.generator.gapic.model.MethodArgument;
 import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.utils.JavaStyle;
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 public final class SampleCodeHelperComposer {
-  private static String RESPONSE_VAR_NAME = "response";
+  private static String RESPONSE = "response";
 
   public static TryCatchStatement composeRpcMethodSampleCode(
       Method method,
       List<MethodArgument> arguments,
       TypeNode clientType,
       Map<String, ResourceName> resourceNames) {
+    Preconditions.checkState(
+        !arguments.isEmpty(),
+        "If method %s's arguments is none, it should pass %s as argument.",
+        method.name(),
+        method.inputType().reference().name());
     // Paged Unary RPC method.
     if (method.isPaged()) {
       return composePagedUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames);
@@ -77,27 +84,40 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
       Map<String, ResourceName> resourceNames) {
     // TODO(summerji): Add unit tests.
     VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
-    // Assign each method arguments with default value.
-    List<Expr> bodyExpr =
+    // Assign each method arguments with its default value.
+    Map<String, VariableExpr> methodArgVarExprMap = mapMethodArgumentsToVariableExprs(arguments);
+    List<Expr> bodyExpr = new ArrayList<>();
+    List<Expr> methodArgumentsAssignmentExpr =
+        assignMethodArgumentsWithDefaultValues(arguments, methodArgVarExprMap, resourceNames);
+    List<Expr> methodVarExprs =
         arguments.stream()
-            .map(methodArg -> assignMethodArgumentWithDefaultValue(methodArg, resourceNames))
+            .map(arg -> methodArgVarExprMap.get(arg.name()))
             .collect(Collectors.toList());
     // Invoke current method based on return type.
     // e.g. if return void, echoClient.echo(..); or,
     // e.g. if return other type, EchoResponse response = echoClient.echo(...);
-    if (method.outputType().equals(TypeNode.VOID)) {
-      bodyExpr.add(
+    boolean returnsVoid = isProtoEmptyType(method.outputType());
+    Expr responseExpr = null;
+    if (returnsVoid) {
+      responseExpr =
           MethodInvocationExpr.builder()
               .setExprReferenceExpr(clientVarExpr)
-              .setMethodName(method.name())
+              .setMethodName(JavaStyle.toLowerCamelCase(method.name()))
+              .setArguments(methodVarExprs)
               .setReturnType(clientType)
-              .build());
+              .build();
     } else {
-      bodyExpr.add(
+      responseExpr =
           createAssignExprForVariableWithClientMethod(
-              RESPONSE_VAR_NAME, method.outputType(), clientVarExpr, method.name(), arguments));
+              createVariableExpr(RESPONSE, method.outputType()),
+              clientVarExpr,
+              JavaStyle.toLowerCamelCase(method.name()),
+              methodVarExprs);
     }
 
+    bodyExpr.addAll(methodArgumentsAssignmentExpr);
+    bodyExpr.add(responseExpr);
+
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
         .setTryBody(
@@ -158,39 +178,53 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(
         .build();
   }
 
-  private static Expr assignMethodArgumentWithDefaultValue(
-      MethodArgument argument, Map<String, ResourceName> resourceNames) {
+  private static List<Expr> assignMethodArgumentsWithDefaultValues(
+      List<MethodArgument> arguments,
+      Map<String, VariableExpr> argVarExprs,
+      Map<String, ResourceName> resourceNames) {
+    return arguments.stream()
+        .map(
+            arg ->
+                createAssignmentExpr(
+                    argVarExprs.get(arg.name()),
+                    DefaultValueComposer.createDefaultValue(arg, resourceNames)))
+        .collect(Collectors.toList());
+  }
+
+  private static AssignmentExpr createAssignmentExpr(VariableExpr variableExpr, Expr valueExpr) {
     return AssignmentExpr.builder()
-        .setVariableExpr(
-            createVariableDeclExpr(JavaStyle.toLowerCamelCase(argument.name()), argument.type()))
-        .setValueExpr(DefaultValueComposer.createDefaultValue(argument, resourceNames))
+        .setVariableExpr(variableExpr.toBuilder().setIsDecl(true).build())
+        .setValueExpr(valueExpr)
         .build();
   }
 
   private static Expr createAssignExprForVariableWithClientMethod(
-      String variableName,
-      TypeNode variableType,
+      VariableExpr variableExpr,
       VariableExpr clientVarExpr,
       String methodName,
-      List<MethodArgument> arguments) {
-    VariableExpr varExpr = createVariableExpr(variableName, variableType);
+      List<Expr> argumentsVarExprs) {
     MethodInvocationExpr clientMethodInvocationExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(clientVarExpr)
             .setMethodName(JavaStyle.toLowerCamelCase(methodName))
-            .setArguments(mapMethodArgumentsToVariableExprs(arguments))
-            .setReturnType(variableType)
+            .setArguments(argumentsVarExprs)
+            .setReturnType(variableExpr.variable().type())
             .build();
     return AssignmentExpr.builder()
-        .setVariableExpr(varExpr.toBuilder().setIsDecl(true).build())
+        .setVariableExpr(variableExpr.toBuilder().setIsDecl(true).build())
         .setValueExpr(clientMethodInvocationExpr)
         .build();
   }
 
-  private static List<Expr> mapMethodArgumentsToVariableExprs(List<MethodArgument> arguments) {
+  private static Map<String, VariableExpr> mapMethodArgumentsToVariableExprs(
+      List<MethodArgument> arguments) {
     return arguments.stream()
-        .map(arg -> createVariableExpr(arg.name(), arg.type()))
-        .collect(Collectors.toList());
+        .collect(
+            Collectors.toMap(
+                methodArg -> methodArg.name(),
+                methodArg ->
+                    createVariableExpr(
+                        JavaStyle.toLowerCamelCase(methodArg.name()), methodArg.type())));
   }
 
   private static String getClientName(TypeNode clientType) {
@@ -216,4 +250,9 @@ private static VariableExpr createVariableExpr(
         .setIsDecl(isDecl)
         .build();
   }
+
+  private static boolean isProtoEmptyType(TypeNode type) {
+    return type.reference().pakkage().equals("com.google.protobuf")
+        && type.reference().name().equals("Empty");
+  }
 }
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 085a64f763..d57b1b743b 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
@@ -19,14 +19,12 @@
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.MethodArgument;
-import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
 import com.google.common.base.Strings;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
index 0e0e941a90..dd574a567e 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
+++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
@@ -22,6 +22,7 @@ TESTS = UPDATE_GOLDENS_TESTS + [
     "DefaultValueComposerTest",
     "ResourceNameTokenizerTest",
     "RetrySettingsComposerTest",
+    "SampleCodeHelperComposerTest"
 ]
 
 TEST_DEPS = [
@@ -38,6 +39,7 @@ TEST_DEPS = [
     "//src/main/java/com/google/api/generator/gapic/protoparser",
     "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto",
     "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto",
+    "@com_google_api_api_common//jar",
     "@com_google_api_gax_java//gax",
     "@com_google_googleapis//google/logging/v2:logging_java_proto",
     "@com_google_googleapis//google/pubsub/v1:pubsub_java_proto",
diff --git a/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java
new file mode 100644
index 0000000000..da8d3d6221
--- /dev/null
+++ b/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java
@@ -0,0 +1,471 @@
+package com.google.api.generator.gapic.composer;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import com.google.api.generator.engine.ast.ConcreteReference;
+import com.google.api.generator.engine.ast.Reference;
+import com.google.api.generator.engine.ast.TypeNode;
+import com.google.api.generator.engine.ast.VaporReference;
+import com.google.api.generator.gapic.composer.samplecode.SampleCodeWriter;
+import com.google.api.generator.gapic.model.Field;
+import com.google.api.generator.gapic.model.Method;
+import com.google.api.generator.gapic.model.MethodArgument;
+import com.google.api.generator.gapic.model.ResourceName;
+import com.google.api.generator.gapic.model.ResourceReference;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SampleCodeHelperComposerTest {
+  private static final String PACKAGE_NAME = "com.google.showcase.v1beta1";
+  private static final TypeNode clientType =
+      TypeNode.withReference(
+          VaporReference.builder().setName("EchoClient").setPakkage(PACKAGE_NAME).build());
+  Map<String, ResourceName> resourceNames = new HashMap<>();
+
+  @Before
+  public void setUp() {
+    ResourceName foobarResourceName =
+        ResourceName.builder()
+            .setVariableName("foobar")
+            .setPakkage(PACKAGE_NAME)
+            .setResourceTypeString("showcase.googleapis.com/Foobar")
+            .setPatterns(
+                Arrays.asList(
+                    "projects/{project}/foobars/{foobar}",
+                    "projects/{project}/chocolate/variants/{variant}/foobars/{foobar}",
+                    "foobars/{foobar}",
+                    "bar_foo/{bar_foo}/foobars/{foobar}"))
+            .setParentMessageName("Foobar")
+            .build();
+    ResourceName anythingGoesResourceName =
+        ResourceName.createWildcard("showcase.googleapis.com/AnythingGoes", PACKAGE_NAME);
+    resourceNames.put("showcase.googleapis.com/Foobar", foobarResourceName);
+    resourceNames.put("showcase.googleapis.com/AnythingGoes", anythingGoesResourceName);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_resourceNameHelperMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    TypeNode resourceNameType =
+        TypeNode.withReference(
+            ConcreteReference.withClazz(com.google.api.resourcenames.ResourceName.class));
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("parent")
+            .setType(resourceNameType)
+            .setField(
+                Field.builder()
+                    .setName("parent")
+                    .setType(TypeNode.STRING)
+                    .setResourceReference(
+                        ResourceReference.withType("showcase.googleapis.com/AnythingGoes"))
+                    .build())
+            .setIsResourceNameHelper(true)
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  ResourceName parent = FoobarName.ofProjectFoobarName(\"[PROJECT]\", \"[FOOBAR]\");\n"
+            + "  EchoResponse response = echoClient.echo(parent);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_isMessageMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    TypeNode methodArgType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("Status").setPakkage("com.google.rpc").build());
+    Field methodArgField =
+        Field.builder()
+            .setName("error")
+            .setType(methodArgType)
+            .setIsMessage(true)
+            .setIsContainedInOneof(true)
+            .build();
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("error")
+            .setType(methodArgType)
+            .setField(methodArgField)
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  Status error = Status.newBuilder().build();\n"
+            + "  EchoResponse response = echoClient.echo(error);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_superReferenceIsResourceNameMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    TypeNode methodArgType =
+        TypeNode.withReference(
+            VaporReference.builder()
+                .setName("FoobarName")
+                .setPakkage(PACKAGE_NAME)
+                .setSupertypeReference(
+                    ConcreteReference.withClazz(com.google.api.resourcenames.ResourceName.class))
+                .build());
+    Field methodArgField =
+        Field.builder()
+            .setName("name")
+            .setType(TypeNode.STRING)
+            .setResourceReference(ResourceReference.withType("showcase.googleapis.com/Foobar"))
+            .build();
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("name")
+            .setType(methodArgType)
+            .setField(methodArgField)
+            .setIsResourceNameHelper(true)
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  FoobarName name = FoobarName.ofProjectFoobarName(\"[PROJECT]\", \"[FOOBAR]\");\n"
+            + "  EchoResponse response = echoClient.echo(name);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_stringIsContainedInOneOfMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    Field methodArgField =
+        Field.builder()
+            .setName("content")
+            .setType(TypeNode.STRING)
+            .setIsContainedInOneof(true)
+            .build();
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("content")
+            .setType(TypeNode.STRING)
+            .setField(methodArgField)
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  String content = \"content951530617\";\n"
+            + "  EchoResponse response = echoClient.echo(content);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_strinWithResourceReferenceMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    Field methodArgField =
+        Field.builder()
+            .setName("name")
+            .setType(TypeNode.STRING)
+            .setResourceReference(ResourceReference.withType("showcase.googleapis.com/Foobar"))
+            .build();
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("name")
+            .setType(TypeNode.STRING)
+            .setField(methodArgField)
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  String name = \"name3373707\";\n"
+            + "  EchoResponse response = echoClient.echo(name);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_stringWithParentResourceReferenceMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    Field methodArgField =
+        Field.builder()
+            .setName("parent")
+            .setType(TypeNode.STRING)
+            .setResourceReference(
+                ResourceReference.withChildType("showcase.googleapis.com/AnythingGoes"))
+            .build();
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("parent")
+            .setType(TypeNode.STRING)
+            .setField(methodArgField)
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  String parent = \"parent-995424086\";\n"
+            + "  EchoResponse response = echoClient.echo(parent);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_multipleWordNameMethodArgument() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    Field methodArgField =
+        Field.builder()
+            .setName("display_name")
+            .setType(TypeNode.STRING)
+            .setResourceReference(
+                ResourceReference.withChildType("showcase.googleapis.com/AnythingGoes"))
+            .build();
+    Reference userRef = VaporReference.builder().setName("User").setPakkage(PACKAGE_NAME).build();
+    Field nestFiled =
+        Field.builder()
+            .setName("user")
+            .setType(TypeNode.withReference(userRef))
+            .setIsMessage(true)
+            .build();
+    MethodArgument arg =
+        MethodArgument.builder()
+            .setName("display_name")
+            .setType(TypeNode.STRING)
+            .setField(methodArgField)
+            .setNestedFields(Arrays.asList(nestFiled))
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  String displayName = \"display_name1615086568\";\n"
+            + "  EchoResponse response = echoClient.echo(displayName);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_multipleMethodArguments() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoRequest").setPakkage(PACKAGE_NAME).build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("EchoResponse").setPakkage(PACKAGE_NAME).build());
+    MethodArgument arg1 =
+        MethodArgument.builder()
+            .setName("content")
+            .setType(TypeNode.STRING)
+            .setField(Field.builder().setName("content").setType(TypeNode.STRING).build())
+            .build();
+    TypeNode severityType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("Severity").setPakkage(PACKAGE_NAME).build());
+    MethodArgument arg2 =
+        MethodArgument.builder()
+            .setName("severity")
+            .setType(severityType)
+            .setField(
+                Field.builder().setName("severity").setType(severityType).setIsEnum(true).build())
+            .build();
+    List<List<MethodArgument>> signatures = Arrays.asList(Arrays.asList(arg1, arg2));
+    Method unaryMethod =
+        Method.builder()
+            .setName("echo")
+            .setMethodSignatures(signatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, signatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  String content = \"content951530617\";\n"
+            + "  Severity severity = Severity.forNumber(0);\n"
+            + "  EchoResponse response = echoClient.echo(content, severity);\n"
+            + "}";
+    assertEquals(expected, results);
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_noMethodArguments() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder()
+                .setName("GetUserRequest")
+                .setPakkage("com.google.showcase.v1beta1")
+                .build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder()
+                .setName("GetUserResponse")
+                .setPakkage("com.google.showcase.v1beta1")
+                .build());
+    Method unaryMethod =
+        Method.builder()
+            .setName("getUser")
+            .setMethodSignatures(Collections.emptyList())
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            SampleCodeWriter.write(
+                SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                    unaryMethod, Collections.emptyList(), clientType, resourceNames)));
+  }
+
+  @Test
+  public void composeUnaryRpcMethodSampleCode_methodReturnVoid() {
+    TypeNode inputType =
+        TypeNode.withReference(
+            VaporReference.builder()
+                .setName("DeleteUserRequest")
+                .setPakkage("com.google.showcase.v1beta1")
+                .build());
+    TypeNode outputType =
+        TypeNode.withReference(
+            VaporReference.builder().setName("Empty").setPakkage("com.google.protobuf").build());
+    List<List<MethodArgument>> methodSignatures =
+        Arrays.asList(
+            Arrays.asList(
+                MethodArgument.builder()
+                    .setName("name")
+                    .setType(TypeNode.STRING)
+                    .setField(Field.builder().setName("name").setType(TypeNode.STRING).build())
+                    .build()));
+    Method unaryMethod =
+        Method.builder()
+            .setName("delete")
+            .setMethodSignatures(methodSignatures)
+            .setInputType(inputType)
+            .setOutputType(outputType)
+            .build();
+    String results =
+        SampleCodeWriter.write(
+            SampleCodeHelperComposer.composeRpcMethodSampleCode(
+                unaryMethod, methodSignatures.get(0), clientType, resourceNames));
+    String expected =
+        "try (EchoClient echoClient = EchoClient.create()) {\n"
+            + "  String name = \"name3373707\";\n"
+            + "  echoClient.delete(name);\n"
+            + "}";
+    Assert.assertEquals(results, expected);
+  }
+}
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
index 1504b389b4..b238f27485 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden
@@ -130,7 +130,7 @@ public class IdentityClient implements BackgroundResource {
    *   String parent = "parent-995424086";
    *   String displayName = "display_name1615086568";
    *   String email = "email96619420";
-   *   User response = identityClient.createUser(parent, display_name, email);
+   *   User response = identityClient.createUser(parent, displayName, email);
    * }
    * }</pre>
    *
@@ -164,7 +164,7 @@ public class IdentityClient implements BackgroundResource {
    *   double heightFeet = -1032737338;
    *   User response =
    *       identityClient.createUser(
-   *           parent, display_name, email, age, nickname, enable_notifications, height_feet);
+   *           parent, displayName, email, age, nickname, enableNotifications, heightFeet);
    * }
    * }</pre>
    *
@@ -313,7 +313,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   UserName name = UserName.of("[USER]");
-   *   Empty response = identityClient.deleteUser(name);
+   *   identityClient.deleteUser(name);
    * }
    * }</pre>
    *
@@ -335,7 +335,7 @@ public class IdentityClient implements BackgroundResource {
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
    *   String name = "name3373707";
-   *   Empty response = identityClient.deleteUser(name);
+   *   identityClient.deleteUser(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 117937e0e4..82e033948b 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -498,7 +498,7 @@ public final UnaryCallable<UpdateFeedRequest, Feed> updateFeedCallable() {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
-   *   Empty response = assetServiceClient.deleteFeed(name);
+   *   assetServiceClient.deleteFeed(name);
    * }
    * }</pre>
    *
@@ -524,7 +524,7 @@ public final void deleteFeed(FeedName name) {
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String name = "name3373707";
-   *   Empty response = assetServiceClient.deleteFeed(name);
+   *   assetServiceClient.deleteFeed(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 61d8dd8a23..857ced6fd5 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -573,7 +573,7 @@ public final UnaryCallable<ListSinksRequest, ListSinksResponse> listSinksCallabl
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
-   *   LogSink response = configServiceV2Client.getSink(sink_name);
+   *   LogSink response = configServiceV2Client.getSink(sinkName);
    * }
    * }</pre>
    *
@@ -602,7 +602,7 @@ public final LogSink getSink(LogSinkName sinkName) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String sinkName = "sink_name-1391757129";
-   *   LogSink response = configServiceV2Client.getSink(sink_name);
+   *   LogSink response = configServiceV2Client.getSink(sinkName);
    * }
    * }</pre>
    *
@@ -864,7 +864,7 @@ public final UnaryCallable<CreateSinkRequest, LogSink> createSinkCallable() {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink);
+   *   LogSink response = configServiceV2Client.updateSink(sinkName, sink);
    * }
    * }</pre>
    *
@@ -902,7 +902,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String sinkName = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
-   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink);
+   *   LogSink response = configServiceV2Client.updateSink(sinkName, sink);
    * }
    * }</pre>
    *
@@ -938,7 +938,7 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink, update_mask);
+   *   LogSink response = configServiceV2Client.updateSink(sinkName, sink, updateMask);
    * }
    * }</pre>
    *
@@ -987,7 +987,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up
    *   String sinkName = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   LogSink response = configServiceV2Client.updateSink(sink_name, sink, update_mask);
+   *   LogSink response = configServiceV2Client.updateSink(sinkName, sink, updateMask);
    * }
    * }</pre>
    *
@@ -1068,7 +1068,7 @@ public final UnaryCallable<UpdateSinkRequest, LogSink> updateSinkCallable() {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogSinkName sinkName = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
-   *   Empty response = configServiceV2Client.deleteSink(sink_name);
+   *   configServiceV2Client.deleteSink(sinkName);
    * }
    * }</pre>
    *
@@ -1099,7 +1099,7 @@ public final void deleteSink(LogSinkName sinkName) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String sinkName = "sink_name-1391757129";
-   *   Empty response = configServiceV2Client.deleteSink(sink_name);
+   *   configServiceV2Client.deleteSink(sinkName);
    * }
    * }</pre>
    *
@@ -1594,7 +1594,7 @@ public final UnaryCallable<CreateExclusionRequest, LogExclusion> createExclusion
    *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, update_mask);
+   *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, updateMask);
    * }
    * }</pre>
    *
@@ -1636,7 +1636,7 @@ public final LogExclusion updateExclusion(
    *   String name = "name3373707";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask updateMask = FieldMask.newBuilder().build();
-   *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, update_mask);
+   *   LogExclusion response = configServiceV2Client.updateExclusion(name, exclusion, updateMask);
    * }
    * }</pre>
    *
@@ -1705,7 +1705,7 @@ public final UnaryCallable<UpdateExclusionRequest, LogExclusion> updateExclusion
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
-   *   Empty response = configServiceV2Client.deleteExclusion(name);
+   *   configServiceV2Client.deleteExclusion(name);
    * }
    * }</pre>
    *
@@ -1734,7 +1734,7 @@ public final void deleteExclusion(LogExclusionName name) {
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String name = "name3373707";
-   *   Empty response = configServiceV2Client.deleteExclusion(name);
+   *   configServiceV2Client.deleteExclusion(name);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index d79af31ed1..ab78be2c23 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -158,7 +158,7 @@ public LoggingServiceV2Stub getStub() {
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   LogName logName = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
-   *   Empty response = loggingServiceV2Client.deleteLog(log_name);
+   *   loggingServiceV2Client.deleteLog(logName);
    * }
    * }</pre>
    *
@@ -189,7 +189,7 @@ public final void deleteLog(LogName logName) {
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String logName = "log_name2013526694";
-   *   Empty response = loggingServiceV2Client.deleteLog(log_name);
+   *   loggingServiceV2Client.deleteLog(logName);
    * }
    * }</pre>
    *
@@ -255,7 +255,7 @@ public final UnaryCallable<DeleteLogRequest, Empty> deleteLogCallable() {
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
    *   WriteLogEntriesResponse response =
-   *       loggingServiceV2Client.writeLogEntries(log_name, resource, labels, entries);
+   *       loggingServiceV2Client.writeLogEntries(logName, resource, labels, entries);
    * }
    * }</pre>
    *
@@ -330,7 +330,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *   Map<String, String> labels = new HashMap<>();
    *   List<LogEntry> entries = new ArrayList<>();
    *   WriteLogEntriesResponse response =
-   *       loggingServiceV2Client.writeLogEntries(log_name, resource, labels, entries);
+   *       loggingServiceV2Client.writeLogEntries(logName, resource, labels, entries);
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 037f687fd1..5900ae89df 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -239,7 +239,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]");
-   *   LogMetric response = metricsServiceV2Client.getLogMetric(metric_name);
+   *   LogMetric response = metricsServiceV2Client.getLogMetric(metricName);
    * }
    * }</pre>
    *
@@ -264,7 +264,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) {
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String metricName = "metric_name-1737602118";
-   *   LogMetric response = metricsServiceV2Client.getLogMetric(metric_name);
+   *   LogMetric response = metricsServiceV2Client.getLogMetric(metricName);
    * }
    * }</pre>
    *
@@ -403,7 +403,7 @@ public final UnaryCallable<CreateLogMetricRequest, LogMetric> createLogMetricCal
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   LogMetric metric = LogMetric.newBuilder().build();
-   *   LogMetric response = metricsServiceV2Client.updateLogMetric(metric_name, metric);
+   *   LogMetric response = metricsServiceV2Client.updateLogMetric(metricName, metric);
    * }
    * }</pre>
    *
@@ -434,7 +434,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String metricName = "metric_name-1737602118";
    *   LogMetric metric = LogMetric.newBuilder().build();
-   *   LogMetric response = metricsServiceV2Client.updateLogMetric(metric_name, metric);
+   *   LogMetric response = metricsServiceV2Client.updateLogMetric(metricName, metric);
    * }
    * }</pre>
    *
@@ -490,7 +490,7 @@ public final UnaryCallable<UpdateLogMetricRequest, LogMetric> updateLogMetricCal
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   LogMetricName metricName = LogMetricName.of("[PROJECT]", "[METRIC]");
-   *   Empty response = metricsServiceV2Client.deleteLogMetric(metric_name);
+   *   metricsServiceV2Client.deleteLogMetric(metricName);
    * }
    * }</pre>
    *
@@ -515,7 +515,7 @@ public final void deleteLogMetric(LogMetricName metricName) {
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String metricName = "metric_name-1737602118";
-   *   Empty response = metricsServiceV2Client.deleteLogMetric(metric_name);
+   *   metricsServiceV2Client.deleteLogMetric(metricName);
    * }
    * }</pre>
    *

From 9453114895298a194715923593b1410035bc09c4 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 24 Nov 2020 17:05:27 -0800
Subject: [PATCH 11/13] add license

---
 .../composer/SampleCodeHelperComposerTest.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java
index da8d3d6221..4678fa8294 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposerTest.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package com.google.api.generator.gapic.composer;
 
 import static junit.framework.Assert.assertEquals;

From 6273a7350e9d780fe47ab10e462dc44bfa1fae06 Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 24 Nov 2020 17:11:34 -0800
Subject: [PATCH 12/13] remove to do add unit test

---
 .../api/generator/gapic/composer/SampleCodeHelperComposer.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 370cda4369..03996debea 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -82,7 +82,6 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
       List<MethodArgument> arguments,
       TypeNode clientType,
       Map<String, ResourceName> resourceNames) {
-    // TODO(summerji): Add unit tests.
     VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     // Assign each method arguments with its default value.
     Map<String, VariableExpr> methodArgVarExprMap = mapMethodArgumentsToVariableExprs(arguments);

From 6d9362af8b5f11f2938ddb3c1c8e3fd39469432d Mon Sep 17 00:00:00 2001
From: summerji <summerji@google.com>
Date: Tue, 24 Nov 2020 17:16:00 -0800
Subject: [PATCH 13/13] format the code

---
 .../api/generator/gapic/composer/SampleCodeHelperComposer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 03996debea..443dd68fff 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -85,7 +85,6 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
     VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     // Assign each method arguments with its default value.
     Map<String, VariableExpr> methodArgVarExprMap = mapMethodArgumentsToVariableExprs(arguments);
-    List<Expr> bodyExpr = new ArrayList<>();
     List<Expr> methodArgumentsAssignmentExpr =
         assignMethodArgumentsWithDefaultValues(arguments, methodArgVarExprMap, resourceNames);
     List<Expr> methodVarExprs =
@@ -114,6 +113,7 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
               methodVarExprs);
     }
 
+    List<Expr> bodyExpr = new ArrayList<>();
     bodyExpr.addAll(methodArgumentsAssignmentExpr);
     bodyExpr.add(responseExpr);