Skip to content

This fixes the ImmutableMap .map problem where lists can have null in them #2848

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
bbakerman merged 1 commit into from
Jun 8, 2022
Merged

This fixes the ImmutableMap .map problem where lists can have null in them #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/main/java/graphql/normalized/ValueToVariableValueCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.util.List;
import java.util.Map;

import static graphql.collect.ImmutableKit.map;
import static java.util.stream.Collectors.toList;

@Internal
Expand Down Expand Up @@ -66,13 +65,15 @@ static Object normalisedValueToVariableValue(Object maybeValue) {
} else if (maybeValue instanceof Map) {
variableValue = normalisedValueToVariableValues((Map<String, Object>) maybeValue);
} else {
throw new AssertException("Should never happen. Did not expect type: " + maybeClass(maybeValue));
throw new AssertException("Should never happen. Did not expect type: " + maybeClass(maybeValue));
}
return variableValue;
}

private static List<Object> normalisedValueToVariableValues(List<Object> arrayValues) {
return map(arrayValues, ValueToVariableValueCompiler::normalisedValueToVariableValue);
return arrayValues.stream()
.map(ValueToVariableValueCompiler::normalisedValueToVariableValue)
.collect(toList());
}

@NotNull
Expand Down
19 changes: 15 additions & 4 deletions src/test/groovy/graphql/normalized/ValueToVariableValueCompilerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import graphql.language.NullValue
import graphql.language.ObjectField
import graphql.language.ObjectValue
import graphql.language.StringValue
import graphql.language.Type
import graphql.language.TypeName
import graphql.schema.idl.TypeUtil
import spock.lang.Specification
Expand Down Expand Up @@ -89,6 +88,18 @@ class ValueToVariableValueCompilerTest extends Specification {
// but for now this is what we do
}

def "can handle NormalizedInputValue values that are NIV with null members"() {
expect:
def niv = new NormalizedInputValue("TypeName", value)
def actual = ValueToVariableValueCompiler.normalisedValueToVariableValue(niv)
actual == expected

where:
value | expected
[a: new NormalizedInputValue("X", IntValue.of(666)), b: new NormalizedInputValue("X", null)] | [a: 666, b: null]
[new NormalizedInputValue("X", IntValue.of(666)), new NormalizedInputValue("X", null)] | [666, null]
}


def "can print variables as expected"() {
expect:
Expand All @@ -100,7 +111,7 @@ class ValueToVariableValueCompilerTest extends Specification {
// compare actual type
def actualType = actual.definition.type
actualType.isEqualTo(expectedType)
if(actualType instanceof NonNullType || actualType instanceof ListType){
if (actualType instanceof NonNullType || actualType instanceof ListType) {
actualType.type.isEqualTo(expectedType.type)
}
TypeUtil.simplePrint(actualType) == typeName
Expand All @@ -113,8 +124,8 @@ class ValueToVariableValueCompilerTest extends Specification {
BooleanValue.of(true) | 4 | "Boolean!" | true | "v4" | new NonNullType(new TypeName("Boolean"))
FloatValue.of(999d) | 5 | "Float" | 999d | "v5" | new TypeName("Float")
EnumValue.of("enumValue") | 6 | "Foo!" | "enumValue" | "v6" | new NonNullType(new TypeName("Foo"))
["a" : IntValue.of(64),
"b":IntValue.of(65) ] | 7 | "ObjectType" | [a: 64, b: 65] | "v7" | new TypeName("ObjectType")
["a": IntValue.of(64),
"b": IntValue.of(65)] | 7 | "ObjectType" | [a: 64, b: 65] | "v7" | new TypeName("ObjectType")
[StringValue.of("9"),
StringValue.of("10"),
StringValue.of("11")] | 8 | "[String]" | ["9", "10", "11"] | "v8" | new ListType((new TypeName("String")))
Expand Down