Skip to content
Open
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: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
networkTimeout=60000
retries=3
retryBackOffMs=1000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions src/main/java/graphql/schema/GraphQLArgument.java
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@ public Builder defaultValueLiteral(@NonNull Value defaultValue) {
}

/**
* Sets a programmatic default value. Iterators and streams, including nested values,
* are rejected during schema validation; use an iterable or array instead.
*
* @param defaultValue Can be null to represent null value
*
* @return this builder
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/graphql/schema/GraphQLInputObjectField.java
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@ public Builder defaultValueLiteral(Value defaultValue) {
return this;
}

/**
* Sets a programmatic default value. Iterators and streams, including nested values,
* are rejected during schema validation; use an iterable or array instead.
*
* @param defaultValue the default value, which can be null
*
* @return this builder
*/
public Builder defaultValueProgrammatic(Object defaultValue) {
this.defaultValue = InputValueWithState.newExternalValue(defaultValue);
return this;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package graphql.schema.validation;

import graphql.Internal;
import graphql.schema.GraphQLArgument;
import graphql.schema.GraphQLInputObjectField;
import graphql.schema.GraphQLSchemaElement;
import graphql.schema.GraphQLTypeVisitorStub;
import graphql.schema.InputValueWithState;
import graphql.util.FpKit;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;
import org.jspecify.annotations.Nullable;

import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.stream.BaseStream;

@Internal
public class DefaultValueContainersAreValid extends GraphQLTypeVisitorStub {

@Override
public TraversalControl visitGraphQLArgument(GraphQLArgument argument, TraverserContext<GraphQLSchemaElement> context) {
checkDefaultValue(argument.getArgumentDefaultValue(), argument.getName(), context);
return TraversalControl.CONTINUE;
}

@Override
public TraversalControl visitGraphQLInputObjectField(GraphQLInputObjectField field, TraverserContext<GraphQLSchemaElement> context) {
checkDefaultValue(field.getInputFieldDefaultValue(), field.getName(), context);
return TraversalControl.CONTINUE;
}

private void checkDefaultValue(InputValueWithState defaultValue, String name, TraverserContext<GraphQLSchemaElement> context) {
if (!defaultValue.isExternal() && !defaultValue.isInternal()) {
return;
}
if (hasValidContainers(defaultValue.getValue(), null)) {
return;
}
SchemaValidationErrorCollector collector = context.getVarFromParents(SchemaValidationErrorCollector.class);
collector.addError(new SchemaValidationError(SchemaValidationErrorType.InvalidDefaultValue,
"Invalid default value for '" + name + "': default values must not contain an Iterator or a Stream"));
}

private boolean hasValidContainers(@Nullable Object value, @Nullable Set<Object> visited) {
if (value == null) {
return true;
}
if (value instanceof Iterator || value instanceof BaseStream) {
return false;
}
if (!(value instanceof Map) && !FpKit.isIterableOrArray(value)) {
return true;
}
if (visited == null) {
visited = Collections.newSetFromMap(new IdentityHashMap<>());
}
if (!visited.add(value)) {
return true;
}
Iterable<?> values = value instanceof Map ? ((Map<?, ?>) value).values() : FpKit.toIterable(value);
for (Object item : values) {
if (!hasValidContainers(item, visited)) {
return false;
}
}
return true;
}
}
Loading
Loading