Skip to content
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.

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

[operators][integrate](1/2)feat: Add equals() method in ResourceName #358

Merged
merged 13 commits into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.api.core.BetaApi;
import com.google.api.generator.engine.ast.AnnotationNode;
import com.google.api.generator.engine.ast.AssignmentExpr;
import com.google.api.generator.engine.ast.CastExpr;
import com.google.api.generator.engine.ast.ClassDefinition;
import com.google.api.generator.engine.ast.CommentStatement;
import com.google.api.generator.engine.ast.ConcreteReference;
Expand All @@ -30,7 +31,9 @@
import com.google.api.generator.engine.ast.MethodInvocationExpr;
import com.google.api.generator.engine.ast.NewObjectExpr;
import com.google.api.generator.engine.ast.NullObjectValue;
import com.google.api.generator.engine.ast.PrimitiveValue;
import com.google.api.generator.engine.ast.Reference;
import com.google.api.generator.engine.ast.RelationalOperationExpr;
import com.google.api.generator.engine.ast.ReturnExpr;
import com.google.api.generator.engine.ast.ScopeNode;
import com.google.api.generator.engine.ast.Statement;
Expand All @@ -57,6 +60,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -269,6 +273,7 @@ private static List<MethodDefinition> createClassMethods(
createFieldValueGetterMethods(resourceName, patternTokenVarExprs, tokenHierarchies, types));
javaMethods.add(
createToStringMethod(templateFinalVarExprs, patternTokenVarExprs, tokenHierarchies));
javaMethods.add(createEqualsMethod(resourceName, tokenHierarchies, types));
return javaMethods;
}

Expand Down Expand Up @@ -1140,6 +1145,113 @@ private static MethodDefinition createToStringMethod(
.build();
}

private static MethodDefinition createEqualsMethod(
ResourceName resourceName, List<List<String>> tokenHierarchies, Map<String, TypeNode> types) {
Variable oVariable = Variable.builder().setType(TypeNode.OBJECT).setName("o").build();
VariableExpr argVarExprDecl =
summer-ji-eng marked this conversation as resolved.
Show resolved Hide resolved
VariableExpr.builder().setIsDecl(true).setVariable(oVariable).build();
VariableExpr argVarExprNotDecl =
VariableExpr.builder().setIsDecl(false).setVariable(oVariable).build();
TypeNode thisClassType = types.get(getThisClassName(resourceName));
ValueExpr thisValueExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType));
ValueExpr trueValueExpr =
ValueExpr.withValue(
PrimitiveValue.builder().setType(TypeNode.BOOLEAN).setValue("true").build());
ValueExpr falseValueExpr =
ValueExpr.withValue(
PrimitiveValue.builder().setType(TypeNode.BOOLEAN).setValue("false").build());

ReturnExpr returnTrueExpr = ReturnExpr.withExpr(trueValueExpr);
summer-ji-eng marked this conversation as resolved.
Show resolved Hide resolved
RelationalOperationExpr oEqualsThisExpr =
RelationalOperationExpr.equalToWithExprs(argVarExprNotDecl, thisValueExpr);
RelationalOperationExpr oNotEqualsNullExpr =
RelationalOperationExpr.notEqualToWithExprs(
argVarExprNotDecl, ValueExpr.withValue(NullObjectValue.create()));
MethodInvocationExpr getClassMethodInvocationExpr =
MethodInvocationExpr.builder().setMethodName("getClass").build();
RelationalOperationExpr getClassEqualsExpr =
RelationalOperationExpr.equalToWithExprs(
getClassMethodInvocationExpr,
getClassMethodInvocationExpr
.toBuilder()
.setExprReferenceExpr(argVarExprNotDecl)
.build());
LogicalOperationExpr orLogicalExpr =
LogicalOperationExpr.logicalOrWithExprs(oNotEqualsNullExpr, getClassEqualsExpr);

Variable thatVariable = Variable.builder().setName("that").setType(thisClassType).build();
VariableExpr thatVariableExpr =
VariableExpr.builder().setIsDecl(true).setVariable(thatVariable).build();
summer-ji-eng marked this conversation as resolved.
Show resolved Hide resolved
CastExpr oCastExpr =
CastExpr.builder().setExpr(argVarExprNotDecl).setType(thisClassType).build();
AssignmentExpr thatAssignmentExpr =
AssignmentExpr.builder().setVariableExpr(thatVariableExpr).setValueExpr(oCastExpr).build();

