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](2/2)feat: Add HashCode in resource name #368

Merged
merged 29 commits into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b730569
Add Equals method in ResourceName
summer-ji-eng Oct 1, 2020
d82d56b
correct function position
summer-ji-eng Oct 1, 2020
8d47696
Merge branch 'master' into resource_name_equals
summer-ji-eng Oct 1, 2020
7859d17
Add equals method in SessionName.golden
summer-ji-eng Oct 1, 2020
f15f2a1
Add comments in method
summer-ji-eng Oct 2, 2020
7397f11
Merge branch 'master' into resource_name_equals
summer-ji-eng Oct 2, 2020
b1d92c4
feat: Add HashCode in resource name
summer-ji-eng Oct 6, 2020
7bb9fef
Merge branch 'master' into resource_name_hashcode
summer-ji-eng Oct 6, 2020
9403468
Merge branch 'master' into resource_name_hashcode
summer-ji-eng Oct 6, 2020
dc5ae89
remove unused arg
summer-ji-eng Oct 6, 2020
ee58b82
Merge branch 'resource_name_hashcode' of github.com:googleapis/gapic-…
summer-ji-eng Oct 6, 2020
eb94e77
Merge branch 'master' into resource_name_hashcode
summer-ji-eng Oct 7, 2020
443ed6f
Merge branch 'master' into resource_name_hashcode
summer-ji-eng Oct 7, 2020
05d9c9e
[ggj][infra][5/5] support goldens updates for composer tests (#348)
xiaozhenliu-gg5 Oct 2, 2020
95cd0f5
[ggj][engx] fix: use a VM for CircleCI builds (#367)
miraleung Oct 5, 2020
8ba5c8e
fix: use imperative bazel rule names (#361)
miraleung Oct 6, 2020
4eaef97
[ggj][bazel][goldens] fix: refactor and fix bazel golden_update rules…
miraleung Oct 6, 2020
4526eb4
feat: Add HashCode in resource name
summer-ji-eng Oct 6, 2020
79e98a6
remove unused arg
summer-ji-eng Oct 6, 2020
82bc8e6
fix: add final keyword check on assignment expr (#366)
summer-ji-eng Oct 6, 2020
218c7ff
fix: add final keyword checking in post increment operation expr (#365)
summer-ji-eng Oct 6, 2020
60054ea
Merge branch 'resource_name_hashcode' of github.com:googleapis/gapic-…
summer-ji-eng Oct 7, 2020
9dd01bc
remove files
summer-ji-eng Oct 7, 2020
d6d3e36
Merge branch 'master' into resource_name_hashcode
summer-ji-eng Oct 7, 2020
aaf0d95
rebase
summer-ji-eng Oct 7, 2020
d5c627a
Merge branch 'master' into resource_name_hashcode
summer-ji-eng Oct 7, 2020
ca17c43
Merge branch 'resource_name_hashcode' of github.com:googleapis/gapic-…
summer-ji-eng Oct 7, 2020
0f5681a
fix resolve
summer-ji-eng Oct 7, 2020
758e898
revert readme
summer-ji-eng Oct 7, 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
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.AssignmentOperationExpr;
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,6 +31,7 @@
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.ReturnExpr;
import com.google.api.generator.engine.ast.ScopeNode;
Expand Down Expand Up @@ -269,6 +271,7 @@ private static List<MethodDefinition> createClassMethods(
createFieldValueGetterMethods(resourceName, patternTokenVarExprs, tokenHierarchies, types));
javaMethods.add(
createToStringMethod(templateFinalVarExprs, patternTokenVarExprs, tokenHierarchies));
javaMethods.add(createHashCodeMethod(tokenHierarchies));
return javaMethods;
}

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

private static MethodDefinition createHashCodeMethod(List<List<String>> tokenHierarchies) {
List<Statement> asgmtBody = new ArrayList<>();
// code: int h = 1;
Variable hVar = Variable.builder().setType(TypeNode.INT).setName("h").build();
VariableExpr hVarExpr = VariableExpr.builder().setVariable(hVar).build();
ValueExpr hValueExpr =
ValueExpr.withValue(PrimitiveValue.builder().setType(TypeNode.INT).setValue("1").build());
AssignmentExpr hAssignmentExpr =
AssignmentExpr.builder()
.setVariableExpr(hVarExpr.toBuilder().setIsDecl(true).build())
.setValueExpr(hValueExpr)
.build();
asgmtBody.add(ExprStatement.withExpr(hAssignmentExpr));
// code: h *= 1000003;
// code: h ^= Objects.hashCode(...);
ValueExpr numValueExpr =
ValueExpr.withValue(
PrimitiveValue.builder().setType(TypeNode.INT).setValue("1000003").build());
AssignmentOperationExpr multiplyAsgmtOpExpr =
AssignmentOperationExpr.multiplyAssignmentWithExprs(hVarExpr, numValueExpr);
// If it has variants, add the multiply and xor assignment operation exprs for fixedValue.
boolean hasVariants = tokenHierarchies.size() > 1;
if (hasVariants) {
VariableExpr fixedValueVarExpr = FIXED_CLASS_VARS.get("fixedValue");
asgmtBody.add(ExprStatement.withExpr(multiplyAsgmtOpExpr));
asgmtBody.add(
ExprStatement.withExpr(
AssignmentOperationExpr.xorAssignmentWithExprs(
hVarExpr, createObjectsHashCodeForVarMethod(fixedValueVarExpr))));
}
// Add the multiply and xor assignment operation exprs for tokens.
Set<String> tokenSet = getTokenSet(tokenHierarchies);
tokenSet.stream()
.forEach(
token -> {
VariableExpr tokenVarExpr =
VariableExpr.withVariable(
Variable.builder()
.setName(JavaStyle.toLowerCamelCase(token))
.setType(TypeNode.STRING)
.build());
asgmtBody.add(ExprStatement.withExpr(multiplyAsgmtOpExpr));
asgmtBody.add(
ExprStatement.withExpr(
AssignmentOperationExpr.xorAssignmentWithExprs(
hVarExpr, createObjectsHashCodeForVarMethod(tokenVarExpr))));
});

return MethodDefinition.builder()
.setIsOverride(true)
.setScope(ScopeNode.PUBLIC)
.setReturnType(TypeNode.INT)
.setName("hashCode")
.setBody(asgmtBody)
.setReturnExpr(hVarExpr)
.build();
}

private static MethodInvocationExpr createObjectsHashCodeForVarMethod(VariableExpr varExpr) {
// code: Objects.hashCode(varExpr)
return MethodInvocationExpr.builder()
.setMethodName("hashCode")
.setStaticReferenceType(STATIC_TYPES.get("Objects"))
.setArguments(varExpr)
.setReturnType(TypeNode.INT)
.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,22 @@ public class FoobarName implements ResourceName {
return !Objects.isNull(fixedValue) ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
}

@Override
public int hashCode() {
int h = 1;
h *= 1000003;
h ^= Objects.hashCode(fixedValue);
h *= 1000003;
h ^= Objects.hashCode(project);
h *= 1000003;
h ^= Objects.hashCode(foobar);
h *= 1000003;
h ^= Objects.hashCode(variant);
h *= 1000003;
h ^= Objects.hashCode(barFoo);
return h;
}

/** 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,14 @@ public class SessionName implements ResourceName {
return SESSION.instantiate("session", session);
}

@Override
public int hashCode() {
int h = 1;
h *= 1000003;
h ^= Objects.hashCode(session);
return h;
}

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