Skip to content

Commit 97593b7

Browse files
authored
Primitive array support (#681)
1 parent b9feb49 commit 97593b7

2 files changed

Lines changed: 24 additions & 2 deletions

File tree

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

32+
import java.lang.reflect.Array;
3233
import java.util.ArrayList;
33-
import java.util.Arrays;
3434
import java.util.List;
3535
import java.util.Map;
3636
import java.util.Optional;
3737
import java.util.concurrent.CompletableFuture;
3838
import java.util.concurrent.CompletionException;
3939
import java.util.concurrent.CompletionStage;
40+
import java.util.stream.IntStream;
4041

4142
import static graphql.execution.ExecutionTypeInfo.newTypeInfo;
4243
import static graphql.execution.FieldCollectorParameters.newParameters;
@@ -45,6 +46,7 @@
4546
import static graphql.introspection.Introspection.TypeNameMetaFieldDef;
4647
import static graphql.schema.DataFetchingEnvironmentBuilder.newDataFetchingEnvironment;
4748
import static java.util.concurrent.CompletableFuture.completedFuture;
49+
import static java.util.stream.Collectors.toList;
4850

4951
/**
5052
* An execution strategy is give a list of fields from the graphql query to execute and find values for using a recursive strategy.
@@ -401,7 +403,9 @@ private Object unboxPossibleOptional(Object result) {
401403

402404
private Iterable<Object> toIterable(Object result) {
403405
if (result.getClass().isArray()) {
404-
result = Arrays.asList((Object[]) result);
406+
return IntStream.range(0, Array.getLength(result))
407+
.mapToObj(i -> Array.get(result, i))
408+
.collect(toList());
405409
}
406410
//noinspection unchecked
407411
return (Iterable<Object>) result;

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,24 @@ class ExecutionStrategyTest extends Specification {
484484
thrown(CompletionException)
485485
executionContext.errors.size() == 1 // only 1 error
486486
executionContext.errors[0] instanceof ExceptionWhileDataFetching
487+
}
488+
489+
def "#163 completes value for an primitive type array"() {
490+
given:
491+
ExecutionContext executionContext = buildContext()
492+
long[] result = [1L,2L,3L]
487493

494+
def parameters = newParameters()
495+
.typeInfo(ExecutionTypeInfo.newTypeInfo().type(new GraphQLList(Scalars.GraphQLLong)))
496+
.source(result)
497+
.fields(["fld": [new Field()]])
498+
.field([new Field()])
499+
.build()
500+
501+
when:
502+
def executionResult = executionStrategy.completeValue(executionContext, parameters)
503+
504+
then:
505+
executionResult.get().data == [1L,2L,3L]
488506
}
489507
}

0 commit comments

Comments
 (0)