Skip to content

Retain trivial DataFetcher marker when original DataFetcher was trivial #88

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
Aug 24, 2023
Merged

Retain trivial DataFetcher marker when original DataFetcher was trivial #88

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
15 changes: 15 additions & 0 deletions src/main/java/graphql/validation/schemawiring/TrivialFieldValidatorDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package graphql.validation.schemawiring;

import graphql.TrivialDataFetcher;
import graphql.schema.DataFetcher;
import graphql.validation.interpolation.MessageInterpolator;
import graphql.validation.rules.OnValidationErrorStrategy;
import graphql.validation.rules.ValidationRules;

import java.util.Locale;

public class TrivialFieldValidatorDataFetcher extends FieldValidatorDataFetcher implements TrivialDataFetcher<Object> {
public TrivialFieldValidatorDataFetcher(OnValidationErrorStrategy errorStrategy, MessageInterpolator messageInterpolator, DataFetcher<?> defaultDataFetcher, Locale defaultLocale, ValidationRules validationRules) {
super(errorStrategy, messageInterpolator, defaultDataFetcher, defaultLocale, validationRules);
}
}
12 changes: 11 additions & 1 deletion src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package graphql.validation.schemawiring;

import graphql.PublicApi;
import graphql.TrivialDataFetcher;
import graphql.schema.DataFetcher;
import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLFieldsContainer;
import graphql.schema.idl.SchemaDirectiveWiring;
import graphql.schema.idl.SchemaDirectiveWiringEnvironment;
import graphql.validation.interpolation.MessageInterpolator;
import graphql.validation.rules.OnValidationErrorStrategy;
import graphql.validation.rules.TargetedValidationRules;
import graphql.validation.rules.ValidationRules;

import java.util.Locale;
Expand Down Expand Up @@ -51,6 +51,16 @@ private DataFetcher<Object> buildValidatingDataFetcher(OnValidationErrorStrategy
MessageInterpolator messageInterpolator,
DataFetcher<?> currentDF,
final Locale defaultLocale) {
if (currentDF instanceof TrivialDataFetcher) {
return new TrivialFieldValidatorDataFetcher(
errorStrategy,
messageInterpolator,
currentDF,
defaultLocale,
ruleCandidates
);
}

return new FieldValidatorDataFetcher(
errorStrategy,
messageInterpolator,
Expand Down