Skip to content

Commit 8530366

Browse files
bbakermanbbakerman
authored
This fixes a Bug in the ValueResolver (#2531)
* This fixes a Bug in the ValueResolver when called from the SchemaPrinter such that object values had null names * better test
1 parent 27b11d9 commit 8530366

9 files changed

Lines changed: 79 additions & 8 deletions

File tree

‎src/main/java/graphql/execution/ValuesResolver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,14 @@ private Object externalValueToLiteralForObject(GraphqlFieldVisibility fieldVisib
354354
if (valueMode == ValueMode.LITERAL) {
355355
normalizedResult.put(fieldName, new NormalizedInputValue(simplePrint(fieldType), defaultValueLiteral));
356356
} else {
357-
objectFields.add(newObjectField().value((Value) defaultValueLiteral).build());
357+
objectFields.add(newObjectField().name(fieldName).value((Value) defaultValueLiteral).build());
358358
}
359359
} else if (hasValue) {
360360
if (fieldValue == null) {
361361
if (valueMode == NORMALIZED) {
362362
normalizedResult.put(fieldName, new NormalizedInputValue(simplePrint(fieldType), null));
363363
} else {
364-
objectFields.add(newObjectField().value(newNullValue().build()).build());
364+
objectFields.add(newObjectField().name(fieldName).value(newNullValue().build()).build());
365365
}
366366
} else {
367367
Object literal = externalValueToLiteral(fieldVisibility,
@@ -371,7 +371,7 @@ private Object externalValueToLiteralForObject(GraphqlFieldVisibility fieldVisib
371371
if (valueMode == NORMALIZED) {
372372
normalizedResult.put(fieldName, new NormalizedInputValue(simplePrint(fieldType), literal));
373373
} else {
374-
objectFields.add(newObjectField().value((Value) literal).build());
374+
objectFields.add(newObjectField().name(fieldName).value((Value) literal).build());
375375
}
376376
}
377377
}

‎src/main/java/graphql/language/BooleanValue.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ public TraversalControl accept(TraverserContext<Node> context, NodeVisitor visit
9090
return visitor.visitBooleanValue(this, context);
9191
}
9292

93+
public static BooleanValue of(boolean value) {
94+
return BooleanValue.newBooleanValue(value).build();
95+
}
96+
9397
public static Builder newBooleanValue() {
9498
return new Builder();
9599
}

‎src/main/java/graphql/language/FloatValue.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ public TraversalControl accept(TraverserContext<Node> context, NodeVisitor visit
9797
return visitor.visitFloatValue(this, context);
9898
}
9999

100+
public static FloatValue of(double d) {
101+
return newFloatValue().value(d).build();
102+
}
103+
100104
public static Builder newFloatValue() {
101105
return new Builder();
102106
}

‎src/main/java/graphql/language/IntValue.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import graphql.util.TraverserContext;
99

1010
import java.math.BigInteger;
11-
import java.util.ArrayList;
1211
import java.util.LinkedHashMap;
1312
import java.util.List;
1413
import java.util.Map;
@@ -92,6 +91,10 @@ public TraversalControl accept(TraverserContext<Node> context, NodeVisitor visit
9291
return visitor.visitIntValue(this, context);
9392
}
9493

94+
public static IntValue of(int i) {
95+
return newIntValue().value(i).build();
96+
}
97+
9598
public static Builder newIntValue() {
9699
return new Builder();
97100
}
@@ -133,6 +136,11 @@ public Builder value(BigInteger value) {
133136
return this;
134137
}
135138

139+
public Builder value(int value) {
140+
this.value = BigInteger.valueOf(value);
141+
return this;
142+
}
143+
136144
public Builder comments(List<Comment> comments) {
137145
this.comments = ImmutableList.copyOf(comments);
138146
return this;

‎src/main/java/graphql/language/ObjectField.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class ObjectField extends AbstractNode<ObjectField> implements NamedNode<
2828
@Internal
2929
protected ObjectField(String name, Value value, SourceLocation sourceLocation, List<Comment> comments, IgnoredChars ignoredChars, Map<String, String> additionalData) {
3030
super(sourceLocation, comments, ignoredChars, additionalData);
31-
this.name = name;
32-
this.value = value;
31+
this.name = assertNotNull(name);
32+
this.value = assertNotNull(value);
3333
}
3434

3535
/**

‎src/main/java/graphql/language/StringValue.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import graphql.util.TraversalControl;
88
import graphql.util.TraverserContext;
99

10-
import java.util.ArrayList;
1110
import java.util.LinkedHashMap;
1211
import java.util.List;
1312
import java.util.Map;
@@ -91,6 +90,10 @@ public TraversalControl accept(TraverserContext<Node> context, NodeVisitor visit
9190
return visitor.visitStringValue(this, context);
9291
}
9392

93+
public static StringValue of(String value) {
94+
return StringValue.newStringValue(value).build();
95+
}
96+
9497
public static Builder newStringValue() {
9598
return new Builder();
9699
}

‎src/test/groovy/graphql/execution/ValuesResolverTestLegacy.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package graphql.language
33

44
import graphql.schema.GraphQLEnumType
55
import graphql.schema.GraphQLInputObjectType
6+
import spock.lang.Ignore
67
import spock.lang.Specification
78

89
import static graphql.Scalars.GraphQLBoolean
@@ -185,6 +186,7 @@ class ValuesResolverTestLegacy extends Specification {
185186

186187
}
187188

189+
@Ignore("ObjectValue.isEqualTo is broken - this test currently makes no sense")
188190
def 'converts input objects with explicit nulls'() {
189191
expect:
190192
def inputObj = GraphQLInputObjectType.newInputObject()

‎src/test/groovy/graphql/language/NodeVisitorStubTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class NodeVisitorStubTest extends Specification {
140140
FieldDefinition.newFieldDefinition().build() | 'visitFieldDefinition'
141141
InputValueDefinition.newInputValueDefinition().build() | 'visitInputValueDefinition'
142142
InputValueDefinition.newInputValueDefinition().build() | 'visitInputValueDefinition'
143-
new ObjectField("", null) | 'visitObjectField'
143+
new ObjectField("a", IntValue.of(1)) | 'visitObjectField'
144144
OperationTypeDefinition.newOperationTypeDefinition().build() | 'visitOperationTypeDefinition'
145145
OperationTypeDefinition.newOperationTypeDefinition().build() | 'visitOperationTypeDefinition'
146146
SelectionSet.newSelectionSet().build() | 'visitSelectionSet'

‎src/test/groovy/graphql/schema/idl/SchemaPrinterTest.groovy‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import graphql.introspection.IntrospectionResultToSchema
99
import graphql.schema.Coercing
1010
import graphql.schema.GraphQLArgument
1111
import graphql.schema.GraphQLCodeRegistry
12+
import graphql.schema.GraphQLDirective
1213
import graphql.schema.GraphQLEnumType
1314
import graphql.schema.GraphQLEnumValueDefinition
1415
import graphql.schema.GraphQLFieldDefinition
@@ -1950,4 +1951,53 @@ type Query {
19501951
"""
19511952
}
19521953

1954+
def "programmatic object value in an argument is printed"() {
1955+
1956+
GraphQLInputObjectType compoundType = GraphQLInputObjectType.newInputObject().name("Compound")
1957+
.field({ it.name("a").type(GraphQLString) })
1958+
.field({ it.name("b").type(GraphQLString) })
1959+
.build()
1960+
1961+
GraphQLObjectType objType = newObject().name("obj")
1962+
.field({
1963+
it.name("f").type(GraphQLString)
1964+
.argument({
1965+
it.name("arg").type(compoundType).defaultValueProgrammatic(["a": "A", "b": "B"])
1966+
})
1967+
}).build()
1968+
1969+
when:
1970+
1971+
def result = new SchemaPrinter().print(objType)
1972+
1973+
1974+
then:
1975+
result == '''type obj {
1976+
f(arg: Compound = {a : "A", b : "B"}): String
1977+
}
1978+
1979+
'''
1980+
1981+
when:
1982+
def newDirective = GraphQLDirective.newDirective().name("foo")
1983+
.argument({
1984+
it.name("arg").type(compoundType).valueProgrammatic(["a": "A", "b": "B"])
1985+
})
1986+
.build()
1987+
1988+
objType = newObject().name("obj").field({
1989+
it.name("f").type(GraphQLString).withDirective(newDirective)
1990+
}).build()
1991+
1992+
result = new SchemaPrinter().print(objType)
1993+
1994+
then:
1995+
1996+
result == '''type obj {
1997+
f: String @foo(arg : {a : "A", b : "B"})
1998+
}
1999+
2000+
'''
2001+
2002+
}
19532003
}

0 commit comments

Comments
 (0)