Visitar URL original
[ggj][ast][engx] fix: validate non-null elements for MethodDefinition by miraleung · Pull Request #463 · googleapis/sdk-platform-java · GitHub
Skip to content
This repository was archived by the owner on Oct 29, 2026. It is now read-only.

[ggj][ast][engx] fix: validate non-null elements for MethodDefinition #463

Merged
miraleung merged 12 commits into from
Nov 7, 2020
Merged

[ggj][ast][engx] fix: validate non-null elements for MethodDefinition #463

Changes from all commits
Commits
Show all changes
12 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
fdb7160
fix: validate non-null elements for ConcreteReference
miraleung Nov 7, 2020
96eca4b
fix: validate non-null elements for ForStatement
miraleung Nov 7, 2020
10924ee
fix: validate non-null elements for GeneralForStatement
miraleung Nov 7, 2020
8493707
fix: validate non-null elements for MethodDefinition
miraleung Nov 7, 2020
652e495
Merge branch 'master' into gp/g10
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
18 changes: 17 additions & 1 deletion src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,14 @@ public Builder setReturnExpr(Expr expr) {
abstract Builder setMethodIdentifier(IdentifierNode methodIdentifier);

// Private accessors.

abstract String name();

abstract ImmutableList<CommentStatement> headerCommentStatements();

abstract ImmutableList<AnnotationNode> annotations();

abstract ImmutableList<TypeNode> throwsExceptions();

abstract TypeNode returnType();

abstract boolean isOverride();
Expand All @@ -195,6 +198,8 @@ public Builder setReturnExpr(Expr expr) {
abstract ImmutableList<String> returnTemplateNames();

public MethodDefinition build() {
performNullChecks();

// Handle templates.
setTemplateIdentifiers(
templateNames().stream()
Expand Down Expand Up @@ -329,5 +334,16 @@ public MethodDefinition build() {

return method;
}

void performNullChecks() {
String contextInfo = String.format("method definition of %s", name());
NodeValidator.checkNoNullElements(headerCommentStatements(), "header comments", contextInfo);
NodeValidator.checkNoNullElements(annotations(), "annotations", contextInfo);
NodeValidator.checkNoNullElements(throwsExceptions(), "declared exceptions", contextInfo);
NodeValidator.checkNoNullElements(body(), "body", contextInfo);
NodeValidator.checkNoNullElements(templateNames(), "template names", contextInfo);
NodeValidator.checkNoNullElements(
returnTemplateNames(), "return template names", contextInfo);
}
}
}