Skip to content

[ggj][engx] fix: pull ServiceClient setter builder into separate method #486

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
miraleung merged 2 commits into from
Nov 13, 2020
Merged

[ggj][engx] fix: pull ServiceClient setter builder into separate method #486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9f4f6
fix: pull ServiceClient setter builder into separate method
miraleung Nov 13, 2020
d58acc1
Merge branch 'master' into ggj2/g0
miraleung Nov 13, 2020
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
104 changes: 57 additions & 47 deletions src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ public class ServiceClientClassComposer implements ClassComposer {

private static final Reference LIST_REFERENCE = ConcreteReference.withClazz(List.class);
private static final Reference MAP_REFERENCE = ConcreteReference.withClazz(Map.class);
private static final TypeNode OBJECTS_TYPE =
TypeNode.withReference(ConcreteReference.withClazz(Objects.class));

private enum CallableMethodKind {
REGULAR,
Expand Down Expand Up @@ -1300,54 +1302,8 @@ static Expr createRequestBuilderExpr(
.setMethodName("newBuilder")
.setStaticReferenceType(methodInputType)
.build();
// TODO(miraleung): Handle nested arguments and descending setters here.
for (MethodArgument argument : signature) {
String argumentName = JavaStyle.toLowerCamelCase(argument.name());
TypeNode argumentType = argument.type();
String setterMethodVariantPattern = "set%s";
if (TypeNode.isReferenceType(argumentType)) {
if (LIST_REFERENCE.isSupertypeOrEquals(argumentType.reference())) {
setterMethodVariantPattern = "addAll%s";
} else if (MAP_REFERENCE.isSupertypeOrEquals(argumentType.reference())) {
setterMethodVariantPattern = "putAll%s";
}
}
String setterMethodName =
String.format(setterMethodVariantPattern, JavaStyle.toUpperCamelCase(argumentName));

Expr argVarExpr =
VariableExpr.withVariable(
Variable.builder().setName(argumentName).setType(argumentType).build());

if (argument.isResourceNameHelper()) {
MethodInvocationExpr isNullCheckExpr =
MethodInvocationExpr.builder()
.setStaticReferenceType(types.get("Objects"))
.setMethodName("isNull")
.setArguments(Arrays.asList(argVarExpr))
.setReturnType(TypeNode.BOOLEAN)
.build();
Expr nullExpr = ValueExpr.withValue(NullObjectValue.create());
MethodInvocationExpr toStringExpr =
MethodInvocationExpr.builder()
.setExprReferenceExpr(argVarExpr)
.setMethodName("toString")
.setReturnType(TypeNode.STRING)
.build();
argVarExpr =
TernaryExpr.builder()
.setConditionExpr(isNullCheckExpr)
.setThenExpr(nullExpr)
.setElseExpr(toStringExpr)
.build();
}

newBuilderExpr =
MethodInvocationExpr.builder()
.setMethodName(setterMethodName)
.setArguments(Arrays.asList(argVarExpr))
.setExprReferenceExpr(newBuilderExpr)
.build();
newBuilderExpr = buildNestedSetterInvocationExpr(argument, newBuilderExpr);
}

MethodInvocationExpr builderExpr =
Expand All @@ -1360,6 +1316,60 @@ static Expr createRequestBuilderExpr(
return builderExpr;
}

@VisibleForTesting
static MethodInvocationExpr buildNestedSetterInvocationExpr(
MethodArgument argument, Expr referenceExpr) {
String argumentName = JavaStyle.toLowerCamelCase(argument.name());
TypeNode argumentType = argument.type();

Expr argVarExpr =
VariableExpr.withVariable(
Variable.builder().setName(argumentName).setType(argumentType).build());
if (argument.isResourceNameHelper()) {
MethodInvocationExpr isNullCheckExpr =
MethodInvocationExpr.builder()
.setStaticReferenceType(OBJECTS_TYPE)
.setMethodName("isNull")
.setArguments(Arrays.asList(argVarExpr))
.setReturnType(TypeNode.BOOLEAN)
.build();
Expr nullExpr = ValueExpr.withValue(NullObjectValue.create());
MethodInvocationExpr toStringExpr =
MethodInvocationExpr.builder()
.setExprReferenceExpr(argVarExpr)
.setMethodName("toString")
.setReturnType(TypeNode.STRING)
.build();
argVarExpr =
TernaryExpr.builder()
.setConditionExpr(isNullCheckExpr)
.setThenExpr(nullExpr)
.setElseExpr(toStringExpr)
.build();
}

String setterMethodName =
String.format(
typeToSetterMethodName(argumentType), JavaStyle.toUpperCamelCase(argumentName));
return MethodInvocationExpr.builder()
.setExprReferenceExpr(referenceExpr)
.setMethodName(setterMethodName)
.setArguments(argVarExpr)
.build();
}

private static String typeToSetterMethodName(TypeNode type) {
String setterMethodVariantPattern = "set%s";
if (TypeNode.isReferenceType(type)) {
if (LIST_REFERENCE.isSupertypeOrEquals(type.reference())) {
setterMethodVariantPattern = "addAll%s";
} else if (MAP_REFERENCE.isSupertypeOrEquals(type.reference())) {
setterMethodVariantPattern = "putAll%s";
}
}
return setterMethodVariantPattern;
}

private static Map<String, TypeNode> createTypes(
Service service, Map<String, Message> messageTypes) {
Map<String, TypeNode> types = new HashMap<>();
Expand Down