Skip to content

[ggj][ast][engx] fix: validate non-null elements for ClassDefinition #459

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

[ggj][ast][engx] fix: validate non-null elements for ClassDefinition #459

Changes from all commits
Commits
Show all changes
8 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
1dac120
fix: validate non-null elements for AnonymousClassExpr
miraleung Nov 7, 2020
004d0f0
fix: validate non-null elements for BlockStatement
miraleung Nov 7, 2020
191e93c
fix: validate non-null elements for ClassDefinition
miraleung Nov 7, 2020
06288f8
Merge branch 'master' into gp/g6
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
15 changes: 15 additions & 0 deletions src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public ClassDefinition build() {
setClassIdentifier(classIdentifier);

ClassDefinition classDef = autoBuild();
performNullChecks(classDef);

// Only nested classes can forego having a package.
if (!classDef.isNested()) {
Expand Down Expand Up @@ -201,5 +202,19 @@ public ClassDefinition build() {

return classDef;
}

void performNullChecks(ClassDefinition classDef) {
String contextInfo = String.format("class definition of %s", name());
NodeValidator.checkNoNullElements(
classDef.headerCommentStatements(), "header comments", contextInfo);
NodeValidator.checkNoNullElements(classDef.annotations(), "annotations", contextInfo);

NodeValidator.checkNoNullElements(
classDef.implementsTypes(), "implemented types", contextInfo);
NodeValidator.checkNoNullElements(classDef.statements(), "statements", contextInfo);

NodeValidator.checkNoNullElements(classDef.methods(), "methods", contextInfo);
NodeValidator.checkNoNullElements(classDef.nestedClasses(), "nested classes", contextInfo);
}
}
}