Skip to content

[samplecode][Prepare][2/2]Flattern the createVariableExpr wrapper #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
summer-ji-eng merged 1 commit into from
Dec 3, 2020
Merged

[samplecode][Prepare][2/2]Flattern the createVariableExpr wrapper #581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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)
Expand Down Expand Up @@ -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 =
Expand All @@ -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)
Expand All @@ -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());
}
}