Skip to content

[ggj][ast][engx] fix: validate non-null elements for IfStatement #456

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 5 commits into from
Nov 7, 2020
Merged

[ggj][ast][engx] fix: validate non-null elements for IfStatement #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0725750
fix: swap assertEquals args in JavaWriterVisitorTest to match (expect…
miraleung Nov 7, 2020
67f3a15
fix: swap assertEquals args in ImportWriterVisitorTest to match (expe…
miraleung Nov 7, 2020
1e1a86b
fix: add node validator to refactor/centralize null element checks
miraleung Nov 7, 2020
115e9fb
fix: validate non-null elements for IfStatement
miraleung Nov 7, 2020
d2584b2
Merge branch 'master' into gp/g3
miraleung Nov 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
4 changes: 4 additions & 0 deletions src/main/java/com/google/api/generator/engine/ast/IfStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ public Builder addElseIf(Expr conditionExpr, List<Statement> body) {

public IfStatement build() {
IfStatement ifStatement = autoBuild();
NodeValidator.checkNoNullElements(ifStatement.body(), "body", "if-statement");
NodeValidator.checkNoNullElements(ifStatement.elseIfs(), "else-ifs", "if-statement");
NodeValidator.checkNoNullElements(ifStatement.elseBody(), "else-body", "if-statement");

Preconditions.checkState(
ifStatement.conditionExpr().type().equals(TypeNode.BOOLEAN),
"If-condition must be a boolean-typed expression");
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/google/api/generator/engine/ast/NodeValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import com.google.common.base.Preconditions;
import java.util.Collection;
import java.util.Map;
import java.util.Objects;

public class NodeValidator {
Expand All @@ -26,4 +27,11 @@ public static void checkNoNullElements(
String.format(
"Found null expression in %s %s for %s", fieldTypeName, collection, nodeContextInfo));
}

public static void checkNoNullElements(
Map<?, ?> map, String fieldTypeName, String nodeContextInfo) {
checkNoNullElements(map.keySet(), String.format("key of %s", fieldTypeName), nodeContextInfo);
checkNoNullElements(
map.values(), String.format("values of %s", fieldTypeName), nodeContextInfo);
}
}