Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/main/antlr/Graphql.g4
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ IntValue |
FloatValue |
StringValue |
BooleanValue |
NullValue |
enumValue |
arrayValue |
objectValue;
Expand All @@ -76,6 +77,7 @@ IntValue |
FloatValue |
StringValue |
BooleanValue |
NullValue |
enumValue |
arrayValueWithVariable |
objectValueWithVariable;
Expand Down Expand Up @@ -176,6 +178,8 @@ directiveLocations '|' directiveLocation

BooleanValue: 'true' | 'false';

NullValue: 'null';

FRAGMENT: 'fragment';
QUERY: 'query';
MUTATION: 'mutation';
Expand Down
71 changes: 59 additions & 12 deletions src/main/java/graphql/execution/ValuesResolver.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,43 @@


import graphql.GraphQLException;
import graphql.language.*;
import graphql.schema.*;

import java.util.*;
import graphql.language.Argument;
import graphql.language.ArrayValue;
import graphql.language.NullValue;
import graphql.language.ObjectField;
import graphql.language.ObjectValue;
import graphql.language.Value;
import graphql.language.VariableDefinition;
import graphql.language.VariableReference;
import graphql.schema.GraphQLArgument;
import graphql.schema.GraphQLEnumType;
import graphql.schema.GraphQLInputObjectField;
import graphql.schema.GraphQLInputObjectType;
import graphql.schema.GraphQLList;
import graphql.schema.GraphQLNonNull;
import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLSchema;
import graphql.schema.GraphQLType;

import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