thatVariableExpr = thatVariableExpr.toBuilder().setIsDecl(false).build();
Set<String> tokenSet = getTokenSet(tokenHierarchies);
Iterator<String> itToken = tokenSet.iterator();
Expr curTokenExpr =
createObjectsEqualsForTokenMethodEpxr(
thisValueExpr,
thatVariableExpr,
Variable.builder()
.setType(TypeNode.STRING)
.setName(JavaStyle.toLowerCamelCase(itToken.next()))
.build());
while (itToken.hasNext()) {
Expr nextTokenExpr =
createObjectsEqualsForTokenMethodEpxr(
thisValueExpr,
thatVariableExpr,
Variable.builder()
.setType(TypeNode.STRING)
.setName(JavaStyle.toLowerCamelCase(itToken.next()))
.build());
curTokenExpr = LogicalOperationExpr.logicalAndWithExprs(curTokenExpr, nextTokenExpr);
}
ReturnExpr secondIfReturnExpr = ReturnExpr.withExpr(curTokenExpr);

// if (o == this) { return true;}
IfStatement firstIfStatement =
IfStatement.builder()
.setConditionExpr(oEqualsThisExpr)
.setBody(Arrays.asList(ExprStatement.withExpr(returnTrueExpr)))
.build();
// if (o != null || getClass() == o.getClass()) { FoobarName that = ((FoobarName) o); return ..}
IfStatement secondIfStatement =
IfStatement.builder()
.setConditionExpr(orLogicalExpr)
.setBody(
Arrays.asList(
ExprStatement.withExpr(thatAssignmentExpr),
ExprStatement.withExpr(secondIfReturnExpr)))
.build();

return MethodDefinition.builder()
.setIsOverride(true)
.setScope(ScopeNode.PUBLIC)
.setArguments(argVarExprDecl)
.setReturnType(TypeNode.BOOLEAN)
.setName("equals")
.setReturnExpr(falseValueExpr)
.setBody(Arrays.asList(firstIfStatement, secondIfStatement))
.build();
}

private static MethodInvocationExpr createObjectsEqualsForTokenMethodEpxr(
Expr thisExpr, Expr thatExpr, Variable tokenVar) {
VariableExpr varThisExpr =
VariableExpr.builder().setVariable(tokenVar).setExprReferenceExpr(thisExpr).build();
VariableExpr varThatExpr =
VariableExpr.builder().setVariable(tokenVar).setExprReferenceExpr(thatExpr).build();
return MethodInvocationExpr.builder()
.setStaticReferenceType(STATIC_TYPES.get("Objects"))
.setMethodName("equals")
.setArguments(Arrays.asList(varThisExpr, varThatExpr))
.setReturnType(TypeNode.BOOLEAN)
.build();
}

private static List<ClassDefinition> createNestedBuilderClasses(
ResourceName resourceName,
List<List<String>> tokenHierarchies,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,21 @@ public class FoobarName implements ResourceName {
return !Objects.isNull(fixedValue) ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
}

@Override
public boolean equals(Object o) {
if (o == this) {
return true;
}
if (o != null || getClass() == o.getClass()) {
FoobarName that = ((FoobarName) o);
return Objects.equals(this.project, that.project)
&& Objects.equals(this.foobar, that.foobar)
&& Objects.equals(this.variant, that.variant)
&& Objects.equals(this.barFoo, that.barFoo);
}
return false;
}

/** Builder for projects/{project}/foobars/{foobar}. */
public static class Builder {
private String project;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@ public class SessionName implements ResourceName {
return SESSION.instantiate("session", session);
}

@Override
public boolean equals(Object o) {
if (o == this) {
return true;
}
if (o != null || getClass() == o.getClass()) {
SessionName that = ((SessionName) o);
return Objects.equals(this.session, that.session);
}
return false;
}

/** Builder for sessions/{session}. */
public static class Builder {
private String session;
Expand Down