Skip to content

Fix two NPEs and add test case #60

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
andimarek merged 2 commits into from
Jan 2, 2016
Merged

Fix two NPEs and add test case #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8e6e43
Fix npe when enum name is invalid.
xuzb Dec 30, 2015
67981cb
Fix npe when input object field has a wrong name.
xuzb Dec 30, 2015
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
1 change: 1 addition & 0 deletions src/main/java/graphql/schema/GraphQLEnumType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public Object coerceLiteral(Object input) {
if (!(input instanceof EnumValue)) return null;
EnumValue enumValue = (EnumValue) input;
GraphQLEnumValueDefinition enumValueDefinition = valueDefinitionMap.get(enumValue.getName());
if (enumValueDefinition == null) return null;
if (enumValueDefinition.getValue() != null) return enumValueDefinition.getValue();
return enumValueDefinition.getValue();
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/graphql/validation/TraversalContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ private void enterImpl(ObjectField objectField) {
GraphQLInputType inputType = null;
if (objectType instanceof GraphQLInputObjectType) {
GraphQLInputObjectField inputField = ((GraphQLInputObjectType) objectType).getField(objectField.getName());
inputType = inputField.getType();
if (inputField != null)
inputType = inputField.getType();
}
addInputType(inputType);
}
Expand Down
9 changes: 8 additions & 1 deletion src/test/groovy/graphql/validation/ValidationUtilTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,20 @@ class ValidationUtilTest extends Specification {
validationUtil.isValidLiteralValue(new EnumValue("PLUTO"), enumType)
}

def "invalid enum"() {
def "invalid enum value"() {
given:
def enumType = GraphQLEnumType.newEnum().name("enumType").value("PLUTO").build()
expect:
!validationUtil.isValidLiteralValue(new StringValue("MARS"), enumType)
}

def "invalid enum name"() {
given:
def enumType = GraphQLEnumType.newEnum().name("enumType").value("PLUTO").build()
expect:
!validationUtil.isValidLiteralValue(new EnumValue("MARS"), enumType)
}

def "a valid ObjectValue"() {
given:
def inputObjectType = GraphQLInputObjectType.newInputObject()
Expand Down