public class ValuesResolver {


public Map<String, Object> getVariableValues(GraphQLSchema schema, List<VariableDefinition> variableDefinitions, Map<String, Object> inputs) {
public Map<String, Object> getVariableValues(GraphQLSchema schema, List<VariableDefinition> variableDefinitions, Map<String, Object> args) {
Map<String, Object> result = new LinkedHashMap<>();
for (VariableDefinition variableDefinition : variableDefinitions) {
result.put(variableDefinition.getName(), getVariableValue(schema, variableDefinition, inputs.get(variableDefinition.getName())));
String varName = variableDefinition.getName();
// we transfer the variable as field arguments if its present as value
if (args.containsKey(varName)) {
Object arg = args.get(varName);
Object variableValue = getVariableValue(schema, variableDefinition, arg);
result.put(varName, variableValue);
}
}
return result;
}
Expand Down Expand Up @@ -129,6 +154,9 @@ private Object coerceValueAst(GraphQLType type, Value inputValue, Map<String, Ob
if (inputValue instanceof VariableReference) {
return variables.get(((VariableReference) inputValue).getName());
}
if (inputValue instanceof NullValue) {
return null;
}
if (type instanceof GraphQLScalarType) {
return ((GraphQLScalarType) type).getCoercing().parseLiteral(inputValue);
}
Expand Down Expand Up @@ -160,19 +188,38 @@ private Object coerceValueAstForList(GraphQLList graphQLList, Value value, Map<S
}
}

private Object coerceValueAstForInputObject(GraphQLInputObjectType type, ObjectValue inputValue, Map<String, Object> variables) {
private Object coerceValueAstForInputObject(GraphQLInputObjectType type, ObjectValue inputObjectValue, Map<String, Object> variables) {
Map<String, Object> result = new LinkedHashMap<>();

Map<String, ObjectField> inputValueFieldsByName = mapObjectValueFieldsByName(inputValue);
Map<String, ObjectField> inputValueFieldsByName = mapObjectValueFieldsByName(inputObjectValue);

for (GraphQLInputObjectField inputTypeField : type.getFields()) {
if (inputValueFieldsByName.containsKey(inputTypeField.getName())) {
boolean putObjectInMap = true;

ObjectField field = inputValueFieldsByName.get(inputTypeField.getName());
Object fieldValue = coerceValueAst(inputTypeField.getType(), field.getValue(), variables);
if (fieldValue == null) {
fieldValue = inputTypeField.getDefaultValue();
Value fieldInputValue = field.getValue();

Object fieldObject = null;
if (fieldInputValue instanceof VariableReference) {
String varName = ((VariableReference) fieldInputValue).getName();
if (!variables.containsKey(varName)) {
putObjectInMap = false;
} else {
fieldObject = variables.get(varName);
}
} else {
fieldObject = coerceValueAst(inputTypeField.getType(), fieldInputValue, variables);
}

if (fieldObject == null) {
if (!field.getValue().isEqualTo(NullValue.Null)) {
fieldObject = inputTypeField.getDefaultValue();
}
}
if (putObjectInMap) {
result.put(field.getName(), fieldObject);
}
result.put(field.getName(), fieldValue);
} else if (inputTypeField.getDefaultValue() != null) {
result.put(inputTypeField.getName(), inputTypeField.getDefaultValue());
} else if (inputTypeField.getType() instanceof GraphQLNonNull) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/graphql/language/AstPrinter.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class AstPrinter {
printers.put(Argument.class, argument());
printers.put(ArrayValue.class, value());
printers.put(BooleanValue.class, value());
printers.put(NullValue.class, value());
printers.put(Directive.class, directive());
printers.put(DirectiveDefinition.class, directiveDefinition());
printers.put(DirectiveLocation.class, directiveLocation());
Expand Down Expand Up @@ -378,6 +379,8 @@ static private String value(Value value) {
return valueOf(((EnumValue) value).getName());
} else if (value instanceof BooleanValue) {
return valueOf(((BooleanValue) value).isValue());
} else if (value instanceof NullValue) {
return "null";
} else if (value instanceof ArrayValue) {
return "[" + join(((ArrayValue) value).getValues(), ", ") + "]";
} else if (value instanceof ObjectValue) {
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/graphql/language/NullValue.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package graphql.language;


import java.util.Collections;
import java.util.List;

public class NullValue extends AbstractNode implements Value {

public static NullValue Null = new NullValue();

private NullValue() {
}

@Override
public List<Node> getChildren() {
return Collections.emptyList();
}

@Override
public boolean isEqualTo(Node o) {
if (this == o) return true;
return !(o == null || getClass() != o.getClass());
}

@Override
public String toString() {
return "NullValue{" +
'}';
}
}
9 changes: 9 additions & 0 deletions src/main/java/graphql/parser/GraphqlAntlrToLanguage.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import graphql.language.InterfaceTypeDefinition;
import graphql.language.ListType;
import graphql.language.NonNullType;
import graphql.language.NullValue;
import graphql.language.ObjectField;
import graphql.language.ObjectTypeDefinition;
import graphql.language.ObjectValue;
Expand Down Expand Up @@ -57,6 +58,8 @@
import java.util.Deque;
import java.util.List;

import static graphql.language.NullValue.*;

public class GraphqlAntlrToLanguage extends GraphqlBaseVisitor<Void> {

private final CommonTokenStream tokens;
Expand Down Expand Up @@ -666,6 +669,9 @@ private Value getValue(GraphqlParser.ValueWithVariableContext ctx) {
BooleanValue booleanValue = new BooleanValue(Boolean.parseBoolean(ctx.BooleanValue().getText()));
newNode(booleanValue, ctx);
return booleanValue;
} else if (ctx.NullValue() != null) {
newNode(Null, ctx);
return Null;
} else if (ctx.StringValue() != null) {
StringValue stringValue = new StringValue(parseString(ctx.StringValue().getText()));
newNode(stringValue, ctx);
Expand Down Expand Up @@ -711,6 +717,9 @@ private Value getValue(GraphqlParser.ValueContext ctx) {
BooleanValue booleanValue = new BooleanValue(Boolean.parseBoolean(ctx.BooleanValue().getText()));
newNode(booleanValue, ctx);
return booleanValue;
} else if (ctx.NullValue() != null) {
newNode(Null, ctx);
return Null;
} else if (ctx.StringValue() != null) {
StringValue stringValue = new StringValue(parseString(ctx.StringValue().getText()));
newNode(stringValue, ctx);
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/graphql/schema/idl/SchemaGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import graphql.language.IntValue;
import graphql.language.InterfaceTypeDefinition;
import graphql.language.Node;
import graphql.language.NullValue;
import graphql.language.ObjectTypeDefinition;
import graphql.language.ObjectValue;
import graphql.language.OperationTypeDefinition;
Expand Down Expand Up @@ -432,6 +433,8 @@ private Object buildValue(Value value) {
result = arrayValue.getValues().stream().map(this::buildValue).toArray();
} else if (value instanceof ObjectValue) {
result = buildObjectValue((ObjectValue) value);
} else if (value instanceof NullValue) {
result = null;
}
return result;

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/graphql/validation/ValidationUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public boolean isValidLiteralValue(Value value, GraphQLType type) {
if (value == null) {
return !(type instanceof GraphQLNonNull);
}
if (value instanceof NullValue) {
return !(type instanceof GraphQLNonNull);
}
if (value instanceof VariableReference) {
return true;
}
Expand Down
Loading