Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue with auto-registration for non-null types

Browse Source 
Closes gh-418
This commit is contained in:
rstoyanchev
2022-07-08 15:53:10 +01:00
parent 65cd5bfb49
commit 4dd13ed8e6
4 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
spring-graphql/src/main/java/org/springframework/graphql/data/query/AutoRegistrationRuntimeWiringConfigurer.java
View File

@@ -24,10 +24,13 @@ import graphql.language.FieldDefinition;
import graphql.schema.DataFetcher;
import graphql.schema.GraphQLList;
import graphql.schema.GraphQLNamedOutputType;
import graphql.schema.GraphQLNonNull;
import graphql.schema.GraphQLType;
import graphql.schema.idl.FieldWiringEnvironment;
import graphql.schema.idl.RuntimeWiring;
import graphql.schema.idl.WiringFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.graphql.execution.RuntimeWiringConfigurer;
import org.springframework.lang.Nullable;
@@ -43,10 +46,19 @@ import org.springframework.util.Assert;
*/
class AutoRegistrationRuntimeWiringConfigurer implements RuntimeWiringConfigurer {
private final static Log logger = LogFactory.getLog(AutoRegistrationRuntimeWiringConfigurer.class);
private final Map<String, Function<Boolean, DataFetcher<?>>> dataFetcherFactories;
public AutoRegistrationRuntimeWiringConfigurer(
/**
* Constructor with a Map of GraphQL type names for which auto-registration
* can be performed.
* @param dataFetcherFactories Map with GraphQL type names as keys, and
* functions to create a corresponding {@link DataFetcher} as values.
*/
AutoRegistrationRuntimeWiringConfigurer(
Map<String, Function<Boolean, DataFetcher<?>>> dataFetcherFactories) {
this.dataFetcherFactories = dataFetcherFactories;
@@ -84,16 +96,32 @@ class AutoRegistrationRuntimeWiringConfigurer implements RuntimeWiringConfigurer
return false;
}
String outputTypeName = getOutputTypeName(environment);
boolean result = (outputTypeName != null &&
dataFetcherFactories.containsKey(outputTypeName) &&
!hasDataFetcherFor(environment.getFieldDefinition()));
if (!result) {
// This may be called multiples times on success, so log only rejections from here
logTraceMessage(environment, outputTypeName, false);
}
return result;
}
@Nullable
private String getOutputTypeName(FieldWiringEnvironment environment) {
GraphQLType outputType = (environment.getFieldType() instanceof GraphQLList ?
((GraphQLList) environment.getFieldType()).getWrappedType() :
environment.getFieldType());
String outputTypeName = (outputType instanceof GraphQLNamedOutputType ?
((GraphQLNamedOutputType) outputType).getName() : null);
if (outputType instanceof GraphQLNonNull) {
outputType = ((GraphQLNonNull) outputType).getWrappedType();
}
return (outputTypeName != null &&
dataFetcherFactories.containsKey(outputTypeName) &&
!hasDataFetcherFor(environment.getFieldDefinition()));
return (outputType instanceof GraphQLNamedOutputType ?
((GraphQLNamedOutputType) outputType).getName() : null);
}
private boolean hasDataFetcherFor(FieldDefinition fieldDefinition) {
@@ -104,18 +132,27 @@ class AutoRegistrationRuntimeWiringConfigurer implements RuntimeWiringConfigurer
return this.existingQueryDataFetcherPredicate.test(fieldDefinition.getName());
}
@Override
public DataFetcher<?> getDataFetcher(FieldWiringEnvironment environment) {
return environment.getFieldType() instanceof GraphQLList ?
initDataFetcher(((GraphQLList) environment.getFieldType()).getWrappedType(), false) :
initDataFetcher(environment.getFieldType(), true);
private void logTraceMessage(
FieldWiringEnvironment environment, @Nullable String outputTypeName, boolean match) {
if (logger.isTraceEnabled()) {
String query = environment.getFieldDefinition().getName();
logger.trace((match ? "Matched" : "Skipped") +
" output typeName " + (outputTypeName != null ? "'" + outputTypeName + "'" : "null") +
" for query '" + query + "'");
}
}
private DataFetcher<?> initDataFetcher(GraphQLType type, boolean single) {
Assert.isInstanceOf(GraphQLNamedOutputType.class, type);
String typeName = ((GraphQLNamedOutputType) type).getName();
Function<Boolean, DataFetcher<?>> factory = dataFetcherFactories.get(typeName);
Assert.notNull(factory, "Expected DataFetcher factory");
@Override
public DataFetcher<?> getDataFetcher(FieldWiringEnvironment environment) {
String outputTypeName = getOutputTypeName(environment);
logTraceMessage(environment, outputTypeName, true);
Function<Boolean, DataFetcher<?>> factory = dataFetcherFactories.get(outputTypeName);
Assert.notNull(factory, "Expected DataFetcher factory for typeName '" + outputTypeName + "'");
boolean single = !(environment.getFieldType() instanceof GraphQLList);
return factory.apply(single);
}

9
spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java
View File

@@ -27,6 +27,8 @@ import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.DataFetchingFieldSelectionSet;
import graphql.schema.GraphQLTypeVisitor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -90,6 +92,9 @@ import org.springframework.validation.BindException;
*/
public abstract class QueryByExampleDataFetcher<T> {
private final static Log logger = LogFactory.getLog(QueryByExampleDataFetcher.class);
private final TypeInformation<T> domainType;
private final GraphQlArgumentBinder argumentBinder;
@@ -185,6 +190,10 @@ public abstract class QueryByExampleDataFetcher<T> {
}
}
if (logger.isTraceEnabled()) {
logger.trace("Auto-registration candidate typeNames " + factories.keySet());
}
return new AutoRegistrationRuntimeWiringConfigurer(factories);
}

8
spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java
View File

@@ -29,6 +29,8 @@ import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.DataFetchingFieldSelectionSet;
import graphql.schema.GraphQLTypeVisitor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -97,6 +99,8 @@ import org.springframework.util.MultiValueMap;
*/
public abstract class QuerydslDataFetcher<T> {
private final static Log logger = LogFactory.getLog(QueryByExampleDataFetcher.class);
private static final QuerydslPredicateBuilder BUILDER = new QuerydslPredicateBuilder(
DefaultConversionService.getSharedInstance(), SimpleEntityPathResolver.INSTANCE);
@@ -215,6 +219,10 @@ public abstract class QuerydslDataFetcher<T> {
}
}
if (logger.isTraceEnabled()) {
logger.trace("Auto-registration candidate typeNames " + factories.keySet());
}
return new AutoRegistrationRuntimeWiringConfigurer(factories);
}

2
spring-graphql/src/test/resources/books/schema.graphqls
View File

@@ -1,7 +1,7 @@
type Query {
bookById(id: ID): Book
booksById(id: [ID]): [Book]
books(id: ID, name: String, author: String): [Book]
books(id: ID, name: String, author: String): [Book!]
booksByCriteria(criteria:BookCriteria): [Book]
booksByProjectedArguments(name: String, author: String): [Book]
booksByProjectedCriteria(criteria:BookCriteria): [Book]