Skip to content

fix: better message null checks in Parser #533

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 21, 2020
Merged

fix: better message null checks in Parser #533

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb8f2f2
fix: align resname ctors with superclass variants
miraleung Nov 19, 2020
59d8338
Merge branch 'master' of github.com:googleapis/gapic-generator-java i…
miraleung Nov 19, 2020
7336db7
fix: avoid type collisions - refactor {Concrete,Vapor}Ref into AstNodes
miraleung Nov 20, 2020
2f7c857
fix: better message null checks in Parser
miraleung Nov 20, 2020
fab6fe7
Merge branch 'master' into ag/2
miraleung Nov 21, 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
9 changes: 5 additions & 4 deletions src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,11 @@ static List<Method> parseMethods(
}
}

Message inputMessage = messageTypes.get(inputType.reference().name());
Preconditions.checkNotNull(
inputMessage, String.format("No message found for %s", inputType.reference().name()));
Optional<List<String>> httpBindingsOpt =
HttpRuleParser.parseHttpBindings(
protoMethod, messageTypes.get(inputType.reference().name()), messageTypes);
HttpRuleParser.parseHttpBindings(protoMethod, inputMessage, messageTypes);
List<String> httpBindings =
httpBindingsOpt.isPresent() ? httpBindingsOpt.get() : Collections.emptyList();

Expand All @@ -377,8 +379,7 @@ static List<Method> parseMethods(
.setIsPaged(parseIsPaged(protoMethod, messageTypes))
.build());

// Any input type that has a resource reference will need a resource name helper class.
Message inputMessage = messageTypes.get(inputType.reference().name());
// Any input type that has a resource reference will need a resource name helper calss.
for (Field field : inputMessage.fields()) {
if (field.hasResourceReference()) {
String resourceTypeString = field.resourceReference().resourceTypeString();
Expand Down