Flattern the createVariableExpr wrapper (#581)

summer-ji-eng · summer-ji-eng · commit 0ea6cb65e52b · 2020-12-08T23:50:27.000-08:00
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
@@ -44,18 +44,23 @@ public static String composeClassHeaderCredentialsSampleCode(
                 .setName("myCredentials")
                 .setPakkage(clientType.reference().pakkage())
                 .build());
-    VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType);
+    VariableExpr settingsVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setName(settingsName).setType(settingsType).build());
     MethodInvocationExpr newBuilderMethodExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(settingsType)
             .setMethodName("newBuilder")
             .build();
     TypeNode fixedCredentialProvideType =
         TypeNode.withReference(ConcreteReference.withClazz(FixedCredentialsProvider.class));
+    VariableExpr myCredentialVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setName("myCredentials").setType(myCredentialsType).build());
     MethodInvocationExpr credentialArgExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(fixedCredentialProvideType)
-            .setArguments(createVariableExpr("myCredentials", myCredentialsType))
+            .setArguments(myCredentialVarExpr)
             .setMethodName("create")
             .build();
     MethodInvocationExpr credentialsMethodExpr =
@@ -78,7 +83,9 @@ public static String composeClassHeaderCredentialsSampleCode(
 
     // Initialized client with create() method.
     // e.g. EchoClient echoClient = EchoClient.create(echoSettings);
-    VariableExpr clientVarExpr = createVariableExpr(clientName, clientType);
+    VariableExpr clientVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setName(clientName).setType(clientType).build());
     MethodInvocationExpr createMethodExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(clientType)
@@ -109,16 +116,21 @@ public static String composeClassHeaderEndpointSampleCode(
                 .setName("myEndpoint")
                 .setPakkage(clientType.reference().pakkage())
                 .build());
-    VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType);
+    VariableExpr settingsVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setName(settingsName).setType(settingsType).build());
     MethodInvocationExpr newBuilderMethodExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(settingsType)
             .setMethodName("newBuilder")
             .build();
+    VariableExpr myEndpointVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setName("myEndpoint").setType(myEndpointType).build());
     MethodInvocationExpr credentialsMethodExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(newBuilderMethodExpr)
-            .setArguments(createVariableExpr("myEndpoint", myEndpointType))
+            .setArguments(myEndpointVarExpr)
             .setMethodName("setEndpoint")
             .build();
     MethodInvocationExpr buildMethodExpr =
@@ -136,7 +148,9 @@ public static String composeClassHeaderEndpointSampleCode(
 
     // Initialize client with create() method.
     // e.g. EchoClient echoClient = EchoClient.create(echoSettings);
-    VariableExpr clientVarExpr = createVariableExpr(clientName, clientType);
+    VariableExpr clientVarExpr =
+        VariableExpr.withVariable(
+            Variable.builder().setName(clientName).setType(clientType).build());
     MethodInvocationExpr createMethodExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(clientType)
@@ -155,11 +169,4 @@ public static String composeClassHeaderEndpointSampleCode(
             ExprStatement.withExpr(initSettingsVarExpr),
             ExprStatement.withExpr(initClientVarExpr)));
   }
-
-  // ======================================== Helpers ==========================================//
-
-  private static VariableExpr createVariableExpr(String variableName, TypeNode type) {
-    return VariableExpr.withVariable(
-        Variable.builder().setName(variableName).setType(type).build());
-  }
 }
