[ggj][ast][engx] fix: validate non-null elements for BlockStatement (#458)

miraleung · web-flow · commit 162c6cb2a437 · 2020-11-06T20:44:47.000-08:00
* fix: swap assertEquals args in JavaWriterVisitorTest to match (expected, actusl) order

* fix: swap assertEquals args in ImportWriterVisitorTest to match (expected, actusl) order

* fix: add node validator to refactor/centralize null element checks

* fix: validate non-null elements for IfStatement

* fix: validate non-null elements for AnonymousClassExpr

* fix: validate non-null elements for BlockStatement
diff --git a/src/main/java/com/google/api/generator/engine/ast/BlockStatement.java b/src/main/java/com/google/api/generator/engine/ast/BlockStatement.java
@@ -40,6 +40,12 @@ public abstract static class Builder {
 
     public abstract Builder setIsStatic(boolean isStatic);
 
-    public abstract BlockStatement build();
+    abstract BlockStatement autoBuild();
+
+    public BlockStatement build() {
+      BlockStatement blockStatement = autoBuild();
+      NodeValidator.checkNoNullElements(blockStatement.body(), "body", "block statement");
+      return autoBuild();
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ public abstract static class Builder {`
`40`	`40`
`41`	`41`	`public abstract Builder setIsStatic(boolean isStatic);`
`42`	`42`
`43`		`- public abstract BlockStatement build();`
	`43`	`+ abstract BlockStatement autoBuild();`
	`44`	`+`
	`45`	`+ public BlockStatement build() {`
	`46`	`+ BlockStatement blockStatement = autoBuild();`
	`47`	`+ NodeValidator.checkNoNullElements(blockStatement.body(), "body", "block statement");`
	`48`	`+ return autoBuild();`
	`49`	`+ }`
`44`	`50`	`}`
`45`	`51`	`}`