From d70dbe62873b3189d82c547d365e0bf9c90dc9c6 Mon Sep 17 00:00:00 2001 From: pelletier197 Date: Thu, 1 Oct 2020 21:31:14 -0400 Subject: [PATCH 01/65] fix schema wiring (#30) --- .../FieldValidatorDataFetcher.java | 79 +++++++++++++++++++ .../schemawiring/ValidationSchemaWiring.java | 44 ++++------- 2 files changed, 94 insertions(+), 29 deletions(-) create mode 100644 src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java diff --git a/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java b/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java new file mode 100644 index 0000000..a02836a --- /dev/null +++ b/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java @@ -0,0 +1,79 @@ +package graphql.validation.schemawiring; + +import graphql.GraphQLError; +import graphql.schema.*; +import graphql.validation.interpolation.MessageInterpolator; +import graphql.validation.rules.OnValidationErrorStrategy; +import graphql.validation.rules.TargetedValidationRules; +import graphql.validation.rules.ValidationRule; +import graphql.validation.rules.ValidationRules; +import graphql.validation.util.Util; + +import java.util.List; +import java.util.Locale; + +public class FieldValidatorDataFetcher implements DataFetcher { + private final OnValidationErrorStrategy errorStrategy; + private final MessageInterpolator messageInterpolator; + private final DataFetcher defaultDataFetcher; + private final Locale defaultLocale; + private final ValidationRules validationRules; + private TargetedValidationRules applicableRules; + + public FieldValidatorDataFetcher(OnValidationErrorStrategy errorStrategy, + MessageInterpolator messageInterpolator, + DataFetcher defaultDataFetcher, + Locale defaultLocale, + ValidationRules validationRules) { + this.errorStrategy = errorStrategy; + this.messageInterpolator = messageInterpolator; + this.defaultDataFetcher = defaultDataFetcher; + this.defaultLocale = defaultLocale; + this.validationRules = validationRules; + this.applicableRules = null; + } + + @Override + public Object get(DataFetchingEnvironment environment) throws Exception { + if (!wereApplicableRulesFetched()) { + fetchApplicableRules(environment); + } + + // When no validation is performed, this data fetcher is a pass-through + if (applicableRules.isEmpty()) { + return defaultDataFetcher.get(environment); + } + + List errors = applicableRules.runValidationRules(environment, messageInterpolator, defaultLocale); + if (!errors.isEmpty()) { + if (!errorStrategy.shouldContinue(errors, environment)) { + return errorStrategy.onErrorValue(errors, environment); + } + } + + Object returnValue = defaultDataFetcher.get(environment); + if (errors.isEmpty()) { + return returnValue; + } + return Util.mkDFRFromFetchedResult(errors, returnValue); + } + + private void fetchApplicableRules(DataFetchingEnvironment environment) { + final GraphQLFieldDefinition field = environment.getFieldDefinition(); + final GraphQLFieldsContainer container = asContainer(environment); + + applicableRules = validationRules.buildRulesFor(field, container); + } + + private GraphQLFieldsContainer asContainer(DataFetchingEnvironment environment) { + final GraphQLType parent = environment.getParentType(); + if (parent == null) { + return null; + } + return (GraphQLFieldsContainer) environment.getParentType(); + } + + private boolean wereApplicableRulesFetched() { + return applicableRules != null; + } +} diff --git a/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java b/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java index 26d9c97..36cf6ba 100644 --- a/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java +++ b/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java @@ -1,6 +1,5 @@ package graphql.validation.schemawiring; -import graphql.GraphQLError; import graphql.PublicApi; import graphql.schema.DataFetcher; import graphql.schema.GraphQLFieldDefinition; @@ -11,17 +10,15 @@ import graphql.validation.rules.OnValidationErrorStrategy; import graphql.validation.rules.TargetedValidationRules; import graphql.validation.rules.ValidationRules; -import graphql.validation.util.Util; -import java.util.List; import java.util.Locale; /** - * A {@link graphql.schema.idl.SchemaDirectiveWiring} that can be used to inject validation rules into the data fetchers + * A {@link SchemaDirectiveWiring} that can be used to inject validation rules into the data fetchers * when the graphql schema is being built. It will use the validation rules and ask each one of they apply to the field and or its * arguments. *

- * If there are rules that apply then it will it will change the {@link graphql.schema.DataFetcher} of that field so that rules get run + * If there are rules that apply then it will it will change the {@link DataFetcher} of that field so that rules get run * BEFORE the original field fetch is run. */ @PublicApi @@ -38,40 +35,29 @@ public GraphQLFieldDefinition onField(SchemaDirectiveWiringEnvironment currentDF = env.getCodeRegistry().getDataFetcher(fieldsContainer, fieldDefinition); + final DataFetcher newDF = buildValidatingDataFetcher(errorStrategy, messageInterpolator, currentDF, locale); env.getCodeRegistry().dataFetcher(fieldsContainer, fieldDefinition, newDF); return fieldDefinition; } - private DataFetcher buildValidatingDataFetcher(TargetedValidationRules rules, OnValidationErrorStrategy errorStrategy, MessageInterpolator messageInterpolator, DataFetcher currentDF, final Locale defaultLocale) { - // ok we have some rules that need to be applied to this field and its arguments - return environment -> { - List errors = rules.runValidationRules(environment, messageInterpolator, defaultLocale); - if (!errors.isEmpty()) { - // should we continue? - if (!errorStrategy.shouldContinue(errors, environment)) { - return errorStrategy.onErrorValue(errors, environment); - } - } - // we have no validation errors or they said continue so call the underlying data fetcher - Object returnValue = currentDF.get(environment); - if (errors.isEmpty()) { - return returnValue; - } - return Util.mkDFRFromFetchedResult(errors, returnValue); - }; + private DataFetcher buildValidatingDataFetcher(OnValidationErrorStrategy errorStrategy, + MessageInterpolator messageInterpolator, + DataFetcher currentDF, + final Locale defaultLocale) { + return new FieldValidatorDataFetcher( + errorStrategy, + messageInterpolator, + currentDF, + defaultLocale, + ruleCandidates + ); } } From 8bf256551c054f97c63171fe8f934ee715e9436b Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Sun, 4 Oct 2020 12:43:04 +1100 Subject: [PATCH 02/65] This allows circular types to be applied to. It fixes a StackOverflow bug (#34) --- .../AbstractDirectiveConstraint.java | 2 +- .../util/DirectivesAndTypeWalker.java | 28 ++++++-- .../rules/ValidationRulesTest.groovy | 72 +++++++++++++++++++ .../util/DirectivesAndTypeWalkerTest.groovy | 32 +++++++++ 4 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index 54e8442..09853c1 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -65,7 +65,7 @@ public boolean appliesTo(GraphQLFieldDefinition fieldDefinition, GraphQLFieldsCo @Override public boolean appliesTo(GraphQLArgument argument, GraphQLFieldDefinition fieldDefinition, GraphQLFieldsContainer fieldsContainer) { - boolean suitable = DirectivesAndTypeWalker.isSuitable(argument, (inputType, directive) -> { + boolean suitable = new DirectivesAndTypeWalker().isSuitable(argument, (inputType, directive) -> { boolean hasNamedDirective = directive.getName().equals(this.getName()); if (hasNamedDirective) { inputType = Util.unwrapNonNull(inputType); diff --git a/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java b/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java index 6d32590..53d7e07 100644 --- a/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java +++ b/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java @@ -8,34 +8,45 @@ import graphql.schema.GraphQLInputObjectType; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLList; +import graphql.schema.GraphQLTypeUtil; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.BiFunction; @Internal public class DirectivesAndTypeWalker { - public static boolean isSuitable(GraphQLArgument argument, BiFunction isSuitable) { + private final Map seenTypes = new HashMap<>(); + + public boolean isSuitable(GraphQLArgument argument, BiFunction isSuitable) { GraphQLInputType inputType = argument.getType(); List directives = argument.getDirectives(); return walkInputType(inputType, directives, isSuitable); } - private static boolean walkInputType(GraphQLInputType inputType, List directives, BiFunction isSuitable) { + private boolean walkInputType(GraphQLInputType inputType, List directives, BiFunction isSuitable) { + String typeName = GraphQLTypeUtil.unwrapAll(inputType).getName(); GraphQLInputType unwrappedInputType = Util.unwrapNonNull(inputType); for (GraphQLDirective directive : directives) { if (isSuitable.apply(unwrappedInputType, directive)) { - return true; + return seen(typeName,true); } } if (unwrappedInputType instanceof GraphQLInputObjectType) { GraphQLInputObjectType inputObjType = (GraphQLInputObjectType) unwrappedInputType; + if (seenTypes.containsKey(typeName)) { + return seenTypes.get(typeName); + } + seen(typeName,false); + for (GraphQLInputObjectField inputField : inputObjType.getFieldDefinitions()) { inputType = inputField.getType(); directives = inputField.getDirectives(); if (walkInputType(inputType, directives, isSuitable)) { - return true; + return seen(typeName,true); } } } @@ -44,11 +55,16 @@ private static boolean walkInputType(GraphQLInputType inputType, List + return "OK" + } + + def runtime = RuntimeWiring.newRuntimeWiring() + .type(newTypeWiring("Query").dataFetcher("request", df)) + .directiveWiring(validationWiring) + .build() + def graphQLSchema = TestUtil.schema(sdl, runtime) + def graphQL = GraphQL.newGraphQL(graphQLSchema).build() + + when: + + def er = graphQL.execute(''' + { + request ( + arg : { + title : "Mr BRAD", givenName : "BRADLEY" , surName : "BAKER" + inner : { title : "Mr BRAD", givenName : "BRADLEY" , surName : "BAKER" } + innerList : [ { title : "Mr BRAD", givenName : "BRADLEY" , surName : "BAKER" } ] + } + ) + } + ''') + then: + er != null + er.data["request"] == null + er.errors.size() == 6 + + er.errors[0].getMessage() == "/request/arg/givenName size must be between 1 and 1" + er.errors[1].getMessage() == "/request/arg/inner/givenName size must be between 1 and 1" + er.errors[2].getMessage() == "/request/arg/inner/title size must be between 1 and 1" + er.errors[3].getMessage() == "/request/arg/innerList[0]/givenName size must be between 1 and 1" + er.errors[4].getMessage() == "/request/arg/innerList[0]/title size must be between 1 and 1" + er.errors[5].getMessage() == "/request/arg/title size must be between 1 and 1" + } } diff --git a/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy b/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy new file mode 100644 index 0000000..30d157e --- /dev/null +++ b/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy @@ -0,0 +1,32 @@ +package graphql.validation.util + + +import graphql.schema.GraphQLObjectType +import graphql.validation.TestUtil +import spock.lang.Specification + +class DirectivesAndTypeWalkerTest extends Specification { + + def "can walk self referencing types"() { + def sdl = """ + input TestInput @deprecated { + name : String + list : [TestInput] + self : TestInput + } + + type Query { + f(arg : TestInput) : String + } + """ + + def schema = TestUtil.schema(sdl) + def arg = (schema.getType("Query") as GraphQLObjectType).getFieldDefinition("f").getArgument("arg") + def callback = { t, d -> true } + when: + def suitable = new DirectivesAndTypeWalker().isSuitable(arg, callback) + + then: + suitable + } +} From c3508e1b224432aa460081260b1ee1bbe862ce25 Mon Sep 17 00:00:00 2001 From: AOUDIA Date: Mon, 30 Nov 2020 01:01:11 +0100 Subject: [PATCH 03/65] refactor: upgrade to GraphQL Java 16.1 close #38 --- README.md | 6 ++++-- build.gradle | 4 ++-- .../ResourceBundleMessageInterpolator.java | 8 ++++---- .../rules/TargetedValidationRules.java | 8 ++++---- .../rules/ValidationEnvironment.java | 18 +++++++++--------- .../java/graphql/validation/util/Util.java | 4 ++-- .../groovy/graphql/validation/TestUtil.groovy | 6 ++++-- .../BaseConstraintTestSupport.groovy | 10 +++++----- ...esourceBundleMessageInterpolatorTest.groovy | 6 +++--- .../util/DirectivesAndTypeWalkerTest.groovy | 2 ++ 10 files changed, 39 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 1e7ae5b..18dba22 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,13 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 15.0.1 + 16.0.0 pom ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:15.0.1' +compile 'com.graphql-java:graphql-java-extended-validation:16.0.0' ``` > Note: @@ -32,6 +32,8 @@ compile 'com.graphql-java:graphql-java-extended-validation:15.0.1' > use 14.0.1 or above for graphql-java 14.x and above > > use 15.0.1 or above for graphql-java 15.x and above +> +> use 16.0.0 or above for graphql-java 16.x and above Its currently available from JCenter repo and Maven central. diff --git a/build.gradle b/build.gradle index b5b2404..62b04c3 100644 --- a/build.gradle +++ b/build.gradle @@ -39,10 +39,10 @@ repositories { dependencies { - compile "com.graphql-java:graphql-java:15.0" + compile "com.graphql-java:graphql-java:16.1" compile 'org.slf4j:slf4j-api:1.7.30' compile "jakarta.validation:jakarta.validation-api:2.0.2" - compile "org.hibernate.validator:hibernate-validator:6.1.5.Final" + compile "org.hibernate.validator:hibernate-validator:6.1.6.Final" compile "jakarta.el:jakarta.el-api:3.0.3" compile "org.glassfish:jakarta.el:3.0.3" diff --git a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java index f75f41c..76d83d3 100644 --- a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java +++ b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java @@ -3,7 +3,7 @@ import graphql.ErrorClassification; import graphql.GraphQLError; import graphql.GraphqlErrorBuilder; -import graphql.execution.ExecutionPath; +import graphql.execution.ResultPath; import graphql.schema.GraphQLDirective; import graphql.validation.el.StandardELVariables; import graphql.validation.rules.ValidationEnvironment; @@ -70,7 +70,7 @@ public class ResourceBundleMessageInterpolator implements MessageInterpolator { */ @SuppressWarnings("unused") protected ErrorClassification buildErrorClassification(String messageTemplate, Map messageParams, ValidationEnvironment validationEnvironment) { - ExecutionPath fieldOrArgumentPath = validationEnvironment.getValidatedPath(); + ResultPath fieldOrArgumentPath = validationEnvironment.getValidatedPath(); GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); return new ValidationErrorType(fieldOrArgumentPath, directive); } @@ -183,10 +183,10 @@ private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterp } private static class ValidationErrorType implements ErrorClassification { - private final ExecutionPath fieldOrArgumentPath; + private final ResultPath fieldOrArgumentPath; private final GraphQLDirective directive; - ValidationErrorType(ExecutionPath fieldOrArgumentPath, GraphQLDirective directive) { + ValidationErrorType(ResultPath fieldOrArgumentPath, GraphQLDirective directive) { this.fieldOrArgumentPath = fieldOrArgumentPath; this.directive = directive; } diff --git a/src/main/java/graphql/validation/rules/TargetedValidationRules.java b/src/main/java/graphql/validation/rules/TargetedValidationRules.java index 43e6a78..2ef7207 100644 --- a/src/main/java/graphql/validation/rules/TargetedValidationRules.java +++ b/src/main/java/graphql/validation/rules/TargetedValidationRules.java @@ -3,7 +3,7 @@ import graphql.Assert; import graphql.GraphQLError; import graphql.PublicApi; -import graphql.execution.ExecutionPath; +import graphql.execution.ResultPath; import graphql.schema.DataFetchingEnvironment; import graphql.schema.GraphQLArgument; import graphql.schema.GraphQLDirective; @@ -71,7 +71,7 @@ public List runValidationRules(DataFetchingEnvironment env, Messag GraphQLObjectType fieldContainer = env.getExecutionStepInfo().getFieldContainer(); GraphQLFieldDefinition fieldDefinition = env.getFieldDefinition(); - ExecutionPath fieldPath = env.getExecutionStepInfo().getPath(); + ResultPath fieldPath = env.getExecutionStepInfo().getPath(); // // run the field specific rules ValidationCoordinates fieldCoords = ValidationCoordinates.newCoordinates(fieldContainer, fieldDefinition); @@ -168,7 +168,7 @@ private List walkObjectArg(ValidationRule rule, ValidationEnvironm continue; } - ExecutionPath newPath = validationEnvironment.getValidatedPath().segment(inputField.getName()); + ResultPath newPath = validationEnvironment.getValidatedPath().segment(inputField.getName()); ValidationEnvironment newValidationEnvironment = validationEnvironment.transform(builder -> builder .validatedPath(newPath) @@ -197,7 +197,7 @@ private List walkListArg(ValidationRule rule, ValidationEnvironmen int ix = 0; for (Object value : objectList) { - ExecutionPath newPath = validationEnvironment.getValidatedPath().segment(ix); + ResultPath newPath = validationEnvironment.getValidatedPath().segment(ix); ValidationEnvironment newValidationEnvironment = validationEnvironment.transform(builder -> builder .validatedPath(newPath) diff --git a/src/main/java/graphql/validation/rules/ValidationEnvironment.java b/src/main/java/graphql/validation/rules/ValidationEnvironment.java index c7db37f..088063b 100644 --- a/src/main/java/graphql/validation/rules/ValidationEnvironment.java +++ b/src/main/java/graphql/validation/rules/ValidationEnvironment.java @@ -1,7 +1,7 @@ package graphql.validation.rules; import graphql.PublicApi; -import graphql.execution.ExecutionPath; +import graphql.execution.ResultPath; import graphql.language.SourceLocation; import graphql.schema.DataFetchingEnvironment; import graphql.schema.GraphQLArgument; @@ -45,8 +45,8 @@ public enum ValidatedElement { private final GraphQLFieldsContainer fieldsContainer; private final GraphQLFieldDefinition fieldDefinition; private final GraphQLArgument argument; - private final ExecutionPath executionPath; - private final ExecutionPath validatedPath; + private final ResultPath executionPath; + private final ResultPath validatedPath; private final SourceLocation location; private final MessageInterpolator interpolator; private final Map contextMap; @@ -99,11 +99,11 @@ public SourceLocation getLocation() { return location; } - public ExecutionPath getValidatedPath() { + public ResultPath getValidatedPath() { return validatedPath; } - public ExecutionPath getExecutionPath() { + public ResultPath getExecutionPath() { return executionPath; } @@ -146,8 +146,8 @@ public static class Builder { private GraphQLArgument argument; private Map argumentValues = new HashMap<>(); private GraphQLFieldDefinition fieldDefinition; - private ExecutionPath validatedPath = ExecutionPath.rootPath(); - private ExecutionPath executionPath; + private ResultPath validatedPath = ResultPath.rootPath(); + private ResultPath executionPath; private GraphQLFieldsContainer fieldsContainer; private MessageInterpolator interpolator; private Locale locale; @@ -202,7 +202,7 @@ public Builder fieldsContainer(GraphQLFieldsContainer fieldsContainer) { return this; } - public Builder executionPath(ExecutionPath executionPath) { + public Builder executionPath(ResultPath executionPath) { this.executionPath = executionPath; return this; } @@ -227,7 +227,7 @@ public Builder validatedValue(Object validatedValue) { return this; } - public Builder validatedPath(ExecutionPath validatedPath) { + public Builder validatedPath(ResultPath validatedPath) { this.validatedPath = validatedPath; return this; } diff --git a/src/main/java/graphql/validation/util/Util.java b/src/main/java/graphql/validation/util/Util.java index dedf0aa..c8ad4bb 100644 --- a/src/main/java/graphql/validation/util/Util.java +++ b/src/main/java/graphql/validation/util/Util.java @@ -4,7 +4,7 @@ import graphql.GraphQLError; import graphql.Internal; import graphql.execution.DataFetcherResult; -import graphql.execution.ExecutionPath; +import graphql.execution.ResultPath; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLType; import graphql.schema.GraphQLTypeUtil; @@ -79,7 +79,7 @@ public static > List sort(Collection to } - public static ExecutionPath concatPaths(ExecutionPath parent, ExecutionPath child) { + public static ResultPath concatPaths(ResultPath parent, ResultPath child) { if (child == null) { return parent; } diff --git a/src/test/groovy/graphql/validation/TestUtil.groovy b/src/test/groovy/graphql/validation/TestUtil.groovy index 4fc477d..4fe940b 100644 --- a/src/test/groovy/graphql/validation/TestUtil.groovy +++ b/src/test/groovy/graphql/validation/TestUtil.groovy @@ -34,6 +34,7 @@ import graphql.schema.idl.errors.SchemaProblem import java.util.function.Supplier import java.util.stream.Collectors + class TestUtil { @@ -47,8 +48,9 @@ class TestUtil { static dummySchema = GraphQLSchema.newSchema() .query(GraphQLObjectType.newObject() - .name("QueryType") - .build()) + .name("QueryType") + .field(GraphQLFieldDefinition.newFieldDefinition().name("field").type(Scalars.GraphQLString)) + .build()) .build() static GraphQLSchema schemaFile(String fileName) { diff --git a/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy b/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy index d62b880..1c3606e 100644 --- a/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy +++ b/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy @@ -2,7 +2,7 @@ package graphql.validation.constraints import graphql.GraphQLError import graphql.GraphqlErrorBuilder -import graphql.execution.ExecutionPath +import graphql.execution.ResultPath import graphql.execution.ExecutionStepInfo import graphql.execution.MergedField import graphql.language.Field @@ -50,7 +50,7 @@ class BaseConstraintTestSupport extends Specification { def validationRules = TargetedValidationRules.newValidationRules().addRule(coordinates, ruleUnderTest).build() - def path = ExecutionPath.rootPath() + def path = ResultPath.rootPath() def astField = Field.newField() .name(fieldDefinition.name) @@ -100,8 +100,8 @@ class BaseConstraintTestSupport extends Specification { .validatedType(argUnderTest.getType()) .fieldDefinition(fieldDefinition) .fieldsContainer(fieldsContainer) - .executionPath(ExecutionPath.rootPath().segment(fieldDefinition.getName())) - .validatedPath(ExecutionPath.rootPath().segment(argName)) + .executionPath(ResultPath.rootPath().segment(fieldDefinition.getName())) + .validatedPath(ResultPath.rootPath().segment(argName)) .context(GraphQLDirective.class, argUnderTest.getDirective(targetDirective)) .messageInterpolator(interpolator) .build() @@ -112,7 +112,7 @@ class BaseConstraintTestSupport extends Specification { GraphQLFieldsContainer fieldsContainer = schema.getObjectType("Query") as GraphQLFieldsContainer GraphQLFieldDefinition fieldDefinition = fieldsContainer.getFieldDefinition("field") - def path = ExecutionPath.rootPath().segment(fieldDefinition.getName()) + def path = ResultPath.rootPath().segment(fieldDefinition.getName()) def ruleEnvironment = ValidationEnvironment.newValidationEnvironment() .argumentValues(arguments) .fieldsContainer(fieldsContainer) diff --git a/src/test/groovy/graphql/validation/interpolation/ResourceBundleMessageInterpolatorTest.groovy b/src/test/groovy/graphql/validation/interpolation/ResourceBundleMessageInterpolatorTest.groovy index 2fa8886..b56ea20 100644 --- a/src/test/groovy/graphql/validation/interpolation/ResourceBundleMessageInterpolatorTest.groovy +++ b/src/test/groovy/graphql/validation/interpolation/ResourceBundleMessageInterpolatorTest.groovy @@ -1,6 +1,6 @@ package graphql.validation.interpolation -import graphql.execution.ExecutionPath +import graphql.execution.ResultPath import graphql.schema.GraphQLArgument import graphql.schema.GraphQLFieldDefinition import graphql.schema.GraphQLFieldsContainer @@ -24,8 +24,8 @@ class ResourceBundleMessageInterpolatorTest extends Specification { .fieldDefinition(fieldDefinition) .fieldsContainer(fieldsContainer) .messageInterpolator(interpolator) - .executionPath(ExecutionPath.rootPath().segment(fieldDefinition.getName())) - .validatedPath(ExecutionPath.rootPath().segment(argName)) + .executionPath(ResultPath.rootPath().segment(fieldDefinition.getName())) + .validatedPath(ResultPath.rootPath().segment(argName)) .locale(locale) .build() ruleEnvironment diff --git a/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy b/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy index 30d157e..9d5943e 100644 --- a/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy +++ b/src/test/groovy/graphql/validation/util/DirectivesAndTypeWalkerTest.groovy @@ -9,6 +9,8 @@ class DirectivesAndTypeWalkerTest extends Specification { def "can walk self referencing types"() { def sdl = """ + directive @deprecated on INPUT_OBJECT + input TestInput @deprecated { name : String list : [TestInput] From 65274bbc5a3c0a22c89e739247a4bc82daec9d75 Mon Sep 17 00:00:00 2001 From: Moncef Date: Sun, 1 Nov 2020 23:46:01 +0100 Subject: [PATCH 04/65] refactor: skip running validation on null value resolve #29 --- README.md | 1 + .../constraints/AbstractDirectiveConstraint.java | 6 +++++- .../standard/NoEmptyBlankConstraintTest.groovy | 14 +++++++------- .../constraints/standard/SizeConstraintTest.groovy | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 18dba22..504ae12 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Extended Validation for graphql-java [![Build Status](https://api.travis-ci.org/graphql-java/graphql-java-extended-validation.svg?branch=master)](https://api.travis-ci.org/graphql-java/graphql-java-extended-validation.svg?branch=master)   +[![Download](https://api.bintray.com/packages/graphql-java/graphql-java/graphql-java-extended-validation/images/download.svg) ](https://bintray.com/graphql-java/graphql-java/graphql-java-extended-validation/_latestVersion) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE)   diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index 09853c1..698d589 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -21,6 +21,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -112,11 +113,14 @@ public List runValidation(ValidationEnvironment validationEnvironm } Object validatedValue = validationEnvironment.getValidatedValue(); - // // all the directives validation code does NOT care for NULL ness since the graphql engine covers that. // eg a @NonNull validation directive makes no sense in graphql like it might in Java // + if (validatedValue == null) { + return Collections.emptyList(); + } + GraphQLInputType inputType = Util.unwrapNonNull(validationEnvironment.getValidatedType()); validationEnvironment = validationEnvironment.transform(b -> b.validatedType(inputType)); diff --git a/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy index a23851f..e5a82cc 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy @@ -24,13 +24,13 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { 'field( arg : String @NotBlank ) : ID' | "\t\n\r " | 'NotBlank;path=/arg;val:\t\n\r ;\t' 'field( arg : String @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' 'field( arg : String @NotBlank ) : ID' | "\t\n\r X" | '' - 'field( arg : String @NotBlank ) : ID' | null | 'NotBlank;path=/arg;val:null;\t' + 'field( arg : String @NotBlank ) : ID' | null | '' // IDs 'field( arg : ID @NotBlank ) : ID' | "\t\n\r " | 'NotBlank;path=/arg;val:\t\n\r ;\t' 'field( arg : ID @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' 'field( arg : ID @NotBlank ) : ID' | "\t\n\r X" | '' - 'field( arg : ID @NotBlank ) : ID' | null | 'NotBlank;path=/arg;val:null;\t' + 'field( arg : ID @NotBlank ) : ID' | null | '' } @Unroll @@ -48,28 +48,28 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { fieldDeclaration | argVal | expectedMessage // strings 'field( arg : String @NotEmpty ) : ID' | "" | 'NotEmpty;path=/arg;val:;\t' - 'field( arg : String @NotEmpty ) : ID' | null | 'NotEmpty;path=/arg;val:null;\t' + 'field( arg : String @NotEmpty ) : ID' | null | '' 'field( arg : String @NotEmpty ) : ID' | "\t\n\r" | '' 'field( arg : String @NotEmpty ) : ID' | "ABC" | '' // IDs 'field( arg : ID @NotEmpty ) : ID' | "" | 'NotEmpty;path=/arg;val:;\t' - 'field( arg : ID @NotEmpty ) : ID' | null | 'NotEmpty;path=/arg;val:null;\t' + 'field( arg : ID @NotEmpty ) : ID' | null | '' 'field( arg : ID @NotEmpty ) : ID' | "\t\n\r" | '' 'field( arg : ID @NotEmpty ) : ID' | "ABC" | '' // objects 'field( arg : InputObject @NotEmpty ) : ID' | [:] | 'NotEmpty;path=/arg;val:[:];\t' - 'field( arg : InputObject @NotEmpty ) : ID' | null | 'NotEmpty;path=/arg;val:null;\t' + 'field( arg : InputObject @NotEmpty ) : ID' | null | '' 'field( arg : InputObject @NotEmpty ) : ID' | [name: "x"] | '' // lists 'field( arg : [String] @NotEmpty ) : ID' | [] | 'NotEmpty;path=/arg;val:[];\t' - 'field( arg : [String] @NotEmpty ) : ID' | null | 'NotEmpty;path=/arg;val:null;\t' + 'field( arg : [String] @NotEmpty ) : ID' | null | '' 'field( arg : [String] @NotEmpty ) : ID' | ["x"] | '' 'field( arg : [ID] @NotEmpty ) : ID' | [] | 'NotEmpty;path=/arg;val:[];\t' - 'field( arg : [ID] @NotEmpty ) : ID' | null | 'NotEmpty;path=/arg;val:null;\t' + 'field( arg : [ID] @NotEmpty ) : ID' | null | '' 'field( arg : [ID] @NotEmpty ) : ID' | ["x"] | '' } diff --git a/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy index 3c9316a..b34f24a 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy @@ -26,7 +26,7 @@ class SizeConstraintTest extends BaseConstraintTestSupport { "field( arg : String @Size(max : 10, min : 5) ) : ID" | "123" | "Size;path=/arg;val:123;\t" 'field( arg : String @Size(min : 5, message : "custom") ) : ID' | "123" | "custom;path=/arg;val:123;\t" - "field( arg : String @Size(min : 5) ) : ID" | null | "Size;path=/arg;val:null;\t" + "field( arg : String @Size(min : 5) ) : ID" | null | "" //IDs "field( arg : ID @Size(max : 10) ) : ID" | "1234567891011" | "Size;path=/arg;val:1234567891011;\t" @@ -34,6 +34,6 @@ class SizeConstraintTest extends BaseConstraintTestSupport { "field( arg : ID @Size(max : 10, min : 5) ) : ID" | "123" | "Size;path=/arg;val:123;\t" 'field( arg : ID @Size(min : 5, message : "custom") ) : ID' | "123" | "custom;path=/arg;val:123;\t" - "field( arg : ID @Size(min : 5) ) : ID" | null | "Size;path=/arg;val:null;\t" + "field( arg : ID @Size(min : 5) ) : ID" | null | "" } } \ No newline at end of file From 09d3ddccdd7a1ab637acf3614aad996017f80c64 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Sat, 20 Feb 2021 08:42:08 -0500 Subject: [PATCH 05/65] Adding Lists support for @NotBlank validation directive --- README.md | 2 +- .../AbstractDirectiveConstraint.java | 12 ++++++++ .../constraints/standard/NotBlankRule.java | 28 +++++++++++++++++-- .../NoEmptyBlankConstraintTest.groovy | 12 ++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 504ae12..fa649d5 100644 --- a/README.md +++ b/README.md @@ -389,7 +389,7 @@ The String must contain at least one non-whitespace character, according to Java - Example : `updateAccident( accidentNotes : String @NotBlank) : DriverDetails` -- Applies to : `String`, `ID` +- Applies to : `String`, `ID`, `Lists` - SDL : `directive @NotBlank(message : String = "graphql.validation.NotBlank.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index 698d589..d268689 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -307,6 +307,18 @@ protected List mkError(ValidationEnvironment validationEnvironment return singletonList(error); } + /** + * Return true if the type is a String or ID or List type, regardless of non null ness + * + * @param inputType the type to check + * + * @return true if one of the above + */ + protected boolean isStringOrIDOrList(GraphQLInputType inputType) { + return isStringOrID(inputType) || + isList(inputType); + } + /** * Return true if the type is a String or ID or List type or {@link graphql.schema.GraphQLInputObjectType}, regardless of non null ness * diff --git a/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java b/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java index d63da23..0a89894 100644 --- a/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java +++ b/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java @@ -1,5 +1,7 @@ package graphql.validation.constraints.standard; +import static graphql.schema.GraphQLTypeUtil.isList; + import graphql.GraphQLError; import graphql.Scalars; import graphql.schema.GraphQLDirective; @@ -8,6 +10,7 @@ import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -26,7 +29,7 @@ public Documentation getDocumentation() { .example("updateAccident( accidentNotes : String @NotBlank) : DriverDetails") - .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName()) + .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName(), "Lists") .directiveSDL("directive @NotBlank(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", @@ -36,19 +39,38 @@ public Documentation getDocumentation() { @Override public boolean appliesToType(GraphQLInputType inputType) { - return isStringOrID(inputType); + return isStringOrIDOrList(inputType); } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); + GraphQLInputType argumentType = validationEnvironment.getValidatedType(); GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); - if (validatedValue == null || isBlank(validatedValue)) { + if (validatedValue == null) { + return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); + } + + List validatedValues; + + if (isList(argumentType)) { + validatedValues = (List)validatedValue; + } else { + validatedValues = Arrays.asList(validatedValue); + } + + if (validatedValues.size() <= 0) { return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); + } + for (Object value : validatedValues) { + if (isBlank(value)) { + return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); + } } + return Collections.emptyList(); } diff --git a/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy index e5a82cc..0dd29d2 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy @@ -31,6 +31,18 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { 'field( arg : ID @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' 'field( arg : ID @NotBlank ) : ID' | "\t\n\r X" | '' 'field( arg : ID @NotBlank ) : ID' | null | '' + + // Lists + 'field( arg : [String] @NotBlank ) : ID' | [] | 'NotBlank;path=/arg;val:[];\t' + 'field( arg : [String] @NotBlank ) : ID' | null | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x"] | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x", "y"] | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x", " "] | 'NotBlank;path=/arg;val:[x, ];\t' + 'field( arg : [ID] @NotBlank ) : ID' | [] | 'NotBlank;path=/arg;val:[];\t' + 'field( arg : [ID] @NotBlank ) : ID' | null | '' + 'field( arg : [ID] @NotBlank ) : ID' | ["x"] | '' + 'field( arg : [ID] @NotBlank ) : ID' | ["x", "y"] | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x", " "] | 'NotBlank;path=/arg;val:[x, ];\t' } @Unroll From df6b29924cae63c16f5627bd99b169d1a088b631 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 25 Feb 2021 21:46:40 -0500 Subject: [PATCH 06/65] Updating graphql-java to latest --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 62b04c3..f5b67db 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ repositories { dependencies { - compile "com.graphql-java:graphql-java:16.1" + compile "com.graphql-java:graphql-java:16.2" compile 'org.slf4j:slf4j-api:1.7.30' compile "jakarta.validation:jakarta.validation-api:2.0.2" compile "org.hibernate.validator:hibernate-validator:6.1.6.Final" From d11487b7fb6e5cc24746465e99af52acb37be95f Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 25 Feb 2021 21:46:54 -0500 Subject: [PATCH 07/65] Updating hibernate-validator to what is in springboot 2.4.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f5b67db..9ec2163 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { compile "com.graphql-java:graphql-java:16.2" compile 'org.slf4j:slf4j-api:1.7.30' compile "jakarta.validation:jakarta.validation-api:2.0.2" - compile "org.hibernate.validator:hibernate-validator:6.1.6.Final" + compile "org.hibernate.validator:hibernate-validator:6.1.7.Final" compile "jakarta.el:jakarta.el-api:3.0.3" compile "org.glassfish:jakarta.el:3.0.3" From 7683eb45def98319834bdff84cc9b6dabb1b07aa Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 25 Feb 2021 21:47:10 -0500 Subject: [PATCH 08/65] Updating groovy-all to match dep used in graphql-java --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9ec2163..6b7a06a 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { testCompile 'org.slf4j:slf4j-simple:1.7.30' testCompile 'org.spockframework:spock-core:1.3-groovy-2.5' - testCompile 'org.codehaus.groovy:groovy-all:2.5.11' + testCompile 'org.codehaus.groovy:groovy-all:2.5.14' } task sourcesJar(type: Jar, dependsOn: classes) { From 5bb11a966f5b5cfa83a059cfe8569d53138b376e Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Tue, 30 Mar 2021 10:14:11 +1100 Subject: [PATCH 09/65] Updating to GitHub actions and publishing to Maven Central --- .github/ISSUE_TEMPLATE/bug_report.md | 14 ++++++ .github/ISSUE_TEMPLATE/other-issue.md | 10 ++++ .github/workflows/master.yml | 23 +++++++++ .github/workflows/pull_request.yml | 21 ++++++++ .github/workflows/release.yml | 27 +++++++++++ build.gradle | 58 +++++++++++++---------- gradle/wrapper/gradle-wrapper.jar | Bin 56177 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 53 +++++++++++++-------- gradlew.bat | 43 +++++++++-------- 10 files changed, 185 insertions(+), 66 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/other-issue.md create mode 100644 .github/workflows/master.yml create mode 100644 .github/workflows/pull_request.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..99000a4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,14 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Please provide a code example or even better a test to reproduce the bug. diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md new file mode 100644 index 0000000..774bf32 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/other-issue.md @@ -0,0 +1,10 @@ +--- +name: Other issue +about: Generic issue +title: '' +labels: '' +assignees: '' + +--- + +If you have a general question or seeking advice how to use something please create a new topic in our GitHub discussions forum: https://github.com/graphql-java/graphql-java/discussions. Thanks. diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml new file mode 100644 index 0000000..bc9d5f8 --- /dev/null +++ b/.github/workflows/master.yml @@ -0,0 +1,23 @@ +name: Master Build and Publish +# For master push: Builds and publishes the development version to bintray/maven +on: + push: + branches: + - master +jobs: + buildAndPublish: + runs-on: ubuntu-latest + env: + MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} + + steps: + - uses: actions/checkout@v1 + - uses: gradle/wrapper-validation-action@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: '8.0.282' + - name: build test and publish + run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..13a366a --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,21 @@ +name: Pull Request Build +# For pull requests: builds and test +on: + push: + branches: + - '!master' + pull_request: + branches: + - master +jobs: + buildAndTest: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: gradle/wrapper-validation-action@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: '8.0.282' + - name: build and test + run: ./gradlew assemble && ./gradlew check --info --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..b61d755 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,27 @@ +name: Manual Release Build +# Release builds +on: + workflow_dispatch: + inputs: + version: + description: 'the version to be released' + required: true + +jobs: + buildAndPublish: + runs-on: ubuntu-latest + env: + MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} + MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + RELEASE_VERSION: ${{ github.event.inputs.version }} + + steps: + - uses: actions/checkout@v1 + - uses: gradle/wrapper-validation-action@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: '8.0.282' + - name: build test and publish + run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/build.gradle b/build.gradle index 62b04c3..fb07d38 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,14 @@ import java.text.SimpleDateFormat plugins { - id "com.jfrog.bintray" version "1.8.5" + id 'java' + id 'java-library' + id 'maven' + id 'maven-publish' + id 'signing' + id "io.github.gradle-nexus.publish-plugin" version "1.0.0" } -apply plugin: 'java' -apply plugin: 'groovy' -apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.bintray' - def getDevelopmentVersion() { def output = new StringBuilder() def error = new StringBuilder() @@ -25,8 +25,8 @@ def getDevelopmentVersion() { def releaseVersion = System.properties.RELEASE_VERSION -println "Building version = " + releaseVersion version = releaseVersion ? releaseVersion : getDevelopmentVersion() +println "Building version = " + version group = 'com.graphql-java' sourceCompatibility = 1.8 @@ -34,7 +34,7 @@ targetCompatibility = 1.8 repositories { mavenCentral() - maven { url "http://dl.bintray.com/andimarek/graphql-java" } + mavenLocal() } @@ -66,6 +66,12 @@ artifacts { archives javadocJar } +test { + testLogging { + exceptionFormat = 'full' + } +} + publishing { publications { maven(MavenPublication) { @@ -112,24 +118,24 @@ publishing { } } -bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_API_KEY') - publications = ['maven'] - publish = true - pkg { - userOrg = 'graphql-java' - repo = 'graphql-java' - name = "graphql-java-extended-validation" - desc = 'A library fo extended validation for graphql-java' - licenses = ['MIT'] - vcsUrl = 'https://github.com/graphql-java/graphql-java-extended-validation.git' - version { - released = new Date() - vcsTag = project.version - gpg { - sign = true - } +nexusPublishing { + repositories { + sonatype { + username = System.env.MAVEN_CENTRAL_USER + password = System.env.MAVEN_CENTRAL_PASSWORD } } } + +signing { + def signingKey = System.env.MAVEN_CENTRAL_PGP_KEY + useInMemoryPgpKeys(signingKey, "") + sign publishing.publications +} + + +// all publish tasks depend on the build task +tasks.withType(PublishToMavenRepository) { + dependsOn build +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea141f55e3b8fc691d31b5ca8816d89fa87..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 50929 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 delta 48256 zcmY(KV{jlr8?Ce9#YA5-<#)J#`*Ro8i^ z&vRyA8tk?O3_?)`3>+;{$rU{w2Ne|!1myd75D*X{kRHr23E_X0M!cXLy76d#bH*t) z&MEe-)2-7tkpJ@zBKW^Y?42wa!T#^P_%-xz{~0h5{2M;z{~eKpQ;wD$0tAE+1_XpY zG2a9uQT`hmz+hr)vZHnh9O6p4s;<-~DDrUpoUlZTYh^n|Inb#y9ZniVtmDHfb(Th!dtVlw zI|D?(8)O&6?>k8li_oRG_Hb6zE0LEYdziBaR~UpTFzCeposa>%J}lDMvlvW^xP8%| z96Qx43ZfpncDxN`(58(>WGn1PirFD|9Oj=kO&DWpH$(F8@GGXe*S{EAiizC%;*6NV zV=P0=6_{R(Z^a;~&5pSSj+@MHUZt(lbxxMdvdQwB(p4VCmgWb&<*3$ZwbO}n*sF~j zEXzH!0ZM!A^K+Wkgb}#~hK&d2Qfu*Hb^1)5M7X~VtITjiDf26fxYo)V(Z}vYmj2@? zEJp_)Gqc!JW?1FsBbVzEQz4F$TsA{~L9Oy`VylzS(z0wJ-GOU`su0VaRkQJ-dfSoV zRV>@ws%(_%Y}S5x3Y#cGiuMCHhh(2QHoK(=v%KPBlvcfy&pH>DmBxCILxCY8Bs$&@ zz!YMqK$I#}zCu+eC}|6Uz8UAJ(nr6keiNekv@3^gPwjzwP33`kjm&P{6r{5fqz{(O zdDI!Hi`E&7`280Z0kSS+6 zGp!fDb())MX-vK6qW+!|rq1F$HlMF8aRqh`XRQ);(^13?68^Rhfjrd<#!mQRw*}VU z+|~r6_r$lbPMz;Rt=X{6|pOXdnBzaK~8X_q;a9a-Qc9=lb!a@Sz}gI| zZJL6Dj_^OCu=vV#n1t0`(yoYk(oKWo>)CA6dJqlN-|&@}IrM{jA_R{KfI}MYK26&N-|4KV*UljZzM zWR4m2h<{L#Uxs5;B6}NOwEW6!fSJ9Y^nEaw5ZPF+>xvlNTn(h&Aug9#edz+n`=O6!9M}l#Qn_XSR1#D zoPfz-}=i6t7_RTu#nA{scW)En-8N=)yVO` zKIzrLkrD!#=Ixqp^u2`F=i4yEZx@P_wB*wM`WM~*I^E^jA_~ID$7B{3c==(A_p{9I zY!~c*&k*&$?PbNuv>Oo=1Vr#(17ZDNQ-n^WS-}F5RrKspgwXiFl7`Hz9M$TUrR{9= zDjF7REq_pen-~krCR(E|lv2wYPPv7`1tuAo?k9GyilYL*1jap}%21@Ww?f<9|8PA| zw>w(^f8UG(y0t14R(SELL4r#+&P}AW&r$obVwjhUE7%lYUha5H%!8|yJ zv}pjFW|E7hDnIBJ10_5E;9tT%hFpiDIbJmM4d~T?HWEUi{>FEK-cY}DP`o;833Hj< z)uw?wQA2}PgY|5s4O6L+S-R7S;1Jn+M!$9mx-%H{LzCXt70}D;uUkd&%A9{!W}~bV z6o<3Xum76^?D~;431q6)JEVSttK3evuvY_Q59$Y)MfUJW0=r1PD~R8?s5L zrqX+tj?ZEm8crOm{dYRAa_F1L`lOhY@%gub5RKeCOLWm{>06huy)n3bffDml6Eb07 zLOZjvLODy6taD#Knpof#!bY)R8pj#2VMAMGalffKShg&C+nES0ye` zmNs^V=OkO(s^F>R1YG1{?WoqEi-9KEBjPVehD6sfnZhucI>%(XhVq^Ny?6e*buOTf zZJQB5Kw|L|^N=ZlY%OR*v=z_4epbya+R;Ipj`UcXaI3aHM~5LaoL;{N$e81US#sZDm?O=+;&-LrAEPWK4eyo87+Udn&iBS?7V)TZ8b&X zA9>p&UPyowas-zXvDst`C zK4_9OvbRtUqHrp*Dm3uW;B{aI?8OlV^=MMf=S#EV4Me}dlx@cQe}NZICy9m7sjJAy zYFUpngI#lwp~W3F^e5>omeay(nT=Yj^p{jI9jXH=%aF5-7qVLR<96qp8_8skCAL3` z`;x>}GGwjTi-(fbU3>9EY*|eciQQp{>bMUaN3O!w#)=Zrz`eHyU&pqn?H9wn=Y%$7 z+5$4Ry9eIipTtQJUGPq?xya(=gU9pT6;QWPBpQZwO|1DP`T-IPqovE-Ne+ggXbGd+Abv0gk7 zSC98$Y#IseEVwbyKKS9p(%pHqIPPA`CZz!WbD1x9iK`Ucdc8>tuG+z6(F|_%{37iM zYB~wUaq=aU(sOl%K%2sxmM@V>~Y3qLSlbT{WZBprPWfJ#pc*Pr6Oz zn;uyoBPz{gG)qW^e&%fM);2Msm*l2}tV1EbiLF|o{OeA19F=aY(wXxpx|A1ZtA3#LGK{qJs;JTIe)}a)K6v9?CP=eYx*4L~e0ZaH~4iFUNH%0;uOiN;)svxvFh z3=fhC4iFnT8%3w9VDuCgoWghB7lA3NWDcYgWysPRpLsqPNC-~s*b;*DAxe;J z4~&uK81`fs)mh}iptvcsCIA|L#DvndNowDyCiZi|UJsfy?UtQHw?@(KDkk7IY$f1( zsLwJZs#a%uZ^gx4vL5QoxQ+c3?;*dMHyR^Yv)SWov)n`VSWob6$n{8;$#lzJm{v4$ zVxom5E^?5n=giBHH%}Vs*COIIq8xz0)k)Ib zq@WMkv>2mq--&~w^Hj9$|3zMEHk&}qWffi+^%FfLoqWJ!ECG2bY8+Xnpu%08&0_6l zGcEY!HXu*Ka|GvblAN}MKQ z48MUx3+fW(3>`E233I*j7Xk4W#;LGWC8C6U6W94WinR{&I2ugp9ULir6xR^Lo;cxj z!TkIh@=i{~u#5B?%Rco58J!Qzj5c#klaHjXOhSK9xth1mC_At`U*j0QW-TQ>J=ewZ zOC%{bc_T%3^wstd?WaNNj#A>ctitdpSuOS8I+M{Na>NNzR_Cud-zm7d)(M`7QzxAZ zX~TG;D)X7vEW*gMoPi zocF2>n@N2#FBAZFPMBBW{R@8v+z6^ZXF3j{f?`Pij}r=Lti8aI->#$l(x>BOo-*uX zYB;y^)H#<^pxJj@JoKKj3rF^reDjOK! z%pcMpy}py-+sCrlmKw`WqC;?)AZPOzYS%aG$(ze+WOh88p9_AiuH~0yE-sxym!zf6 zK8>nOC;0)e7bnZP`ET>VY1)Us&XKjR@RvyP45vg)MjhQyHlx!pRIp)SzMGq5htCZ=K%;tQs&rQN2gRnGbdNK*G zsu}x4lQkxztYMt-!G`6iQJ$c%_VM0rd@9Elm3Rc;2WRq#+i?`w;u5+{?E>u33XS*%4Kcx>WN_v&68A9LL`jW3xZ9Cy1?bXS=0x zSDH>hN@c@P!+6PYt7@~wwUJuC*Q<@tj@Vr0o*eGS-HV) zI_lzluN?MCLQ>Dena=GCp5y!Ei0*XE2!IpVi&@*ILzmX92!hd~sp>=eP3*8c;*`~= z^<)Av{$tp&(=ba=kq>Vbv7$Bbuh$x*0n!JgB#-~SEhX2v1cc9rIyTBFm{{v2JTyR+CQsDs)7+BgnQZGI<^ z|BB-SPrSpX%F3!2mf(^C5n9w~pjeWr}Bq$hjaK%Mk65Ww@3Qku~IJ>1dzBZdZ zZ6o8vdq7Dtw|qA&<`{{|l2ezXkO~g4WVMKAZ)uy+AApU|a`JP(-MyhlD;Ia#cI=`F zL?A#WV+Hhs$}fs%XR14v#rLv@a-_{RYKp2rETlk&i23XOI4e$Wx?k?L z$U9po&Ch-~wW7IsA5{1$t0sORu-Oh)x)#@(uW9$_#AUWCWW}ms<(B?)s_mf^TfKKn z*Pe99Edzi8Go=K((&zTV%x=Kln4RvyKONM6FeW5fjWyxyrMom8#y1VaH>Pr3pyq3v zRQxSmQR)ajGtbr|e9oBg#s;@r$?0EvK-TTA@a6b}`^`tOxKj0`KfKG9vpyBNl)1eB;00-1EZD_dA~@~k2fy${S?^yGno>`PW`9~p zzvW&D_>U}qN;qDtT@y$khj|v_HhzZH*_oeaPIX7Mwq0AqsV6NrE4O`8Fi&N_0u5e#@!-olUmd1C^TXulTK;5uI zI;c3j!(U>h^-u41SzTHa!CfD7M7xV%ekBYK!Q#|TYzw0MHc{0MYNOod=lV;9Czj{Zrdq|sus*qPKs=Y! zGq&}7h~Y^VHkJa^9*WV3ubc!_wIUipjdtDU#6s>ke0J!>24w-2TVO}geFIhx33(^z zc3dX5As@hdpdg(EJx8^X@?@33D%JINXcK zB{nf&+G`sHxA>O1iZvB~ft58jAWOh2#FbkVM5tk6bdP2e7|Vjl-$%1&RlVUKC8)La z!5Nd2+=d1lbh62!nHG4#!xW+W6}ns znPL$L7e{^}_^-QOOMLzR*zwd}MFX9XARyt1^&~ui`i3*E2KE=e*8KV%x7+4mb;bs_ zl+IXqbrXcLDe8WkW1I<()nVFiXsMO?@UB~HjVg7=$!bMO=vL6;VD_Yz*?ImS*;W>1 z3A_F`;4HiYH<&l8nEGk{-=5vw$VXa($|d-{r`@~XpWnN;dOoh*0g#*T+w!}_Syp|4 zoRuj6qa|mmAleBVZ?+(w#bTdo$C)|WVq+PVGCk%Zb76`WygCa*#g#57ejTc++Wao- zfSh5a@lJ#js6kNaPa5c#GWLUnd5)c^iE7Q>RFoIy?u1^A+h(jqgZKD>Y7a<*l^b~Y z8S9r4!I9JO{DYHF=R%2@69q)XlN_{Dye>;XpP8lQY|`|u+k%Vb6Vy(mM&(v+B$xH7 z0?qQaI>Dv#ucnybAvk-o-o`Xn_X9(E3&}7P-N+px^q_LPu9q?q_aO%LD!(S)D z%61T!os8KGecDsenbx^3rTC{-q&9P54M$@7?PLKx%YBX(gAAkdgHvCPdXf@{)fwk}4LBs$P?mI(?ioI6<2o#Qx>kOM-q#4B zzquKsYD0Uy@8;cUdZq69jcn;@O8*NW((;~am#ytA;i|p0VYYBVf(3(kc%`kE5bRV) z=Y9R>v3F4Pi#R!`(;nk^c+!bz81nn>6MetN06P4P)k}+DfNPT34oO{DX(!u3n%`1k ze7%48<(oC$o8}`NpOkYk2g`gek?siHhI*d0bg|a-6uGmJHp1FZF@B}yB6}8~RIk+z z9Fv&&`*w=(0hPlHB=02^WRiQOe!l**p1ZhJZoc}3y68`m`` zRLEw99xL7o2TTsDuT_#7z10gbWhqJMjhZ?M<#d<6^VbSUTcof6jzs>H$ z;Xq-7q{6K~f*X_+W3XQlVsPex>IrXu_QF=vpxIhzfb4cXl0kFX+zeQvtvYJFu>HAS zG>LAo!gx0crC{!tJjo#yt)Iu)$ z>hE}y#Z;mbCxi~%xh=pf$*Q{*iNf^+zx|@H!$fVlc ziDaIN9LgV_r5}4N;~o5_Z3Mek5xjEeV0kCpqBAXsNM~z*zhwa1h(Ux1g9W-B?SI5! zpA1o-?qnc;2s80UCU%#OE(XJ+qI##Q4s3O87p-uqbb14M1+7nG$B$y6pFo>Xm zstGRjLDRX&L#jqE^yNz}^%KwK6LP%6*-usrQw;k;!k#`5>m=<#B6@e;3d`nXc)DSj>Hy=!Haw(5RvDJl_JG5wUbdu^!Ev1J zg?ImKq5=Z8EF8kx*5tBt$*ZBM=Y$j>7d4pv$^$V-VqzcYA|6?UjS|!~j4}u+cUaV( zmS00g@VN)}BPcC-Vj>KjF+rm6BWzLPY*F97`r`Rz23}A)#5dv);au=2&wcMfz*M4d z!M|Q(DxYUb`|xLdz_xViIv)Nw-4BAjoe^Psjhd(+^5$=QxV}33hzAgSpssuUG_LLC z35)4ga7v1@W8FY2yAY&S`KvN>%dqn>K zjos|0F>tScOd#YR6ZkJ6o~I@Sh~1*v7g+^i(4=)F=TR^%Wf;-I1HOejD1pY`p{1Lm z!wtvag+}9VV1xG(SoFHPc=Fzf7 zb~Xcsv-42L_2nBSD$9-kTF=ol94Uum@YUpUOZ?gx=5jQz$V$S6s_(+BbBW%;AOLG` zdwf27(|M%%7gWTXH{RqseLMME9;F?ZPorDYNEg2I%yECH4(nCcnU?XEWyptb<#?QA zhrSl0xB1xd8|6%uYFjB#3puex^Sr!Cn&Y-LpdDQ0o|^dv*L5rED>|{HL6?bILVJ-p zGyva-GAijYMl^$Y6{19bvD`_5sTrb4o1V0*G8g-;p!TBJI!N*gRkWWLy_RVtPd^p? zh6B8(U4>@bSbm7l5)O<57#hhiOKlrLYA?{ZMPLo6Dn0L~Ilcw_jqYN2L=pZ*+Fs$` z6znWkT(GywSMUoMpVB!48_wZt0!C?JJN%sC>K4@NFp`wSvM!rkCBkj4(r_y71-6&r zt6)1_P2K|A!nm=gKOg4tttDh_f2c7%C{ge(**y#+b+sU%CWP-uJH~Nyn~ArRdO|+2 z{TieS2{cDTq^ba1K|+4Was?ps+WLHO5rLI7w>USQtN=n?f>a8s_y$ckTt&wzRNX=t zW&=#4Qcy!iRH7T9N)aY5Mf7yxj1-BK`a)4AI#-Kuv^MYek1B0yZLGU*sk z4R;*wb*ODdK2x)kfHP_66$uNCxm%8AJ0I5EUD9 zQK-@l7X`#tXi~Rt#)hKFdfwJWaPt=ID`h3x$BrGDIK8%E=HBcl(saHgZ35bT2LKI! z;7o-FXs*hwr;pGO<}Epdf%*+PdghH9y1~Fo*GovzYYFC#@{Qf=8@}gD5${Kh=|d6b zPGVH|^$;T3hvK?Zs;=MR(AC|m38P=Ze(6hkK(6;Ktkj1LdQX4t(H$;&&(O8%2LYgX zBY_U~k|=of)OD4eUnBDV*6~EJ4$Q4AxR%*J3%VQB{$g}d708Dw^s*&ewI3p_k7xHE zM_@^*dq`s|lSm8^%nR#mw8`t@SzJm#QppxyYpm_CA%fM*f}$s(*+2;wtEvVie}oSN z%|UQZn>P<7VJhU{a$5~UJPj=jQJsgom=oe7h<|6DHHj8S0j(4<_aWm%0aii_#cxb? z2?;s&`>vkcdKxe0NSSbsun$xW{XYAQ6Yb8te1bkI^kN_uSx>UPbo0jh!qWQe;>-FL zDsJ1xL}-o4$V3IhGfS4RiGQxO5h!5!XvJ4raN4BJYcw!7-kc6k)bNY_8b{_3@V&KVPq{_DuxJ$rBjVf!O?6O^w&w{daDJChR_tqw|B-lGHc zlOGE`IbpqtkE@`KkXE$5XG+H1x$+%1-jO!ayfJrKq0eB|W7Qx1BUw(|(C%}{xqMVY zV>;|qIK1#_L!Cx{z5h#em{dU;;QYyvy8(GTA8*PEcTN$5gcr2%} zg}}!&zBxNcr&ItPOSKf&iw$3Ts|%0uM^!YP0&Ndn^K`!(__@|usH9#zVN~kLjKTJ3 z#13QSLf1AeX>S8IGAqq#Zy@?*r#B$$FG z-Lw5n$Qge;!O{pdh0n9A|S_-x+=Y-+)>%UWVj2{57E_h0lxv z)1L&xvY!zHpfQf8z=$M|(5whIBgqRp%FrZc$X{SkYAsX3t{P2?=S#A#GR3wr zPF`Gb4l=hkZZ1PzUC$peExr+!7FNEU)K z%LUSqnG7T;A1pt!&5;CTw5jS+)W!48S5qQ2dMgky{R|?NAQ^TbLg7LD!e~L2s~T#) z++)}ZiNE-fSTymhI815fNk6~p8lhPm4sT34p`=?ACYP}qwShKAb8%qKz1KM%EDVyole(~b?4Z}Ab z_W%^XnsKVrSXH5EL?XdNeDZgiwN|&&F((SP)Uee-ML~?7ZB(bS%vHI0$#Po^K9{Lm z&tWmUv1WVgpMc3N4c;)SGcKv!3hYfLF5OjCU;_u{$w^X1`>Mg{?Htz8>M|lSmPR$j zth2|#$pL5Utsve+yiuXs3_`=Ceq}3ky*;=Ay5mnk)YhNG$?QF^40pa&P_%)TfD%HN z2}BL#>Et7?W4Gc}Ck99SPZ+(~)Bc8=i0wYr@NuDv3@(pb>_*PO%gv>ODjv$?qqVM1 zzyiKfBXyt@gJZbxcb3IIG=XhJt`gQ3Wbg0v`1y~ug;@m86HfMd?#R~fJc6ZXKA6>` zsyYGnkrGu4eZqJVdR|6wBZzmj)9D*8-!unZ-;zEsvaX}LqOye7uz7g=d8&C-XU9cs zrBbX~A3$ZfVi`wW)msWTw&NYo5o2+lfRQLi-g1evJkR!*Y1fTqhhN{TZke+EH!k-- z0~uI<#%G=g+h9g#GcA{)=5~qQ`vl@{d7Asgvh32Ax$~vY)0B8$S^0_N=DK&^74MZ% zzxy2oFEH+m1Y>F_1)5`dIGQmqX+X`r>*ywTVqIUdwR)MSeKZu>%zs_)vG4wz0p7t8 z(vRy8Ir;Q~JR_uudJLU!9=jt%Pa?b4f6Vi<-t)7%#y|bDe951ooS)Q+knS2oE?k4a zU(tM0*yROz4GZ!1wavj&_q}Q|0zvRYU+E;U1_nv$IYk`NgZS9Pwem}(k{%pxALR30 zEJ4kx33@0Y%zAcI-oAH=kayqx1&Cu6t`zb~Anb5-sr%GWIsuqQDX!AyMFSeElQ+I- z>KE+^3Z<=z7j)r?5=D_DPwGj9{N_2`F;+ z*e~AEnQ^5g#c5y85UTp8-a#zmhu6msiv$^LF1$g;&s*ti&kz?_+GFNbb>~wpbwTv2y^(u~r2GXSfN6%%9 zeWUCZfp$}n+^`3~Ia>MX*-?8p#6@2%PA~D^y@jabw{t^f{}b%!ehFRV6RUo8wF8XJ zi_KH>O8~VlxBmpp+T&qe(GN&P>5iIBWg38B zqCHLGnXj=7IH6vo@pxU(tl33}(SNOiBmcH3MCGy6_<(r0QHgyE9@!WE5~ue)O1iL? zH+ajva9GOs=TlLghPVUDCv&W{lham#v=p5wlibOIa>sXkS7{;)<)~nu1>=8l4plj$ zUz@bl)}Ze&Xbbltcy4M|ZlJaG_4@Au|Ftb)*RT_dOi&Yp*}MLq>@Uv-B`*L40>Xg= z0z&ei4`{)4sKl(b??AT3t2?d+`rjP3d8)fM$4v?`xp|y(iUwsJt&AW}SgEU|jB$DE z5hf`x7dpA3@DUbc)^X*OhNP5cq?Y}LS|e&!`ucs=S97J1--@gq{>4?jyfa3cz12V176?DP=lz<$HpPA{wpw5hkx@Yn@fOUD z^E{QDXu@06Q<s6(&8nl9 zn7P|EDkv=@WP`++EA*5nw!`C~BZ=y6TA`Lt)X=`>j-jkG_LG%IuW&rGfC50%ey zg5g}vkv`HBE^t~>&n-@i=PA^O#IqAJnF7MBl7k+l*^P~Bv+J`+;+ai7JSi*pqe5yA zaB{tklX_;bHM?|8@z?Qy;SAt+8;t$a9AmOQpAI# zU>9wrRDV`H^#9={zrY=4PaOThYu0~fD}V?<C%?4L4J#j$l z0-Zw^VdQorg!oeW{Y3epHDFK#9muR%i9t&>{&TXc_gpN|Ku)UIzRqGgl#bTVs7sCS z{&CUMZL2t%w1l}P-`g)8+SX?MID@?mBAYlV4!?rl!sFfbOy-wz^1YGoxMfv5(5_Br zwo&zxBbu1gYFG{`Oc3QIUq|L(QlK?sXPZ-P?wA*WxTD*W7N!MvsVmL%EQ^L;d5Hb) z$~e<|njWQeNME1xEczDl4xn-z8#gzE*R^k#j(2k$XV@-=zphBQA53A7NuT06FaL~N zW>+v-S})F#{KDTd zBQ05V-aGS&i|$oOuOd*oL@&REA|^r_N{y;cZ9nu({p9StDT&Bvp4W>%{plB6;n~G$ zn`P=s(;}b>-zJ7L>r4(g`_`PQwId|9XwdCCX17LX*M84zTMpF+9HH5%^6cS6OYe3yFNBNMg&r2>dvx+Mx#1GXZujv@6%pjh^}uO$-z2oYGZruyph)G z0*BQXv7ITeU?hWITdM;Lt#>v8+Idd8iMkwM@tvNK^kX^LK?#m#kkZTqIYOM+v6Dmz zyoirXPAz%4to`@BUT|@M_1|Zl%b}|{dx33*!-5AzEF)^YP7mZckuhgWYLhXsL4<4x zn;#3~mKSXiMN!2kuMPXwWl?4enq4(fF;-Q(0dbLi!%K~A$F>d)2S#P%*i`x1S+tFs z{GHY~iIL}8N(&36gUQS__^I<2w-GQl5?OG3X1Wq3%<7Ptl|?T=o71;SkuX~Sri+nE z^Qrw1ejqi~&481j`lIg_JLp?Ij`xuECPhM<-opU`Q^03Z7RCV<3Zk(lZ-no@V^mlv z6HU&*w_8wzw^g2T!je+z3j||>{36%I-@&IJJno@CqJEGAo58+=o|^l00dqkf;O+?u zyJ4K+$WbV@T1vg&*6|DEzIw5aXct@H4h~@t9?`R)yhF<_erWs@ejqPW+gxhV>4Z}# zWvb?(X}>eDpY}ZhjJjsDADYDucbY+2YcFDnjj0Gb zR{(Z^FqY(m`ufOdzxg8~-iGv}=L_`zH)QY49&H)^{lH^N3j#v)zq&U3zrZb&q3RL- z*O&8wUJR5lQ7@B%sVNFO3K~4IBr7->9GIGqlzu`W?(H9ZGV97_%__ZRwK?wdejzng zlpmnW{5hXoe&wm(F50T>HuHUyg{(Acwo}K|!a!KY1srQ@)8K8`qPVuQVhsIVE zHoE)8#Jplp3QHatp{3rQkTZ)ODXHQ&wv2=m&ZZ@*8SOZPC&l$XQK_*fp87NgsE7BW zR^vtKJFyd<{=?`5`enCL4JPra6pqD{xtDt?MYSkSm=oH~sUf#003u`Z-$h&fVK#mJ zY1&S#>P3&_RC6%QW%mQ4yVe{4PKuX0LfdPJ$GUUJ*E3(@4iUDfaMq80mtEZ^d=%aP?fj&W-s#>e3-Qt6+BEQ59m;@@Ju=dN5v#GNp{mhtH z?BPX;(Gp+PwgNvW31u{Kf+CfZGf%QIRU=zhokwHC2{0cUE}NS-7MH15B$4;RA;BH! z3!Cd@rC1mqhX{A=n>W^+G9zMA#Y7uDV8++X=!OavPpf|H^PsEi)5ZFpVfOfFPS>*f z9XFySK^BPyK=1%2{cizHV$qBvE^60SCD@@!cQ5>QEcS zVuo0|L9P3YeR;p%mLT&o)KVsW$Zj84vg@RC{@RhYY*6x_f$1X`-`FrQ_vOW@TbITd zz%U8}U_s@~CleB*3m!JnV#Xb0HbHe4z8fVIL%QpA)+@>K*-ZI(=;+}#*=s_ou*a>V z{eZs~S@Lm}M$sCH6uy%ne-~^?psu^nmVG+B^$=>49OC9HOQsxmt2`+VKB9&8f{x2{9`>-Xx?!hyESP~@9<{CJZP^;2 zf!x*igbXK3YOal5T_+%8+P)YS0$QK8%G+7P(Ucs(mcmRqxnXX~PR9}r$>TFz6(YGQ zy;ddM^#cVSJEfSNGw{3nuLb4M*=&lH;<+&J{nuN;*^ohc*}(Uoap;YqGIUa}XPZgX zWvIzUc~QeUL|+f|`aI@z5kVlOJ)cSd0d#QG4?N|Oa7os^kP7|Pf{Fm71im}oLHw|4 zn4tK@A8v<7|Da90W;1bJ1MXxVbstBDklSk6&_2!DFEAg^^UOZ$#h@`n{X{0~USw9U z*fDg(T>M|G!{#oHE>~@nb?A07)RNGI5;8~&G^Sz!cuk2B#QQ2zL^AWomER!;iE zimB<68wA7xp$(i8il%35Nl_yT>CD09G$xR;B@?6w+FI2rMd>tCO+QstAk>acGewh` zd`qm0$nvZ}PuobLlJrH$jpPIX)+&*ZJhCcm(8?D{!|Ff$yebH}URa^AtRLph^4G)6 zGIf)D#;&D23Mh-0q{r$AD`jQ&Jil^QIkZ~N9_X%C&P3iMOZl2KN`d(eZa(SQvj^Yb zf~EJTKH2N#BBfJ4^hktCeKesp3unS_`SJpJaySOH_wXM!+4hH-tle4w|IfKs_3es# zyH51*k6qd5T$f1Ck--`rk#ivT;!Ec zb6O|Qx+wv+=2|=Eiuj)&GUv-i+9!OS8sJZH(>+JovZaJcVc>tT6h%Ms?IrxD5${R4 z^(1Dm3qR7P--*zFszYey=?|FzMRU2~A>v>#)|_6#9>Q%H>=}-L!l>mv2QIEGkZl$6 znSyK`U-V}Ot1g35;d|v9KhB-bR7mjfgTlCGm%?4EC@H69^DFTgd!Lz(wqyT11?6&I zi-ENvKm@rb8Z1FoA{6ryO(iKK%CZ_JoXYvfK1y8JZ@^ycfGIvz&q5Ak_~VSNoUmA< z91yk@=ETPMROST66ZoC_@Xv4Hf7gEzX6x(o+@nv) z?Jc85IvlojGPm;&ysq;5>z8NlFCp<65sQZq&4yM6Bzcd#v>8~*WhmMJuQa`eB=;qb zP!cLtyhe-Z#n)J$M8Vg@Y2dggPkrvS);LOpWyPZH#R3?udCHh(yxRd^mYM(Pf-)$7 zlRHU$r7-o0FYxH49kb)R_>uiZyfN(KOq~)%%qJ`ya2s$Z$-A1Ti}^^cOQMzcrt_Ot z6)+*wK2LSHtr)I7``{J`;_YO$#9?A0>Df#h+RIaFQ^`}pUKJ;`4X+%kmx!X>L!hPE zJJKd&=K`XXssb&-dy}rcNSiK|AL5F4s%PCD!hm+a&rS@ z6<-`*l;v^!k7?6{BK{u+Oi@Z*t}R6p`Ru%W+a-+Qzxk1`d@Bm;Oc&L;f#H?&4=#I& zU0#n~iQCL9WI()_<7(7?Q3^~^T2|#>)wWUs;L3U3a^zWj3n2L&Yw-~0sm(ObN~RLN z8u6X>|9AlsMtw8T+ezRDW6$%(@Qr@vygqEmp_vci4WaZO zS)15H`V$?#sKW;m9X%7}OIOT3{Y#myc-yySbPa`ae0Jw_8KKtrHqB(SP7-PxA)F8< zV87ceIVq5nDTtt!%}pOF@Uu5>pGX%Gq14<1Z&YBgG8(mIh3Ki-+|Q4^EV7jqD@9c) ztxj%wEA9r|LchCn1MVD~W@*DrfVQFR9h#D(mbvh%&GEvjAtPB1mLWb}*Hq#-`FShX z>yet9QzN~_yGk+vfgY*yd$VSn>2F*$KwD8Gm%n%UA=y^^&Y1<7B(|`=cWu9HR*Z04 zCBrGxg1BYGOGv69v9jHlv=zU#iU9+9m|jIU-@@8Xgzww63z1lH4;>u@+ZN`2A9e|G z%s;X_-jTe9qX^TC9>s{R(s(o{VXMSfcKGZ$b%q&6FPY*=)MxqYPYl7pk((NbhdJV@*?_4K<$s-zf9yyh;=cp#9K}jCu+e z#q>+n;e-sP^$b*YVMg@ozT{%n_Y7ii=``D(x;1NZe(#goBtmPX)KBnZgzDB@d*3a{ z*^{Xfvg{Rt85O8TRt?`DB+5>9qMdAKme$2SBu??M)A`QfXB{u&1=mV3fNm+%bbLqi zxg)JQU(M(#l*zUE@9$T!H?I6doO7{^r+JqF@^{O}54fTVE^*y~Z;vTf53bHKD9*51 z(`fME?(Xg$+}+*XWpEhWeX!sT!9BRUySo#DyM<-$(xC=|XOsbS>A*xS?coy<|*BPbsh z^19O+e4{bU6iFBB{+`X4Pk&11%!TIXSWsDSM-W$N$KtwB>%1NXTG>aeDd!UQ12P?V zYPYdiJuBWaUKXP^hY@l#tg}w=T9XK#(gKe78f(f_hJ>{E<1&vX0fs9NDoHa(qtKwD z-yU5mi;8BleMhV7-*3}x<8^ZN6K1+jBs19}+x;%}XYQ{qii_kL{nsuyroAB_?rb2- znig0q{W9g_jGD&=^g15jnmjT|fTk`q^$f)#)=DsIRejQ`6-6@Y$ReDx z^@~t0P^T2SQWMsK9#A)!g^e_#4jKFjg|eY>#>$F2V5AlcV;rCW1@2_248^Di(RMh| zV7uMLDR+cWHw=e-JsbMdu>zc}aCF69*!c^0m_a^d?W@7jxBw!DqMaWKKu>T**0%P# zsp`2cyse@+kGM;VxJz=pJ5HqjA4P93UW!dXlrZ0V-B4#&f77?6#!;?dz{Jss5hXQgr*BXn5#$Rd~=~y+nn*xu06- zSRJPV_B(K(vY^?H28di<26jOZs}v|hT_i!Ie?oP1BUYaHICqfm$&-ByXVFhya6!%L z3g<#=IDv-u2$p%uNnfJndn_^uJ3~G;7e-~V-NES-OM0)b5h^MKS!Co7ps6Dxq<8E5*%bmK!=XxwQ1>`+aW^?b#FAbslYu%1A z_to66L16q_EYX~!u0y{=?Kw+Js7~o(#X6{GP!aW>wwUJgILDHg*0}fxkylolqi7ID zL%C<6^Pq`m8)6V|BJA7RfJc>)pj{1^r|acoENjWpj2SAhE91PlC)AnbB@DUPWyH1w zpe~jFW7ADy0d_8NU|cYwd{(2ZIY^uQHXF&|AgnLIm@^R?{2hHMNw6L-4PY*u{NVWn zBWXVHg9(0x3~WK)^Tl3Vi@JU%3Gf)meWV*|>6O;%lgTUE5h=7HOZv$D2WCITk(nDI z;}d9u+w}t&8ZCE*@rwR|i`RzZ`zZ<>+QhWIFJ!y%2huiQ74^_IBTEMQ$o%wTI(_pU zAEX~WID;@$Qr&s(5i3gP^pPk6THn*nf#Zd=F^$cgWknv_-LH?~b=4d}{>8tyB+KGH zkQ1;GpT_04x#)7YM*VR-o?!>yXsW#O(1w-qMT3!Y zzRl{51J%OJkx4thW5YKbA_)fps8_LL@(jv5?b+JHhvL19ViL>ZnUuM7IDGJ88$z;^ z4-$C^H@J8QA?pFQ+%g`4-tfslyvV$u7(oPszfz-q-+9k)Gru9hMzIGvLU??{Y=fgi z?z$(t5%91lZI?V@KsKuRWGGzG3&KKvjNM=&0cTGki9VnM&Bt~q(Ar*QNU*Kin?Uko z^KmWE+%nIYvRwhGEx+MF(d9@w4AxXAZqSFgEW7KYU=?{gLa0e#n2KBntib zxJyF2Wg9gU$dUY%Yz6EsYQJXuLr_2#cYF&Kf|eYmqdb&5YZS-oNDI_8u6yyc7o2YHw2~=P7O0!)KLKCL`I?!y)zO{*w~EPnBXvDE0n+vt z0-oCg9~{P5m5P|oEm6iO-ioQ>qtDSMq+) zQqIF)zkjUjN~Bve$~Pa#8dvFwQ$Z=L5Z1D2=sXBvNR>&DXdpi!O-!!u8Gl$jDuD7X z>9>rBF5+)*-<6p>(FJD*m^`Q>YkFyunlzOo1uoB+9Jb(xq$PrPwjrWcDXjm>(1;z_ zYp53A(ggap8TGr!%}y|-5AIIp1AIe}@FD=0d3$wl*WZzMi_jwE(1XUSqw6NiE`A&; zx*WB%L1YIB(4Z5Xw2+5_213wH4fWv9q|WS&;@ZofS57Rg`ZSAg=$xl9Vz(N4%Tb^P+t+LoLy=oPMS)s}Q# znC69HyyRXDMFX3n3By3QpesTR&Xfg*S3W=Rw|aKG}6$52RKrFm{A#~$c@5v z^3S;u3wbLx&DSN)@m|rN|B!UR+b%M9;uY z2lNL`Jh|Whf{AwA6Sot@D10E=w5#FIXdAA*(lhvnX$2VggBDObgBEZL0 z0u*tEtaWQna^DD|ZRI;Zq;ED#IKYLB1PPIvT6ogEcj088s{ToP{%Bm0wRqlcRn=?wU zWmOiX)t=S^jV-?(M=v&IZZ!PT=DheVnaO6oN#V(z+JUUCAgp0rJ8iI?^Kt^*_CoK~*^G16cIv~;K-C|KgDvSq#Anl{gKscM8CszG3rhynPR~h} zR>ZOR=_HxIpJwkgURSb@j!G~a{HjAZfR$Ks%sAS00|GH5Q*tgaPi@F|D?xz@)ZYoDUV6lrf!8zv6VQ=a(wv7u|f!276Fg@w^?> zqdA$MvpSXjUYXQiTbA&2zjjc8*+z4YT3a`yhsVpbfh{NLtVoZ=HGsgKp0A>ASr3EQ zs_ROnV{W}Ip|@1&vwsIxulZsJaE*5Aw%n!P&+}0Z&w?)P0_U%tH^Nou&Unq{CvhpI zMDohi*_Ov!&g@Ire2vtETicJM0bB-zTKTghHG-ODTr07K#CghNVI=*XMYUU_rxL%F zy^=EQHdbjiIZC+*2k6?8khL9qF}_L5u*U|ldYSxv%Be@BZsq}|3sJzM?Md((Rh}C- z;4wF#sdpBWh;|%IW@Ul?4VbC-po7b>BTr+GKW36>~eUQtViPQ0T zKF#bfbg8nCCAtT;sE3YcndB4R=TC>5#RMyNtRS;5HT;numnCNQD&GXBrS4Dz`W?Kb zxP6ag0&Qn}bU59m^>db&K4xoth=a-i{;J8pkARVLZA)Mb{#a&9bdTM01cfn%Qv(_0 z-HBOMO@>Z%YBj#*9@g04HdE+e6+e52&z82^qr=o&SimQL=a2vav4D2b$oHlmm*0Q+ z4v_3V@*8GLfDjh-`QbZrM^BaVxl}~P(JTT}QG_~y&*gTRvkp8f{hJK;R$FzGzI0p>h zhW#Ot)zsX{O-Yjc2o(VI7sb&3jG?6)p+9O$4su(ZWGD(KDX3V^Hr|<&)Te)=kHKeF z!kPoo#5AC+&<4inL{A|3mD7(jTBFkl#nURSk7O(J8P}%^_Q-vF>FnJf-)ocx83=HV* z^_)r^7e&yH93D#F4-#&I zNR6K+QRaL+oLzZ;NOo!50}$1nuRJVa>W@xoEh|22>|QX`{t>NLjyT31@aUeo!GM5U zN{0)BSOLWOpQQKuY(kRnn!{G#?*x1^Zy~S@oFr}kO4S`U0ApQY$19=})Xdt3U-^_| z&j3_KW%M{+2U!6W$1A8}qdj>u!S zjOL@lU%#uX9euMe?Y8F=*v$ysE0m1Dm^xo|UF5ys zZ{G$E=sRQMh@dEYK)U+`E zamnzI5{Um;)K-ty>}RaUuB4RK!?dM=lBJ34S{37=k{aMW8;knk^cYa9lry~=(GB=3 zU&j7O`Q4&a$fHzvjIVh|D2fzrj_+sHR|eZL^u2JZ?n>_Y{5VhoQ`*x7+saVBb_GMq zfHg)_gWm^#E_USugJyTVi3Vm*(Mi)}s9oEFF=kww8O9^1W`j&w!7xuK-9us*(%^ldh0O1h zrjl5u932@(_S&^@{qz(=YKKFpZ`6$Zm@;eYu968=>$+T(8%cvc({oyu_Av+}vu;+L zAj>RL_hR?5WjbdTb;OlAvI9xUgh$MD?~zgQ(k6zd7bMWiY%^w%F(#L#<(=Z3c!sfY zj)kwik3HirE5ZRb8{nP(^2(WXquLARmU{(nreS+AHDMuM>;Oau-E;zPdo^zwVt`Z& zL8Cxs^q)HDOu0yaB;(ghmL$=0Ip4xOX5=cIR~~xuc@#PssUVEESGx6>Dwp@`pG!_} z8+a(%Z3sq`OIxZi9;#MW%cnIdmY*8i5U~Ec2j_hl0trX&1f+iWg15*tF?E|2`z*OA z)*E~$RcUf}4B-|15NDej2~0tP$X{Z2Hx8Iwu5<)v9Yu-;uzxq;{kWX?hNBHlHr0G9 z)x60Yt2Q7ahV3^RI|y@#YK{2rG&hxT|uSS#Ou>$2Jrl`<&cW}+pq7bk5ItHEd42%&40Zp7{^?J9zetD}gtLyZt3al|PnjKkF zIwgR8)n5qE<#z533B!Nl`sUa#Cgg)^xobiI7$J!_!2rNAozI3rM@OmLmhk);2g(@O-WX3$~m-O z{75+JiQ$5t**PFJgl2ZG*p+}TBf-e-hWw<3wramDl<8X)#_17LI&j=KDvW5nWOyY0 z&zr=h96n6a*RtTtH&Bf=Kk#$I>W@es7`Q}rbW?=0Ds-NVS9$a=)AAqt_^x4%1hiVN zo=byDB~fuv%Eo40o-*;EF4?BWhtdXtc}C)vc+=etl@U zn{)Kg2Q{KNmfF1F`vaM0(#CH$*mE~i=pUY(mxDRz{MJv`TK{ok3TWJEpY0efojPmX z#B5sqq(6F$?8@|o&|*Dz{5>ZZ0UIZzi)-~`P6n5mW3GGK72bg?IV zrV0Ke4TK`|Ba=W4@ZD|fKM9>dFoJz&!8xJkS1c18XTM!|MP?BsJ|n9*F*6tp;Xxf7 za|(KATXPv4izky*$z;=!SLFzU8@Jsf8JAD8Y7MU3M+*_C9eTKu_7@~hLkUK3dDj<+ zvlHzU-9p{2o&f@q+JDHvtdZF`enTG~U}6oD(!JIUKW{Aniy9|kmrW##(+U)~NMy6Q z2Pb(SxQ=n671?JS?L<3l!J}XbVMs1z1EZk-VVOcA#x|Oab{LOmF8$40K9d^qhbx4+ zCR}o&NG`pItZiZ_VuNgEGdPJixTW86==dUB~qu$9r$Y&<<+I`FxqwHwoN>HtsvJ5M*%_l+0c6r>Z9 zERP{O=ib{_Zo;+in>~2}SiM;9a)WjfolK!p6zY2qWZNX9kqc;0ok>dDK#Kh-(oTs% zJ<3ibr*!2Qb~LQrrbtg|?a+nh!52j$qN6IXxyblu=0>h{^*&d-c}|d}%T}GVNL+UH&h` zd^4kpi4bK)`Ad9(Q_>n5^3v~@_*)GQZ`QWuTD`YPmxtE2b-?^eAljVRuRzdkc&-+b zni>K`+FAv+0^>%m`;5#-JK733qulGtT6X64wC{eo%z2xOgJ^F!(N>0a9!rY6rh~8v zjd%M>z-lf(V{TzVMrLl2+`~b;h--X>ja!f9Y&re{M2qA^pHuiMKve5QcgCKS9ls$~f&Vpl1v8`H6 znz7+%L>_Z%2rMb?)qdBCH6f1KsXp3M333DY4NiCqA@BYrU>V6iy?K2B9WH_fF zbtV1JVrn^2-S}HwjZ*!_QJAeZzqzIaxW`JeZmNBF2{Td7F1%zPchxi)i2b=wY8&w- zS6Cf43ZKJQ-8->A$LkZ8{x*c|j>!SC-C8Cc7z64^^!DIG86kzzR|DhPCg1)XeW7T=UQo=~4l6=cyaJWwn1XuHEzcY54svx9C(Q3ALiv z?BeWC7)j%vMZ*vu{*f*DhufNq|G4H6i*A+mmT0TSx2)BqL9rV%q_v=IFvygnhc_pW zL7Bbnk&CLjUakqWhVJQdaBIPr+fo`P=~gWKh|aOu0q&Ye54$~6J=`QuK@MgAQuyWg z3r?DcPeOJ#$wif_A;7`JpQ31it1JukfkI+%;g0jUnth1GFqCV_-BbW@jQMZdwRsL$T3n#juA&)xPxd2W?uYEUr_bZ>xqu$49nm+YnE=NA z%@!NN<7tPf#R(fj=?33fxorQYb8)2Vz+rFLfxB|N_^`?olng0nukW00C{_%>)&M+* zVSw~J%|`k)8bUi3B-1XGcuZR46xltG=46ov4+C^=U+~@^?LTOTybPU_{ia836^yt5 z4oKGi$Rb<^A|1Gq*pwl9js-|B{h z^vzgX)~)O=8Uf2|uWr_V8aM0uJjAlMX1O9(kM4?rPzn32;)F2n#;kE!qnVudO0Mi_ z^F3#hua&rcT+wG9g_|-iJ3+p6=xVEB5%pP@SCpZGJTV>D7(>D~Z7e^4Zx%eE18H(r zr^779)vHOt&HISI8uZ%{H9kobZBfa|;v-wJgCo=DX?q?yT&$e|#{kpPGLOMlq~g?Uy8mSC6{S3m<;$Dn(%>=QUBXr4?zR{5}w(DaN)#555-A z6^|uV=m5*HjMM{gwyp31LokD#y%rd_jKVMwoH7T}2JTwTR&^b723p1^|4?GSDl5UK zu-P>i1%q@Rh<>60uX)(=NXYaWY>74^#vnZ(htV5XMS5~hNFHuBCBdr;ZOg?VS-BFU zkZRtkDu@-=bm3(PWe`D=-!ijUP0!Hk@AZz%d24xi7JX@Pv9>fQ7Ky zMMFqZ_|?bR)&*h8-egp9#2~fVFK+~abOZsSL}R*b=W-MI_G5ekJ$FLnsUg1epq2p_ z} z5zbY+7w{wH^u7ytgi|*%wyMm)1XXTL?=b4i#(F4=xCdSdVw(^7J`XNh(UOD~AYDow zxk7&P=cuWofrZ$WC9l|Ewt{-xlrDFw10pVnzT5_JlA?wrBSQy()m+a*`4Fotdx+H! zQ6O!8MAnate#_RcAEc$q))jqPCJvrB=G76gGHm%d^ql|0uBz!e)(# zzSPbM{e7${+r62u4~fPwyht`wkJ0PdG9h0+#o<37OU|8FwIggm&|e!&zR1dwn9 zCdki=3Am+&uYvNpWey6nK%hWFDZorz3@sLSkh3eGDOns2M^=Egq4#Li=@(s%>%d2R z6@I?t?S5+R7QZ17^nVndFIsNPN~E$crX4vv44BMG*qPk?nYHuza>NaGwWkLs)=Fur z(of=eXCl*2=tr@~H1GGuYP1DP>}v?cta>y?0_NTCs+qqy_aNlST$^+u;0xmPp7=G6 zMZk~|xxPq|b)(b|p=2*0ZT+;m9@#%f>@WPeg7eDOUQnI#>75 z1|(IVjsN*wOD^6K4-vB7%TkM1Syf_)rnn)#1RvUz@Ud=tnLvWs);oNT%c{lp3=p?f zVPk(D)*z8sR1Y%F%CDwPQ)u-f38wU%V!3e**ylPgRXnI6C3jS*4h!5%gNdtT+o9mp zLy%mXi}__y!htVbUpAR4FAE{3mi*W>00fk1FQ?H_$~8J*tF{_&_`gy}w99B@q80K` zc}iCCn*F{Rj)@nc<7}8@o|bVBsm4C3bNBPEX=#}DHu0goE56oWR#_BGc7BL_P96_c zX3$Wt4%Ztr8~4^^#)&>Se(%tVca1RKw{qWe90}APTiUEC1>(tS@w9liS`D+*6DQQ5@4;fnRzyZg3hxC^c zDt`h1-_|2#{NVarn9HjkE7U*KKCh*P=WiFP9BK|^EDz|b2~F1~p~LxdvBnskjt1Yd zN1%V8c-c9h+`J0(S?zlxfB+?w`;QBLtf12f^{rne$OevpB!T z*n~>2>VW(AlS8!zlGbu&WoePQNL7kbTKII@?+BqzphQ73{ml?>peRQils_nxDVn}j z+!vg5vk0T};Pv;?wG+bC{Eqx_4HJ4TvKGGgZVGOpzS|x7dst%RIgp%k-~SON{9kbq zJ`+c{&SYCb*ILgHmSdZt0k^PN7q@wJvX`&r81dZPWRG9p|AZ+T8JxpB&*otN`!5fk z|F&=NZ$$Qw0SCuu%nC39|Nk@qAuEwS5Wh44vq4CK%s?5>1x<{9hdgO!F%&px)RST~ z@e0lx9P%;)D5XuffyFX#%F6ajs5C7}7UA>WrFUrxo{acdC1t%|JL+YXOt0AO=QF2g zv>&-uqqpj=?UC*~3mrQjmt8yl(^p?G1R?O`MgbPz#c((b#gAtv7|E*|8rwxiyTWTS zB1x1F5r|Y9BPBU3io?e=(MmP|ThM&iOjA`==PGh2=4XV7z#bX=Y#Jq{B2WW&b-wQ+ zHvHw~BAw{wEjMF4FS%Xi6EJ+gpFMjSo>uMmm~`Y~zZ~q@n!1Z& zb89lmRFcu~B<5XXdoxKvPo~lIBn5kECRdaB_$-LLZAgMMi)f*7y_j(D7+==TTTSj) zT3Q+k&U|A#Cj%+oT_|xghguGIQ{Of&+`lA!UGx&NNpTk!L-w*EZV{ez)i~Ux#i8{z zMBrhzyPr=&R_oO4w`Nx=+UIKMoTZ&d_x{voH*cBKD#Yn|eyBf3bNOzSr3{<^3;n5$ znif9CF)uYy(;->Qf=l4x12Yd?5IE9 zVs`{8?r1bhMCnDjYnrD%g#zo4&B;1*&Qhitf6$Ls(cg%*TN=t-CD=;{SB8uM%fRe) zMrF*u{d$Z3y!|rGb-gt3TqcdNzcD*QF5p|Dq-s~&N_Gu8M?}=Fg{Enq!H8w8YaPR5 z6EOT@l~&u??lTPY0}7E2^NnG0RaoMcFey;XRAy4I+7aLlhckk6N|29yQ;8i9LW5_n z+pa%E`_i9f`&P*A)5!wY)VsQzrvopofX5Vq@~i>MWs*#uz18=G@Z{UEGgZxkK%2SgOjVI==brFU?7 zL}biDMYD7)LgN~g{5Qe+11}qA8_qB;{tz)lJro5R-;f}t%?_{S7AAoFGX@AtLe>QR z7(q|`R2jy#sT)W zEvk}ceKt(7iu!5_hobDDNfPM2uag^jH%QX&75|O%i%^@m!xp&tPU%-#u@bjV_QEsea+0#b)rk zTZ$5@C9~(?&$MT}&~(Tbfgq0s!Lz;1eW+yTDyGp2ACeEQ9v_ksmwxcJDXcXs;-XX^ zYkaeZbzn#`%2kB6AU?JxMZ+=b^17u|G01YCwD4%Z$}F`n7kaIciy)uO(3~|KcQ>(2 z`$O@W*0sEWbM{ujb9}frwyX^McwdGL8nU9uE|0K(Ryg}NCQIT4bbvs#s z>0NXrDAH0*>06Fz9^;Yh_~yoV@aa9z#1GFsr}h&nHPv%mr3K(R;owJ$tABL_)SsRL6uTqg@p) ziYvHQaJ7qo%W@CH@&g8V^((TZN@ld8Jqb3u9pqX*lFXv4aTg(2PYTD1hu0Rf`ujR-q2H2-J zcgpp<7r9yJmrOwZ)=~@2Ksg>xD{N{|W^mPr$~zf~1{3XE$aE+zcKZt}6M-T7N0oq? z^9$L0NXe?sobB=ZGe2V)@3QyKzO6bPI+fdvo&J{}5ZZsAc?}HycPfxzVCNvA2zelb zJpx8(wC7;-EJ9aQphS~;n{36r|?4P_l`W}{#@9%dH_<^wVWPB)&MU-TP=q9Ktn*d{sC#YCBoRj1?GN?f) zdH4*pyA#c6Fi2TSvhwiH^FGXAg9w!fm7{$1a4 zy{!XL@J1`VYKF#VPCA{7>Q+qhpKa*z3H)eC-qKEKnN%`aUO|M!;hHYN`Xfcabw2dSHJHv~M246v zdC3}SQ(bIzgd2vP)FEpXY6YB(a@2S34`TvvRGc(1>{X-2N;E&MO(zMDYLD+!=2mym zt5(7EABoET0`r^o7^!XskO(8a9SP`Acns{7vE_Yq37gdx-Bm2HxxW_hqQ)A&#-ZF_ ztmQ}G$jY1u{{+5jxSOJC%c@(ca?xYQsaqOMp zSRGG09S2@P;IO(8aIlKDio0h{ddz~V5_ndkw(DYW$l$f;w<1j;-WjomAd~qcg`j{# z5;v=k17vfQ9naYR*^GERGO{TC>YLGiP2sWscS`8lfd(PRpaK_^F-AUr5Uy zK?weVkWx?>$%^U+J0^~9j%t{p-@;e1Rect{FLmAVEQ*#YjxHQXJnrSFCAB39Kg@9^ zc(UmRJjwQ*ariIqErB$S@{GmAVRdGi_GlXtUh-<#g{u92p!@mtkmo!KjoQC$|!X+x!h| zkkC@yQrIS?rXMPyecPvF25=bDuI5=y;kXtttz!v`m>ExI2=I-iis&HYU~DKKGo_37 zg^n$j&g~;WIZ4#u_tS3+Zf<-&}iJ0c8 zLx0>~N(E~QNg;294!0zdZ#XXydS^pG$e7{+1t@{@z}-ldWwE7IrMn|1NPT##bU^9{ z^s29<8X$Ii7#m9|)g@i?YMJSYekrkS|J$S+wRRVfdto+hv4AR2n1zR;4<{L7O3Q_%8q`Gfk!&%fQdbho z!0jC-B)UVEV-ry<5Bhg5zf%Z&`+jj>a~K$f#P)OYKEdPZa?5unSJ1Z^`0wo;0Sp(1 zEj)=|B##mo^^ih8jdVXc*20fq5MGnA>ZXqxt;QAj`<%^uGtt=%EKgQDJ!ymyH)J(Y zIT3Z(3QZ_o+5FU#2q$ipVZdvl9aZAC2)RruR5=obK$Ev>*hwI> zTMcX&b>lnxh%j!rHuE{oVc}8}CmOQWv2?@?qA(P68Eb_x)RpXWFe!k+^<|$KGo_Al zFE_aMnp12sK^uB!S1-KEsg(b?#YT{;L;C*SL=Ar0G`on7o#MMvovBt9V9UKmXzm`E zMl#(ZDye5Gvoy;5hnAI(cP=B_1oon`MLD3{E*?rj1e$NgD{n9PDs35gZC3gTjwqc1 zcr#TY&K%g8LZ6_aCk%U97d3fPE4al4Y$Kv2n29p!Dw|(CFGI)V70ZWfbSF~U{Ut2{PTUF%_9Stt7=&7zI#M4MUo%$7#RHt?g2a<9@nE0 zyh!cPQWUEtFKAbsuc{Q6YeAUym11w!8Xz}VzV!q4h~PfHm^^>t{$q9pjYLJ$2sV=4 z^O+T(FkdYq{McQ}{bzVJcls?3a*^(4kQrq^>hL>+@SJw<+r8k}$*T8#y*Cta4chNV z3u-1gFjmFBRj{JP-0T_lL|5grAMCY!$&)kj0=GhzWDV%Mfb>!4P#mTyXfHQN z+_@17fNI7N;nEUHp(hz{&_@N-1MJQC_CD^OXAENW9e3IMfrB+gaG{_*#+d{4BX*fA zTuO!kpNl*+`!}6o#rOT}I-qYcf2HdGTNMI+2(V1FMjhl%7@ERip9*Abbeyt{`li?I z<|;48)kh-#GN9y&I9u}zXJECZ7XMdeC>d-xgKLY52L{wMf&_9fn}KNF$riVBc|7|1)Xu`*-%Lew~81Ux`EVzmtYqGBr@aY2gQo|G8f)+;=1!{Cs6y*@Bls#c}Wg zbxagET2*-IUp_k&8+Aj?mCb55TF=OB&a`MSgFk_xG{lW98tSUBXfRik)7{?ePMvQr zZxIP#TsI^L=$?%kb8_%c_YIDP#RC@T8t9zpPq_1X^QnDYVukA4X3{O4LB<&u(po?P zV#3GJ^&`OuvatA-lW8I?)vE(zHZMy5@FT1ziH(P_^NAlsF^>7g{Px}vQu;T&YKWQ} zfG}I$%_nF|feSBNYh+Afp8iYzd8)spo-ply$&a{>yrhEeH^Z0N!Fl+%DJ+1HZ9Ox+G}J3dUY`%&g`*|%Djy3yNnS} zR*io|=2f)JEe>#RFXAr$gPuw}8!wm$Nm}lCC<~Via{p^2wvoBmsi3}A!>#InBX0{B zigLy08xzG!XIL%QvkqLJ{8Y3s`F=-b?UC^Lbdqb90L40KR2*pncx}Qt-me5UoHs|* zl!eyJ)H(Mx&!tnigluY0gEXRGF!u9cx!SPXSYP7ZjmEZ@e9|^{K9^#D7WiE?6 zLZ^@YCIhon3GAll=;zTv<&$YquFfH;@4CnORZ{;5GK;1XEe)2etNohPGhgG@{@Q)g zjbby?ykN}7(WKj@^Zxc=yocvhgFa)rI7dr)lBfKE@A47ho<@>YsV+>aQFH}$c4H)d zSm^3K3*|UOkuZvP1GPGYP9quEXsD(=44*^o%s*JWuV}sEO!;>w-$ko@oXjyqc{DUKk_qm#+FhG+&m+I;K z+Jfll+Ua`QN`HTS!Zrf89vMTyLt!ouK_HFoprjCm&CjFdL(cME?H5Z1Mt~o4Q)GxB z%C=I6A{d8#4FIR2i&tQX;aHYdlP;Rz1Gnk-x>2z9gGh)F3*eB$>L8KtrpZYKqDL}r zZb)*C$3Z1t@Je^rv7uJpZ@k+9-5AWfGH}cdr*de9Y1h$#_TTy1ZSMKf94RO|WmB3# zH1}%`IGIbSUw4T{XkBt(X{xn?wynUg=HX-?yL4Wbe7u`TM{Dl#v}zqr&=E5>%_9SB zHt?H@Qh2MJ8TudrSxwY4g$NpL1L4vf#a}X;nJ_~t*rvlL0Ge5IsK1J9A((kqi^0B_+VH(UfS_b9(6V@!zJ3JMX1$m>vig--A(etuKHv}Fe*XA3vVgYWg2>BnR!qX?-$1u7xdfEHH%B@ z0NKq&`ym#>A(h|O(Y7>aeAWeeZiU~M9oMUdMjJnPdM~?}4v+{iwAXBC)_e0C8Oci# zD_hvCe~S44^<(Hgv(nJ`i&S9Z5+9)BO7Y?l3jQiCQX8^t+8D31 zv|(QcBIc=Hj6KJ)J`<3u)jf?%4buz=g&&{|L#OxwhbRsZvQb(Og$)}ZF4(IsX+`f` zXEUt;3a}hgrNhun*=rw?Uo*N#GSvb=2ZY6=9>kBVP)BFH7}`xpI)hVs*QQdWq%#YN zEjp=@U!zOQ+TN<{Xo@{{m06jii)9E&OJ07N?(2x0>8^ixbH<8!vu*enizv4Yhcx_# zn{KCpv~?!mjLo0^{)Eu37&gsxSYa^Omh^O8iFL4e4fsw`ModR9cFHN8UvhUiP0)LC zWuUY5>F%FqDA^Lgyiu%t|AM@D`x^e2+7>{idG=vH9zMKX7ZHxDuH8YlFaviSgF3_GIWy6`K>f*Yz;bLNJBB zVN{IJAsqMtY7}kZ@Iq9Kh%8Bxuq-JQL@j7ZWwaVH+tZB7deHDt;^|%^HfcRRrYSM7 zVkm$C6-JrfP^!oaQVV^?6{9}D-2`*DX7vifb0`&qM2?WL~%$(vVV6$_9< zAbP$_+a2Qe^_Dk?nbp(Z!AxPDep zf|HzNJDlQs($m$xs0$9^K5YBY+a(Z=PVoFEx_CX_*5SrO)AxMiF;m@Ik-;Yq^0`yq zNZkf(0*N6a_4*?hb@;!1+34D>xh6tyr|Q(lY$*Ha`+V>cet+=N1SPun&J7F;P?B=l zyPG{Sf6|`ny|JKYnU;bI;3Pzhl6FTzsF_tm84v#9n{~hdK>81XRpW5xa6lljRI?R8 zWe}Y|Vq3e2XT`uCkw8|gj)yRXvMq#75k^vJfoIyR5wnTMXcu1}#lfCPVrmcg?|N}D zUd^29d0O#qNn(xEv|9Lm=Bf!%A#h!hI)W$aWnXT5#EGV2XP@bYFns7~l{O&X^DSYO zIbc}k2B90fXP^2eD@F^Z;5QJ|aQ!XXjnu;!)p1ZE^jxODZe?nXJmrljuI|p|qW7*9 z_xJP9`pAY0jAiLl{xCGS^MC)VuCIWKV`*MT0v*gF_$? z+}+)R1t$<3{!QNd-5c&b|LoawW@qZ@>Y1*dsqLnPbiLVuOP=4oa+T#pus-trjbReD39 z4QVJAwn(utUE8sxBrNu%uhaWyufG&Q-=Wto-vBhs$Zu z07gg;wm+C~()mi`2)JBd3e_=h)850F$&xSt@CeNkg-Hm9;Yy(*pU6=;lfkE&reZ-! znY^7AvyBzBYwMFjzLjQz}`=o$>O(s{f1!N8-?um3~EW3a@uQxp&@$0?;rTYY-c~J2?Y%~+Lg3e4QcsK7XvrT z>Uxjem>7$~!dOo$B@SW*n)K$;V!*r%xVp-)S}i6gfwF@fxBUu0jsvJu8riD5*wc%| zQHcWe9~3Q&fIV)Ud_698e`c%&}zUP%H?tY6o}EYK_tY&lr^c@sC};D`75;%ZPnV~940IuX}6FlIwH z%(U7OR04V@9l^2vUfanGcuAhqLKGqhqpbG7aq=c!x;AN65@N!~X>>e5DWS+JgdNmk zAqqSVg`>hubB-ns^S2*nT@0jp%WLk$D9(7}9iC5M@a&LNwX%p!v7kk40T~L;1o5HE z6xK^RWiraZT5+?+D_@pBpi}81A%}&@E=8C}b zLZu1x^d8}t-r$$Yn)6Q}8y*7L@c+EQ+$|&^M-C3aP6;#`=YOI(S4nSAHiGTj$!co* z)lfDb+u(gTsUk&C=Wu6L!1q z;ttc!71A(Uk1miuR-`%PD;@in^!;~0#-~Prbv*S71Y);x<7H&WZU|KqUPvvye0dGW zc_!(Igc#OJa$(BCT(KP?T2CBi>rxa`^VYW6&*}We$Fx&V>TfXtnvKi(<`o$iJ*w{@ zr&ZOZUda$zuvQlkTezN>=5O*QNe)iuh~w^OL&A^|xulLF~a zh@mto`2@$LKB#A!s^sFCsVqnA%!$k@33^WmNyt*Zr~@@a?q}k$o@C9@^hp-Yk*GNq z*nUK1Y4_1ADpv_+>nL7fGeR?r2ZM+jM1FBSLdI{~%l$6bG_9=@0~APyiuqlm6s0~( z7+mvJY6SNYeUwHwouTIoLNIkvm&|+;-b+Ryv?ZFyxWyha`GCS&TSvhrg*CYE@Y1x| zt+wtvL8e^^GHvePe{^!U2m#3&e;M}NqzV^K^^mWK(-3?#+Z&Wf*fGl#217Qnt$sFp zbD8N&{5jtoYh5)#EmDOMbU!6A;;ACo}ScKX5n9kMNC`cMrp(}0^h+j17?D758W-2eLgFm!eSpg!y5WR~+%GWGYoUS}iEw+5p zmb&2;$r6PQq7~>3jkZ9fpSSf@9{!1ncW96Dz>AwfYr6^H9bMaTXR(zGWxyq3UM6Z1 zoaT=6v^a`@6^GxZVO@zT`|#BaH}YBV5kSbWPtYyhG&e~i6$jN&HTFmX`>wyUZHWt7 zK=(JG9h7C-fmDJXactrAH_lk7F)N7o?eeL@;i zD#=)PvHEF%Wzld*&n2xfu}rv8TDG9*V7pQ9H+8VDH1?u;V%94A4*>&c^-SZLB>vC` zjQkQ?=-y+b4&&~nbA{{_z3ojbOj&Pu+r#JLcu)cTEcXGlKkG2vXboQ%z#m}QH?isT z5he!jL9Fyb-YQOZo+MD1HPW=+8@bb)lIjv#XqL7CEGtWr%s@WhTRQY=?>c&jDqm;t*Am+E@fR< zUFq{Y2cYSK;=;(#QQ-~t1Fs+5Whe1Q9NMYvD-p7uBY{kQk8#0NpOY2ghYkqGXeA-G zg|kiLZn4pBDzTq+>QkAlrg*Jdi1zd+2%*WKkZWU(Blt(42lm>yq?l8ow)K4E(sEH1;Z|IIy%h)p^ z_>I8j2E0qz37FgAL#JknhELvHS`Iu)=ov435QZ1CBO0unM0YppU?AW}Z}~pSNJ0@+ zQ-6&-W&ls{O*QfA5v!VpDH`sq2C=!GD@mNQ_Up~9ug@!>?gPvV&Q2#eg_UpCm zxs3=&Ry$TiS3wc zK4YeM6+tER{f0o`?9+JIrhK6$|OJ+`f3g+r>@dmILQ%^D3!;?O7r=*PEDub3s)s z!tn?qc6lt_ZC$}$q)^k|>Lo-$`dEwVlewm&4WxBvJC(tv=GIOKsRacKwk3B_Xg>w4 zXrlq&O)qz4Coh~OSJ0f6$Y=#r+xMm79X|8k>iHHeOiKM9B=tcL2fo%MYIOw`iVKc_ z+dU2a5(fn^ zx(dAd65aWnm+C>-WDUcYZ79Uc?lS z%y0zlbb4aDzPF2?sa;}nZe2f*XjdBFo2fJ*u;tW`k8F%Gr@$xD;#?qQypaqdARfS> z*iBLeu8MA!HX}|N;<_YRCr@K%IC&Fl%H$Rv%Z&2`?)C%L%E&!2XVMAwm_9U?`SY0G zk&3^l^LG?&`DB4hoTkBTXg|87h$cGwsonuNaG)Y;8r$o<(=1nP@`I9iRaR9^SD`t1 z{esUj0k-lA#3GBr8L{hZtKnjbO3?YnZM-O$Uc4xI3L98xiyTxcmPV3UCk-J&=3Gp9 zm>5MIEELxT6J^+rn0Uvg0cj=wruDw_nafB8*|rbJw*PTC7q_thS?cS*oX)2cyC%^C zLo#^@m_XS3fFy9y0oVWrQXRHl(@^nsrUKmFsb4Q=`m=8t%s%H(XbREocigz!Eyvo?#79%lYmSrt^ly#Pr2f!Xl+E(&i0^Y!VUhWbv?Y6Av40 z!tfDgnL37ZH34mYQAVZat#i|Jli54M*gmhlLT&WLcv`!fidLP z99l;sJzN=lQN4wNRNUSTSM!j;GIUkW3UpX;`PH0in|IeJbP>UM7-0EOJ$$_=sUBB1 zpTJ9ykg#xR5OX4vmugmEmrQ9Dyrt{)RB22!U59FJO96<%z7`OsAn>{ECUGbuitH<= z-fEscPVVCO3DYEJ@bJ0NK$1fYKNGxXOx~HfJ%kE90En<(&L0=kccl>Y-sQkHh%U1N z#vH!1J|f8$&3{Q*|I}!=_^!Bor45nIki^UoH;%J{#rEenZPWk_H;7@RqY0s!&#A`w zFru2794vrHM6o-MHN^7g7BQ{F-fm-@7JFSpwJ*Bx z8owthgJ*(~n_Ns=1XHx2iM81nE{^PC{^ z4*J6#R#`3Ub$LU+xl&$S8R(hf{!_lJM7s1CS=j*a34tOqSh0~d0u7U>gc-*3Rggdg z!#qp(ef&0`tS^|H04Az#Y?M2!%rTa|6h)I`7>DAw6qeA|B=#t)6>5H*9i&qe%J@4h7;N&;K zSLu7WHMWS2sS@j&Wt^iQ9%&5I>fsWluT{9AMvRX5Up}8(U?@JpfNZ!GG=anR_XLj6 zH&mcNB@zIt>7$Fvin5`t`n5UB2Wbvg(q*&}qMz;op>DKIyN&F3!na#dR6;i}H&VFc zc8jJ#kXBRK#MhapzI&O=>j3|!SB_xwl34s)&I^MD*4uE|x}doW6lZ3?gZ^sRbnoq8 zL-(#cDedFCDgHK`Yr!j#ONgIIt($KksYP#>vUvcbHzRSdAtrfbN>|3Hb#*uTvPy2R zP$h_n8$ajawUASW2JF3lwSFADT@x?%j&!tKv8V}dOxyRs$M)mRzR6Ko;wSyn>?ox! zq+o)UFWR@xGxnKi7yhoeiKy0vI%7SknxecR=0>T?vR5{3N_!aTYVJ<_>Pf8q}Cn4C@8()50ZE>3$>weB7 zWB3NA`RF#Y;K0dvgjo}p7=mTwkp8o|6#&8aJ;x^~&GFO2H@M}fj8;vCRp@ILtn&?d zgN-3F$ht0o*6X_(!+q2f}Y1GR-Xa&3S(i?#|=0*uafQ;w5%bED=@&;5ZUqqix(T1h*3)S1oX&XRK$8G#00+ zz#mu+gaLc78DeDKvJZ}7778kEH92MMP_g-{c1K#dNFsUY*w+LDpAnSh za3LW7;Sh@kvr5?nS&BVq%0>8ZO951q02I{FMNs_e2C0nd-oT=qBcQ4zQlh}-l7*8M z6=`7ThB$9XAYgwJnlrLp*jBy_hY$AibZ>B~q;YC;&ju zYVAo?1X$4B*G4yw#jTxMee*PJCp~hD<~GZNmO!)Jlq}VVJMmIEd<7yS#)Y7J%^$HFNB1*&-wu%$_=jm>tXSHgD zTc0I{tc&VDw#MBS7e!(7LfKck%mXm)NpOBFhPiB78_P5zdFA^9GaJQT#{Fyg$)}l`OgO-~B<7cW zbaQAet-feyEkq}vWSympMr!^NGT-5ER!)9F9h8pd?6Dpi4|;x zk7er-fT!~d;1qVY$fS&|VV?k8?J!!{wi9cPD!e{vA2))hqZ#2qtXd9(Yfu;Q5f zVi)$thfupJfH|H`Vk<2K59>Ltjz>X5pDZpICqqXMnI7;*BHLeiYzHXCnu|a| zmnw9>=-2)i4+;%nGO;ysammv0GEACnc+MKRP-yqH4FD@(Kt&sr1tS&Jh7gC60ShwJ z?jgOEh7L{VVMpDHm3wEMH&+B@V`IfRYkepQR zJ-#gy;xQu{;y(~SvesyO8MQ~~HmEWpAnI5ex1cpko8Oq$TnwQ#s2+-mAJ?jL4$JE> zxmmj=kYeu{HRx>tF+(fVyX9t6%6(O9Rh9a1dD|3So4tito%zj$USyqOU>Iw7CH#+V5fZE@5p z7oWDRe+OP=m5ZM>{rf!vRF?Rbf@-xcPQmjM`& z`(6Q-MY*!}-=QGFY)3&>B~D$vx~`Rus=VA&L?Uc$T%2@^RF3bUn<9X%L>3SF?qNJd z=zySlk))(D@5GgSRbQU4(UqtGam;wkEK=7{IG7jQw%eY=K^=t?sJogCqITs&?OaLZ zD8m$BF1nd$tgG*W8;3VXwl?vcZ{M*dcN@hPc!FH)+I-7EaNsdV zZEy$ti4n$J8}J}c=jynAINn`f5KmnbNoOYhwU4s_9jYu^09HBDHKnG?AehKv*UAha zP?KG$37K=QF2V^WUnRSd-!yD7#`+}ZIVal{E?T-5ZFZcPge(P4Eyg_)5!-Z(0S6xC zT$SxCo>Z&+Q(naRut|U>QKRrSyXMFu`IYgOYE zyzFcW9U7f!s*4TNClqaZ=&){%YH@^sSgF}lz7pnvo+UED%4RY`C(KeEPSfHG^Ti@? zA+;WfL8~dmapey~UZSoDKJ!&yi8^PVsz&g3B_0v^5EdV7%}rZ*YMsY%AG!v+EMOg; z5D-Zd$2cg)oWsCd$k9yC7-?jH%?xPpi=%uvwGuv9X+O@^l>4(|1In9@b5TM7Y2K_U ze3?%^XO711W!mTVhYRiRvZijp@fm07ty_=F#0T2C?;)9J)QYRj;Hb4TSD7T(#HWQ^ zhDw}g5jnV*YqTdbaoHhzDT4~cX{+xt1=;U-_UOhCLc4f#1!N-AO2lul;zvKikMv1P z)u(f&h@RF!P$+0QGaU5`A$V*8>=6u<3w+KgjWyS?QX!4)R{G*!%T*<;VzmcW!@!Go}TeGbA_~&z;*hPP4n1|db7FKc{&-PDe0|q>Wcl~>V=owNdmJrpjPQ8x{@qb zzbrZiLP@I5g+z-Ms^4JZ{WpK(VtuV)YfOV4p*iu0mLbOJ;WP*<%an?%@A;F`Gl?)s zQ`^wR(kwIiwNjSzK^JCn?PM?vyrl%^@kdSH$}c`q8UXJZZ~035$uE$$+9<=4>YreE zNJ<%Ri+!V#b+K;LMJ_b^0N~Y8OI*m>EH2@0n(O!CUe_wK0_HNQzWi1euhhEvk5j}U z*#yIA+Mde?68m=|5Y?;;Cf}5R5>k*u6y#5Ib!@FO+{QX@056g#*ORFcZ?i)T2BuR4 zrsD*mwo(Mj$;RFh(7(2T%!UY05uk3;y=WuYrRu#)`iv`G(Wu@-QpYH%I!Grq5H!!&S+GLys7o@19#!_bJ4~alt;ls@_wi zrKLX+TZ3zc0U@|M!P6+WsE8%851+(=hj;pDqGv0>vdz(hWlfW((s{`h!DB;FOuzP9 zbDQnJwT9#orY&B651>n$XGUj%0InaRlLgbx0U_8*kz+w`VWkh<#yq?iC&!w3)h>(c zQ4L~_*H_HnaFAX$0gf^Q+n}T6@$(YO&e|th&a#!yMHMrNT04+ge3lF~p$2R;lewqo zUO|yO%hSFz=h=^&Olen(Is9S)TXh0=dx%JiFuo8t)^^N1@mEtj0?ztMqlhz_d1km_27%Sl}n7d<@LVzWPoc7+Gf(MD0dKb{`;lF*j|aZ?B0D z?+0JYA}9~Qi}wzQ8iTGAnEiAUUIaO#_J=DaT+_QNgjlrYP`D+tW_4m%uf5v_?iMPONsu%_`_@8q~w z8+aJbhX}39w(&w6^AU3>;p|Tzhr80yWvn!O`mlcjFl;5R4jYvw*iyV>f|dAJY%OjE zjH*4-b}bV0a+0{o6h7RY!jTsA#zGai%Y6qgLTd{`kYq1V>j)C2EU9|{fbAK{K5Qnn!E_iawn{!~jqBoNMAw?5o-4X#S>g|N8yX`GQ>7`_0%y+kdr z?ZZb!1e`+@O32bl5rLkoYUd;KXO`!i+`T!B?{~bTBLz4f$j%wwhFr;lahWCq=mY_7 zklo*XSlT{T1fHg#BJK3EBv!*Vt@|MsK*D?@1aJ;v`w|z}2qgO}arY6#mpo)Y1lmUn zzE2RunJ?7t=XM?J&iv`Ioe9AcmgJ8dF@D?^j90zB91}s&oDB)&=ydI{_||1FU-gqO z3967ry*_mP>__T7-KY;yIuq42#;9v{v6~NCA;#ggrK_c|Vw@%P)?(mi zl}gWV{Z>l_-ureiTQO;Lu3CG02bJ(Ok!ZD4d`H=xqI*(x$DB(`CmRixW~X%a?zU^0 zn)S&?i24{+Se~JMDtd0{O-rUmyciu?#SUPnYh|t5vLYm<%g&a7T5iA@7f*|noG~WU z+;VO_MEweV)PuP%j&9#2S=>$4w`wjB$>>R>wFR>fNxV(>5Sc`5i2oFAewi;3+L_|C zz=S?Y7h(xiJ&H%DQNu$`R9K+oM@ew6A4Y1{J&{x=5|hvVcG|tb$egdH-`{Y-WDiI( z*rvJ_v`-e^a=%45iDz%7rw%*#XxxE+J2M%_FOA#k}BxY34mX6DQVtB%@gr&_uW$SRRMVh+n$BUtx?-_R65t)Cz$Lwd3novIYirS|^ zHBqW-q%OhDboBkPw1T;;2E*7jiXUPzPeL1Nf6~T2Z9;Lt@z^!M7j#Z9U zGKi_uOh897$eUAk1-iJaobH-DZR^@BsLrH0yz4Vdi$jayhV!Y3 zzrj0!hAxB8F6qzM03h8)Rfnr7cNWUf zoiP>JWXipk^5`k0-yQc&p^g3&g%l`#N0PE_7ZTN+zEEY%pXwtV+hIh2zw#*57DUVz zD=doYFaBBYgb(%9I+k;$C~EB@ANn<(cXLyb(_Fj^A0V3qzUiXxhV?1d#fDa8{9~@- zF0zzxrxNZ(i}Nc$8~|Y0c(dd65RKQ&B1hCU9`RtW`xDJS?}v)nyzS4}><;;Z+qfQS zi)sU>u>>bF%56dKcV?SeIBRktSq#4GUt#!ApCb-n$ovRL0uZ2uX0`!y;w7Kr(|pnP z&;pc90{iytwV3m|r{gerMy+M3x!8Tv`aCY4hGj-n_U+25rvVXNr-(k@Q1m_%JrhgX zr~2wo&~3N$TFHdn#g~zYy%CWWeeCBX&h$9$8QkinZ~de2TCm)%o}!)H&4{TKwMayX z@Au7sPlSpc(fR9i`!%?i8k}qWXlvVYADsw=W@>7}m()LvJ-|LID&6xcuDDmAK0!Qx zbaJ44ilVMmwg=Gq$E;gMrLYM7ELwN}@C0!E0zQX#GL2)l(c}yt>JGDd-KtcY-~xEe z=9a>Cc)PdToLW-q>)h7XzI8*U)zJD?@EpZm3!~X$*7MSBQzpssiOAM&sDmz{BD=2u zmY|ah%O5`e1MraXaXu%c@}cnyekBY#hux!?)%>*S~s$IABVm2ZT_E)%2NZ&bdw^JRaoj-@^+ z_Y?3-?id6t5As0dv?nU&MUo2MQWX0mj$2{u-&mk15grtL0LafkYaGpjmlrq+E}mww zQCHHPZ9LD6nLeR2;tym_KPLdQZnrD=hf&;%9fV{A7p<@09mgz>_WKmqSWlRm-;Ent z`|s1Z3&OOXp6{yjx}-7AE=gTJe4^|c1b+C&Y&mbiA{40nMeI;}_{qARw&2L*Xs<4= z?$i)~)O&2+5tf;CRPC109Q$~cN!pxUWrkei@b z0;5fy=m`b`r6Qo1-4D)U05b8LdSHp!D7>xIJ@rtioG~(tF0mc(9EHN1fg_#pg_CCa#!bzjo7{dr) zah~ZZP`#z5qR!9HJhL&~tQmxTp6JAH+n|$+-EaHuAvf^5413n> zvFMnxX{!&3>)b!8O{}n%-{0*Pw!IZDCWX%Ef-}tX;+OtjdJ-fk^0Py z-0y2{sA)As)^p#n7Us5OhW6e9$S|dRFXPtM1rt&TfsH~x7;Kb9Ytl3x#Cw&pQdC*? zQ!DI5qJkxD%NLMi&h0x0thC@$><}%~3Q}k%|(Pm-ON9Vq$rk z+*6z*r^N-<_+crIw9x(~fRoP()0w>wPE9^w7ybsK%L+;Aj2-Q>$drtr@Nn$>L=*%j zu_wQ!r|@fQp6DQWqJfeVf)IC4PdT|=M)Gj;d}t+ z_7b*Z<@d~^Fu}9mREUjbLb71}XardtD!kPg$&V)lp775w^LE(Fg;(Zzj_RZ z3AvRZ$M_xLZI$+1tqJWmT7eQF3hr>3r(8Fky^SY6Es{<1I~jW@m!pKC1N9Y#RtQYU zZD;X}HAxp8>SVnXIzY)dWJ@xa?Xj{Z(~#6>F^YzQBRz+oGpR;=9TM(Ic1e{w$pYeI zXXNLyXG4Sr$Yo4AExcJck3x3$BR)a4E6jHfZ3zl?i0v05jaN|U={2>D_L2J;zQ!n! zTz3kp(Aik7u6MY%Av$k`ep-%4P!cE=g|g$qD;}5-1BM#UQUUI;Ncr1&xpC!SYyF(~ zt8a<7?#_yT?Fa|rwa4Y=T!7`ulfowRS5s-`Qp};G>5H7b7RBhsC_j0#ib9T2PAhqu zTWo>(A@KYgojXl)>@V`TM{CN1KJ&C^#89uGi|6_T)3V zvv|4^YA9-QfWuRU$__6%XkMCUbxYqyr`aB1$k8O-n|nWOF@KbTg&3KmfS50yxX7EB zJvZzC;@GJz3W!>jC@I!pI=wg8MBQOGQl^RF-8_o=n}fu`G5 zcjOb^cpu82qEikG0})H<7dUwd(Trm-x<#X5&l&62l2`&?_t%Ss?(@uU^AVr~jgMNy zpVFOVy%WQ)JKONI92lH=BYno;;;1cc|GLXZUyNh%lMk*>aUzn>PC2JuE&OZ7%4hPH z=rDWl2mmjMO({Mq1xgXN)0}ythF7=u3LsN9 zbC>D51eD%UFK1sz(pDBl$@nLfW48$p9cFMz96%-~gAii8!y9W9WfMcs7kMFE_=v_x zX&uHLnwC1IEeawr(?0N+*{ZJ5ID=D>VnH9-K#IrJ#OiT%1Bsb`^qW?aE`H0JQq|I+ zDYg!V6m{veWLQr?{;7%nxrfh*Yxmcp+AVB;t5heX&Q|5YpC>V7IXm2Ic}(QYsN6Ia z;sB57$Dd%UmH0|egspQEtg92aiAC$=Wj;{v01A;^@UrvxrX#dJt3+cLU}0fF5+b1QKN}8c*VxU<)|AoN%*4#f(Ur;3*}>7w z+11L-gSH2>DB^vK;s;3@{9!iW?@- zU^ zp@I+;P4UN;1=@FTw)j6CzbgSh3y=3pr1P(H7S2Ydwq}2dAfx{}|MzzEE6o$bzpF{c zqd?CEia%n82LogLTlUuuF*xvimV^4&)&F%zHHk`k3qWUPL0|G;B7bkW(7*r&Okg`K z%6}BhJDav6gQor8fG&ySZ@{meV3@x^a6r0w!ao%q!tL5NfHG6X5rTn{zQF9j{e^)A zM$IF<0yRiADK6qaB8xbGpI@5C|FcY5@51gjPyloUNSgg00BCOz_cvykjO0I+&-ytC z=?$uUD5&x;@6H?v2!szzTfqHO3DsslD2pv9S`lP$psC$IwhVHRJOe0w$p6d;VUZM6 zxA+1qe+0H>k;k@IRn`at-{uIhfx41}Uz<0LLuhxZf=jQ>S}X|^DFT;S0v?JtGcYro2P>jd0PA^>Wy5&Sxq;g1W9 zTl?Lf&cBb3`6K_k{J-f6f8~06QND`nZ_MlU7dG&Mtm=h)o;OII9B8$U_-Fn9ri=nL z<;(iV`23ddSSP0X<1zAr`Q}CW+`#j-|50Q8j|T_oKNj$UWaI^wA@H}Z#~A$ofL@Rc zya2_7{s#Tnp!@TJUMviMAukpIk{1RleS6V>FP6W(kZ+9tT|RT>e=GH3z0nI$J@7Z^ zO$jt;`4QH?mAzQZ@dDS8@;9z>3-iwldJz`?0yCTbH%6ui_20T)1Yf_vO=tXtL;KI& zei7CB5|sTH2obox{i1>|q6lALdh>o`guY?@c|k8?$zI446#kY6R1^LCVqV1Dyuj#| zfG}i0_#K2lb^JYE0dhEAb{nzJz_T8jzn|qcJHPs6a2GIs2jnNUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell From 933b25c30063aed2a1830aaad12a83a0f72f3718 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Tue, 30 Mar 2021 13:06:24 +1100 Subject: [PATCH 10/65] Removing Travis --- .travis.yml | 21 --------------------- travis-build.sh | 10 ---------- 2 files changed, 31 deletions(-) delete mode 100644 .travis.yml delete mode 100755 travis-build.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ce92ecb..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -dist: trusty -language: java -sudo: false - -jdk: - - oraclejdk8 - -addons: - apt: - packages: - - oracle-java8-installer - -notifications: - email: false - -branches: - only: - - master - -script: -- ./gradlew clean test diff --git a/travis-build.sh b/travis-build.sh deleted file mode 100755 index c5e1815..0000000 --- a/travis-build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -ev -echo "current git hash:" -git rev-parse --short HEAD -BUILD_COMMAND="./gradlew assemble && ./gradlew check --info" -if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then - echo "Building on master" - BUILD_COMMAND="./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info" -fi -docker run -it --rm -v `pwd .`:/build -e RELEASE_VERSION=$RELEASE_VERSION -e BINTRAY_USER=$BINTRAY_USER -e BINTRAY_API_KEY=$BINTRAY_API_KEY -e MAVEN_CENTRAL_USER=$MAVEN_CENTRAL_USER -e MAVEN_CENTRAL_PASSWORD=$MAVEN_CENTRAL_PASSWORD -w /build openjdk:8u131-jdk bash -c "${BUILD_COMMAND}" From 82c84467f82583a8b5c458feae8507b93ad6b112 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Tue, 30 Mar 2021 13:54:39 +1100 Subject: [PATCH 11/65] Updating badges --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 504ae12..c5d6c54 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # Extended Validation for graphql-java -[![Build Status](https://api.travis-ci.org/graphql-java/graphql-java-extended-validation.svg?branch=master)](https://api.travis-ci.org/graphql-java/graphql-java-extended-validation.svg?branch=master)   -[![Download](https://api.bintray.com/packages/graphql-java/graphql-java/graphql-java-extended-validation/images/download.svg) ](https://bintray.com/graphql-java/graphql-java/graphql-java-extended-validation/_latestVersion) -[![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE)   + +[![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) From 1824a5d495e2a160715ba673339b23a5314fd706 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Fri, 9 Apr 2021 14:01:26 +1000 Subject: [PATCH 12/65] Updating to system.env --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fb07d38..9cc39b3 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ def getDevelopmentVersion() { } -def releaseVersion = System.properties.RELEASE_VERSION +def releaseVersion = System.env.RELEASE_VERSION version = releaseVersion ? releaseVersion : getDevelopmentVersion() println "Building version = " + version group = 'com.graphql-java' From 348a51b18144cf361a4f66538fd7556acf5030db Mon Sep 17 00:00:00 2001 From: Sunny Pelletier Date: Wed, 7 Jul 2021 04:42:11 -0400 Subject: [PATCH 13/65] Feature/bump hibernate validators version (#46) * fix schema wiring * bump version of hibernate validator * fix imports * refix imports * update dependency versions * upgrade jakarta context * remove useless dupplication of APIs * change editor config --- build.gradle | 9 +++---- .../validation/el/BetterMapELResolver.java | 4 +-- .../java/graphql/validation/el/ELSupport.java | 13 +++++----- .../ResourceBundleMessageInterpolator.java | 25 +++++++++---------- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 87e2a9c..8cd0cca 100644 --- a/build.gradle +++ b/build.gradle @@ -40,13 +40,10 @@ repositories { dependencies { compile "com.graphql-java:graphql-java:16.2" - compile 'org.slf4j:slf4j-api:1.7.30' - compile "jakarta.validation:jakarta.validation-api:2.0.2" - compile "org.hibernate.validator:hibernate-validator:6.1.7.Final" - compile "jakarta.el:jakarta.el-api:3.0.3" - compile "org.glassfish:jakarta.el:3.0.3" + compile "org.hibernate.validator:hibernate-validator:6.2.0.Final" + compile "org.glassfish:jakarta.el:4.0.0" - testCompile 'org.slf4j:slf4j-simple:1.7.30' + testCompile 'org.slf4j:slf4j-simple:1.7.31' testCompile 'org.spockframework:spock-core:1.3-groovy-2.5' testCompile 'org.codehaus.groovy:groovy-all:2.5.14' } diff --git a/src/main/java/graphql/validation/el/BetterMapELResolver.java b/src/main/java/graphql/validation/el/BetterMapELResolver.java index eb10b2e..59d6b88 100644 --- a/src/main/java/graphql/validation/el/BetterMapELResolver.java +++ b/src/main/java/graphql/validation/el/BetterMapELResolver.java @@ -1,9 +1,9 @@ package graphql.validation.el; import graphql.Internal; +import jakarta.el.ELContext; +import jakarta.el.MapELResolver; -import javax.el.ELContext; -import javax.el.MapELResolver; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/src/main/java/graphql/validation/el/ELSupport.java b/src/main/java/graphql/validation/el/ELSupport.java index c11d5cf..1571bae 100644 --- a/src/main/java/graphql/validation/el/ELSupport.java +++ b/src/main/java/graphql/validation/el/ELSupport.java @@ -1,16 +1,15 @@ package graphql.validation.el; import graphql.Internal; -import org.hibernate.validator.internal.engine.messageinterpolation.FormatterWrapper; - -import javax.el.ELContext; -import javax.el.ELManager; -import javax.el.ExpressionFactory; -import javax.el.StandardELContext; -import javax.el.ValueExpression; +import jakarta.el.ELContext; +import jakarta.el.ELManager; +import jakarta.el.ExpressionFactory; +import jakarta.el.StandardELContext; +import jakarta.el.ValueExpression; import java.lang.reflect.Method; import java.util.Locale; import java.util.Map; +import org.hibernate.validator.internal.engine.messageinterpolation.FormatterWrapper; @Internal @SuppressWarnings("unused") diff --git a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java index 76d83d3..8a1ac8a 100644 --- a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java +++ b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java @@ -7,27 +7,26 @@ import graphql.schema.GraphQLDirective; import graphql.validation.el.StandardELVariables; import graphql.validation.rules.ValidationEnvironment; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.Optional; +import java.util.ResourceBundle; +import javax.validation.Constraint; import javax.validation.Path; +import javax.validation.Payload; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.metadata.core.ConstraintHelper; import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl; import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType; import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind; import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor; +import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel; import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator; import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator; - -import javax.validation.Constraint; -import javax.validation.Payload; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.Optional; -import java.util.ResourceBundle; - import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.ElementType.FIELD; @@ -161,7 +160,7 @@ private MessageInterpolatorContext buildHibernateContext(Map mes return new MessageInterpolatorContext( constraintDescriptor, validatedValue, rootBeanType, - propertyPath, messageParams, expressionVariables); + propertyPath, messageParams, expressionVariables, ExpressionLanguageFeatureLevel.DEFAULT, true); } private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator hibernateInterpolator() { From 9e5f06ba83265c121718a808a2c132364a466800 Mon Sep 17 00:00:00 2001 From: MarcusWalz00 <66038843+MarcusWalz00@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:43:10 -0400 Subject: [PATCH 14/65] Ignore size constraint when value is null (#42) - GraphQL's `!` does this validation by default - This is standard Spring behavior --- .../validation/constraints/standard/SizeConstraint.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java b/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java index 5027f12..700c13d 100644 --- a/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java @@ -45,13 +45,17 @@ public boolean appliesToType(GraphQLInputType inputType) { @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); + + if(validatedValue == null) { + return Collections.emptyList(); + } + GraphQLInputType argType = validationEnvironment.getValidatedType(); GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); int min = getIntArg(directive, "min"); int max = getIntArg(directive, "max"); - - + int size = getStringOrIDOrObjectOrMapLength(argType, validatedValue); if (size < min) { From d779f85c728484887464393f45decf2423d3da13 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Wed, 21 Jul 2021 19:31:43 +1000 Subject: [PATCH 15/65] Upgrading to graphql-java 17 and test running again (#47) * Upgrading to graphql-java 17 and test running again * Upgrading to graphql-java 17 and test running again - read me update --- README.md | 8 ++++--- build.gradle | 6 +++-- .../AbstractDirectiveConstraint.java | 19 ++++++++------- .../AbstractDecimalMinMaxConstraint.java | 21 ++++++++-------- .../standard/AbstractMinMaxConstraint.java | 21 ++++++++-------- .../AbstractPositiveNegativeConstraint.java | 21 ++++++++-------- .../standard/DigitsConstraint.java | 21 ++++++++-------- .../constraints/standard/RangeConstraint.java | 21 ++++++++-------- .../ResourceBundleMessageInterpolator.java | 8 +++---- .../rules/TargetedValidationRules.java | 5 ++-- src/test/groovy/ELDiscover.java | 24 ++++++++++++------- 11 files changed, 95 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 39adb61..465d37e 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 16.0.0 + 17.0.0 pom ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:16.0.0' +compile 'com.graphql-java:graphql-java-extended-validation:17.0.0' ``` > Note: @@ -36,8 +36,10 @@ compile 'com.graphql-java:graphql-java-extended-validation:16.0.0' > use 15.0.1 or above for graphql-java 15.x and above > > use 16.0.0 or above for graphql-java 16.x and above +> +> use 17.0.0 or above for graphql-java 17.x and above -Its currently available from JCenter repo and Maven central. +It's currently available from Maven central. # SDL @Directive constraints diff --git a/build.gradle b/build.gradle index 8cd0cca..79ddf05 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat plugins { id 'java' + id 'groovy' id 'java-library' id 'maven' id 'maven-publish' @@ -39,8 +40,9 @@ repositories { dependencies { - compile "com.graphql-java:graphql-java:16.2" - compile "org.hibernate.validator:hibernate-validator:6.2.0.Final" + compile "com.graphql-java:graphql-java:17.0-beta1" + compile "com.graphql-java:graphql-java-extended-scalars:17.0-beta1" + compile "org.hibernate.validator:hibernate-validator:7.0.1.Final" compile "org.glassfish:jakarta.el:4.0.0" testCompile 'org.slf4j:slf4j-simple:1.7.31' diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index d268689..4b0138d 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -193,9 +193,10 @@ protected int getIntArg(GraphQLDirective directive, String argName) { if (argument == null) { return assertExpectedArgType(argName, "Int"); } - Number value = (Number) argument.getValue(); + + Number value = GraphQLArgument.getArgumentValue(argument); if (value == null) { - value = (Number) argument.getDefaultValue(); + value = GraphQLArgument.getArgumentDefaultValue(argument); if (value == null) { return assertExpectedArgType(argName, "Int"); } @@ -216,9 +217,9 @@ protected String getStrArg(GraphQLDirective directive, String argName) { if (argument == null) { return assertExpectedArgType(argName, "String"); } - String value = (String) argument.getValue(); + String value = GraphQLArgument.getArgumentValue(argument); if (value == null) { - value = (String) argument.getDefaultValue(); + value = GraphQLArgument.getArgumentDefaultValue(argument); if (value == null) { return assertExpectedArgType(argName, "String"); } @@ -239,9 +240,9 @@ protected boolean getBoolArg(GraphQLDirective directive, String argName) { if (argument == null) { return assertExpectedArgType(argName, "Boolean"); } - Object value = argument.getValue(); + Object value = GraphQLArgument.getArgumentValue(argument); if (value == null) { - value = argument.getDefaultValue(); + value = GraphQLArgument.getArgumentDefaultValue(argument); if (value == null) { return assertExpectedArgType(argName, "Boolean"); } @@ -261,9 +262,9 @@ protected String getMessageTemplate(GraphQLDirective directive) { String msg = null; GraphQLArgument arg = directive.getArgument("message"); if (arg != null) { - msg = (String) arg.getValue(); + msg = GraphQLArgument.getArgumentValue(arg); if (msg == null) { - msg = (String) arg.getDefaultValue(); + msg = GraphQLArgument.getArgumentDefaultValue(arg); } } if (msg == null) { @@ -316,7 +317,7 @@ protected List mkError(ValidationEnvironment validationEnvironment */ protected boolean isStringOrIDOrList(GraphQLInputType inputType) { return isStringOrID(inputType) || - isList(inputType); + isList(inputType); } /** diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java index f02688d..1fb9119 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java @@ -2,6 +2,7 @@ import graphql.GraphQLError; import graphql.Scalars; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; @@ -24,24 +25,24 @@ public AbstractDecimalMinMaxConstraint(String name) { public boolean appliesToType(GraphQLInputType inputType) { return isOneOfTheseTypes(inputType, Scalars.GraphQLString, // note we allow strings - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat ); } public List getApplicableTypeNames() { return Stream.of(Scalars.GraphQLString, // note we allow strings - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat) .map(GraphQLScalarType::getName) .collect(Collectors.toList()); diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java index 1463e1c..52efb2e 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java @@ -2,6 +2,7 @@ import graphql.GraphQLError; import graphql.Scalars; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; @@ -24,23 +25,23 @@ public AbstractMinMaxConstraint(String name) { @Override public boolean appliesToType(GraphQLInputType inputType) { return isOneOfTheseTypes(inputType, - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat ); } public List getApplicableTypeNames() { - return Stream.of(Scalars.GraphQLByte, - Scalars.GraphQLShort, + return Stream.of(ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat) .map(GraphQLScalarType::getName) .collect(toList()); diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java index b2a89e3..916875d 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java @@ -2,6 +2,7 @@ import graphql.GraphQLError; import graphql.Scalars; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; @@ -24,23 +25,23 @@ public AbstractPositiveNegativeConstraint(String name) { @Override public boolean appliesToType(GraphQLInputType inputType) { return isOneOfTheseTypes(inputType, - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat ); } public List getApplicableTypeNames() { - return Stream.of(Scalars.GraphQLByte, - Scalars.GraphQLShort, + return Stream.of(ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat) .map(GraphQLScalarType::getName) .collect(toList()); diff --git a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java index 11da22b..c162c36 100644 --- a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java @@ -2,6 +2,7 @@ import graphql.GraphQLError; import graphql.Scalars; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; @@ -32,12 +33,12 @@ public Documentation getDocumentation() { .example("buyCar( carCost : Float @Digits(integer : 5, fraction : 2) : DriverDetails") .applicableTypeNames(Stream.of(Scalars.GraphQLString, - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat) .map(GraphQLScalarType::getName) .collect(toList())) @@ -52,12 +53,12 @@ public Documentation getDocumentation() { public boolean appliesToType(GraphQLInputType inputType) { return isOneOfTheseTypes(inputType, Scalars.GraphQLString, - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat ); } diff --git a/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java b/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java index 292320b..17c28a8 100644 --- a/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java @@ -2,6 +2,7 @@ import graphql.GraphQLError; import graphql.Scalars; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; @@ -35,12 +36,12 @@ public Documentation getDocumentation() { .example("driver( milesTravelled : Int @Range( min : 1000, max : 100000)) : DriverDetails") .applicableTypeNames(Stream.of(GraphQLString, - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat) .map(GraphQLScalarType::getName) .collect(toList())) @@ -55,12 +56,12 @@ Integer.MAX_VALUE, getMessageTemplate()) public boolean appliesToType(GraphQLInputType inputType) { return isOneOfTheseTypes(inputType, GraphQLString, - Scalars.GraphQLByte, - Scalars.GraphQLShort, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, Scalars.GraphQLInt, - Scalars.GraphQLLong, - Scalars.GraphQLBigDecimal, - Scalars.GraphQLBigInteger, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger, Scalars.GraphQLFloat ); } diff --git a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java index 8a1ac8a..0896a8b 100644 --- a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java +++ b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java @@ -15,9 +15,9 @@ import java.util.MissingResourceException; import java.util.Optional; import java.util.ResourceBundle; -import javax.validation.Constraint; -import javax.validation.Path; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Path; +import jakarta.validation.Payload; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.metadata.core.ConstraintHelper; import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl; @@ -160,7 +160,7 @@ private MessageInterpolatorContext buildHibernateContext(Map mes return new MessageInterpolatorContext( constraintDescriptor, validatedValue, rootBeanType, - propertyPath, messageParams, expressionVariables, ExpressionLanguageFeatureLevel.DEFAULT, true); + propertyPath, messageParams, expressionVariables, ExpressionLanguageFeatureLevel.BEAN_PROPERTIES, true); } private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator hibernateInterpolator() { diff --git a/src/main/java/graphql/validation/rules/TargetedValidationRules.java b/src/main/java/graphql/validation/rules/TargetedValidationRules.java index 2ef7207..b12a8aa 100644 --- a/src/main/java/graphql/validation/rules/TargetedValidationRules.java +++ b/src/main/java/graphql/validation/rules/TargetedValidationRules.java @@ -69,7 +69,7 @@ public List runValidationRules(DataFetchingEnvironment env, Messag List errors = new ArrayList<>(); - GraphQLObjectType fieldContainer = env.getExecutionStepInfo().getFieldContainer(); + GraphQLObjectType fieldContainer = env.getExecutionStepInfo().getObjectType(); GraphQLFieldDefinition fieldDefinition = env.getFieldDefinition(); ResultPath fieldPath = env.getExecutionStepInfo().getPath(); // @@ -162,8 +162,7 @@ private List walkObjectArg(ValidationRule rule, ValidationEnvironm for (GraphQLInputObjectField inputField : fieldDefinitions) { GraphQLInputType fieldType = inputField.getType(); - List directives = inputField.getDirectives(); - Object validatedValue = objectMap.getOrDefault(inputField.getName(), inputField.getDefaultValue()); + Object validatedValue = objectMap.getOrDefault(inputField.getName(), GraphQLInputObjectField.getInputFieldDefaultValue(inputField)); if (validatedValue == null) { continue; } diff --git a/src/test/groovy/ELDiscover.java b/src/test/groovy/ELDiscover.java index b03459d..e09e511 100644 --- a/src/test/groovy/ELDiscover.java +++ b/src/test/groovy/ELDiscover.java @@ -1,3 +1,11 @@ +import jakarta.el.ELContext; +import jakarta.el.ELManager; +import jakarta.el.ExpressionFactory; +import jakarta.el.StandardELContext; +import jakarta.el.ValueExpression; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.constraints.Range; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.engine.path.PathImpl; @@ -6,16 +14,9 @@ import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType; import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind; import org.hibernate.validator.internal.util.annotation.ConstraintAnnotationDescriptor; +import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel; import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator; -import javax.el.ELContext; -import javax.el.ELManager; -import javax.el.ExpressionFactory; -import javax.el.StandardELContext; -import javax.el.ValueExpression; -import javax.validation.MessageInterpolator; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotNull; import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; @@ -104,8 +105,13 @@ public static void main(String[] args) throws Exception { PathImpl rootPath = PathImpl.createRootPath(); + ExpressionLanguageFeatureLevel level = ExpressionLanguageFeatureLevel.BEAN_METHODS; MessageInterpolator.Context context = new MessageInterpolatorContext( - constraintDescriptor, user, null, rootPath, Collections.emptyMap(), Collections.emptyMap()); + constraintDescriptor, user, null, rootPath, + Collections.emptyMap(), Collections.emptyMap(), + level, + true); + print("${validatedValue.age}", messageInterpolator, context); print("${validatedValue}", messageInterpolator, context); From 6ffc6742e79ef88b292855f9dad6ce77ebe1294c Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Tue, 3 Aug 2021 19:32:32 +1000 Subject: [PATCH 16/65] Upgrading to graphql-java 17.0 (#49) --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 79ddf05..facdca6 100644 --- a/build.gradle +++ b/build.gradle @@ -40,8 +40,8 @@ repositories { dependencies { - compile "com.graphql-java:graphql-java:17.0-beta1" - compile "com.graphql-java:graphql-java-extended-scalars:17.0-beta1" + compile "com.graphql-java:graphql-java:17.0" + compile "com.graphql-java:graphql-java-extended-scalars:17.0" compile "org.hibernate.validator:hibernate-validator:7.0.1.Final" compile "org.glassfish:jakarta.el:4.0.0" From 6ec5b5882c40baa5c971d1b86d647bf05c3bb002 Mon Sep 17 00:00:00 2001 From: Sunny Pelletier Date: Thu, 25 Nov 2021 19:26:46 -0500 Subject: [PATCH 17/65] Feature/support list element validation for all constraints (#48) * fix schema wiring * refactor validation rules * refactor a little * continue * simplify all constraints * fix constraints * add support for list elements for every type of constraint * test * it works * fix tests * fix stuff * add tests * revert small change * add more tests * fix all * update * update readme with new constraints * final reade update * Delete AbstractListElementValidatorConstraint.java * revert readme change --- README.md | 58 +++++++++---- build.gradle | 17 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../AbstractDirectiveConstraint.java | 79 ++++++++++------- .../constraints/DirectiveConstraints.java | 7 +- .../validation/constraints/Documentation.java | 16 +++- .../GraphQLListElementValidator.java | 41 +++++++++ .../constraints/GraphQLScalars.java | 26 ++++++ .../standard/AbstractAssertConstraint.java | 25 ++---- .../AbstractDecimalMinMaxConstraint.java | 51 +++-------- .../standard/AbstractMinMaxConstraint.java | 51 +++-------- .../standard/AbstractNotEmptyRule.java | 28 ++++++ .../AbstractPositiveNegativeConstraint.java | 43 +++------- .../standard/AbstractSizeConstraint.java | 33 +++++++ .../standard/AssertFalseConstraint.java | 6 +- .../standard/AssertTrueConstraint.java | 6 +- .../standard/ContainerNotEmptyConstraint.java | 34 ++++++++ .../standard/ContainerSizeConstraint.java | 35 ++++++++ .../standard/DecimalMaxConstraint.java | 6 +- .../standard/DecimalMinConstraint.java | 6 +- .../standard/DigitsConstraint.java | 50 +++-------- .../standard/ExpressionConstraint.java | 16 ++-- .../constraints/standard/MaxConstraint.java | 6 +- .../constraints/standard/MinConstraint.java | 6 +- .../standard/NegativeConstraint.java | 6 +- .../standard/NegativeOrZeroConstraint.java | 8 +- .../constraints/standard/NotBlankRule.java | 43 +--------- .../constraints/standard/NotEmptyRule.java | 37 ++------ .../standard/PatternConstraint.java | 43 +++------- .../standard/PositiveConstraint.java | 8 +- .../standard/PositiveOrZeroConstraint.java | 7 +- .../constraints/standard/RangeConstraint.java | 56 +++--------- .../constraints/standard/SizeConstraint.java | 52 ++---------- .../validation/ValidationMessages.properties | 2 + .../AbstractDirectiveConstraintTest.groovy | 20 ++--- .../DirectiveConstraintsTest.groovy | 8 +- .../AssertTrueFalseConstraintTest.groovy | 30 ++++--- .../DecimalMinMaxConstraintTest.groovy | 31 ++++--- .../standard/DigitsConstraintTest.groovy | 48 ++++++----- .../standard/ExpressionConstraintTest.groovy | 5 +- .../standard/MinMaxConstraintTest.groovy | 41 +++++---- .../NegativePositiveConstraintTest.groovy | 79 ++++++++++------- .../NoEmptyBlankConstraintTest.groovy | 85 ++++++++++++------- .../standard/PatternConstraintTest.groovy | 6 +- .../standard/RangeConstraintTest.groovy | 5 ++ .../standard/SizeConstraintTest.groovy | 39 +++++++-- 46 files changed, 676 insertions(+), 631 deletions(-) create mode 100644 src/main/java/graphql/validation/constraints/GraphQLListElementValidator.java create mode 100644 src/main/java/graphql/validation/constraints/GraphQLScalars.java create mode 100644 src/main/java/graphql/validation/constraints/standard/AbstractNotEmptyRule.java create mode 100644 src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java create mode 100644 src/main/java/graphql/validation/constraints/standard/ContainerNotEmptyConstraint.java create mode 100644 src/main/java/graphql/validation/constraints/standard/ContainerSizeConstraint.java diff --git a/README.md b/README.md index 465d37e..a4fdcb3 100644 --- a/README.md +++ b/README.md @@ -261,7 +261,7 @@ The boolean value must be false. - Example : `updateDriver( isDrunk : Boolean @AssertFalse) : DriverDetails` -- Applies to : `Boolean` +- Applies to : `Boolean`, `Lists` - SDL : `directive @AssertFalse(message : String = "graphql.validation.AssertFalse.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -274,7 +274,7 @@ The boolean value must be true. - Example : `driveCar( hasLicence : Boolean @AssertTrue) : DriverDetails` -- Applies to : `Boolean` +- Applies to : `Boolean`, `Lists` - SDL : `directive @AssertTrue(message : String = "graphql.validation.AssertTrue.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -287,7 +287,7 @@ The element must be a number whose value must be less than or equal to the speci - Example : `driveCar( bloodAlcoholLevel : Float @DecimalMax(value : "0.05") : DriverDetails` -- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @DecimalMax(value : String!, inclusive : Boolean! = true, message : String = "graphql.validation.DecimalMax.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -300,7 +300,7 @@ The element must be a number whose value must be greater than or equal to the sp - Example : `driveCar( carHorsePower : Float @DecimalMin(value : "300.50") : DriverDetails` -- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @DecimalMin(value : String!, inclusive : Boolean! = true, message : String = "graphql.validation.DecimalMin.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -313,7 +313,7 @@ The element must be a number inside the specified `integer` and `fraction` range - Example : `buyCar( carCost : Float @Digits(integer : 5, fraction : 2) : DriverDetails` -- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @Digits(integer : Int!, fraction : Int!, message : String = "graphql.validation.Digits.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -340,7 +340,7 @@ The element must be a number whose value must be less than or equal to the speci - Example : `driveCar( horsePower : Float @Max(value : 1000) : DriverDetails` -- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @Max(value : Int! = 2147483647, message : String = "graphql.validation.Max.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -353,7 +353,7 @@ The element must be a number whose value must be greater than or equal to the sp - Example : `driveCar( age : Int @Min(value : 18) : DriverDetails` -- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @Min(value : Int! = 0, message : String = "graphql.validation.Min.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -366,7 +366,7 @@ The element must be a negative number. - Example : `driveCar( lostLicencePoints : Int @Negative) : DriverDetails` -- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @Negative(message : String = "graphql.validation.Negative.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -379,7 +379,7 @@ The element must be a negative number or zero. - Example : `driveCar( lostLicencePoints : Int @NegativeOrZero) : DriverDetails` -- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @NegativeOrZero(message : String = "graphql.validation.NegativeOrZero.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -401,16 +401,28 @@ The String must contain at least one non-whitespace character, according to Java ### @NotEmpty -The element must have a non zero size. +The element must have a non-zero size. -- Example : `updateAccident( accidentNotes : [Notes]! @NotEmpty) : DriverDetails` +- Example : `updateAccident( accidentNotes : String! @NotEmpty) : DriverDetails` -- Applies to : `String`, `ID`, `Lists`, `Input Objects` +- Applies to : `String`, `ID`, `Lists` - SDL : `directive @NotEmpty(message : String = "graphql.validation.NotEmpty.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` - Message : `graphql.validation.NotEmpty.message` +### @ContainerNotEmpty + +The list or input object must have a non-zero size. + +- Example : `updateAccident( accidentNotes : [Notes]! @ContainerNotEmpty) : DriverDetails` + +- Applies to : `Lists`, `Input Objects` + +- SDL : `directive @ContainerNotEmpty(message : String = "graphql.validation.ContainerNotEmpty.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` + +- Message : `graphql.validation.ContainerNotEmpty.message` + ### @Pattern @@ -431,7 +443,7 @@ The element must be a positive number. - Example : `driver( licencePoints : Int @Positive) : DriverDetails` -- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @Positive(message : String = "graphql.validation.Positive.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -444,7 +456,7 @@ The element must be a positive number or zero. - Example : `driver( licencePoints : Int @PositiveOrZero) : DriverDetails` -- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @PositiveOrZero(message : String = "graphql.validation.PositiveOrZero.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -457,7 +469,7 @@ The element range must be between the specified `min` and `max` boundaries (incl - Example : `driver( milesTravelled : Int @Range( min : 1000, max : 100000)) : DriverDetails` -- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float` +- Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` - SDL : `directive @Range(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.Range.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` @@ -466,14 +478,26 @@ The element range must be between the specified `min` and `max` boundaries (incl ### @Size -The element size must be between the specified `min` and `max` boundaries (inclusive). +The string's size must be between the specified `min` and `max` boundaries (inclusive). - Example : `updateDrivingNotes( drivingNote : String @Size( min : 1000, max : 100000)) : DriverDetails` -- Applies to : `String`, `ID`, `Lists`, `Input Objects` +- Applies to : `String`, `ID`, `Lists` - SDL : `directive @Size(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.Size.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` - Message : `graphql.validation.Size.message` +### @ContainerSize + +The list's or input object's size must be between the specified `min` and `max` boundaries (inclusive). + +- Example : `updateDrivingNotes( drivingNote : [String!]! @ContainerSize( min : 10, max : 20)) : DriverDetails` + +- Applies to : `Lists`, `Input Objects` + +- SDL : `directive @ContainerSize(min : Int = 0, max : Int = 2147483647, message : String = "graphql.validation.ContainerSize.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` + +- Message : `graphql.validation.ContainerSize.message` + diff --git a/build.gradle b/build.gradle index facdca6..88ad13e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ plugins { id 'java' id 'groovy' id 'java-library' - id 'maven' id 'maven-publish' id 'signing' id "io.github.gradle-nexus.publish-plugin" version "1.0.0" @@ -40,14 +39,14 @@ repositories { dependencies { - compile "com.graphql-java:graphql-java:17.0" - compile "com.graphql-java:graphql-java-extended-scalars:17.0" - compile "org.hibernate.validator:hibernate-validator:7.0.1.Final" - compile "org.glassfish:jakarta.el:4.0.0" - - testCompile 'org.slf4j:slf4j-simple:1.7.31' - testCompile 'org.spockframework:spock-core:1.3-groovy-2.5' - testCompile 'org.codehaus.groovy:groovy-all:2.5.14' + api "com.graphql-java:graphql-java:17.0" + api "com.graphql-java:graphql-java-extended-scalars:17.0" + api "org.hibernate.validator:hibernate-validator:7.0.1.Final" + api "org.glassfish:jakarta.el:4.0.0" + + testImplementation 'org.slf4j:slf4j-simple:1.7.31' + testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' + testImplementation 'org.codehaus.groovy:groovy-all:2.5.14' } task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de..05679dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index 4b0138d..4cfc79b 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -16,16 +16,15 @@ import graphql.validation.rules.ValidationEnvironment; import graphql.validation.util.DirectivesAndTypeWalker; import graphql.validation.util.Util; - import java.lang.reflect.Array; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import static graphql.schema.GraphQLTypeUtil.isList; import static graphql.validation.rules.ValidationEnvironment.ValidatedElement.FIELD; import static graphql.validation.util.Util.mkMap; @@ -70,10 +69,18 @@ public boolean appliesTo(GraphQLArgument argument, GraphQLFieldDefinition fieldD boolean hasNamedDirective = directive.getName().equals(this.getName()); if (hasNamedDirective) { inputType = Util.unwrapNonNull(inputType); - boolean appliesToType = appliesToType(inputType); + + boolean appliesToType; + if (appliesToListElements()) { + appliesToType = appliesToType((GraphQLInputType) GraphQLTypeUtil.unwrapAll(inputType)); + } else { + appliesToType = appliesToType(inputType); + } + if (appliesToType) { return true; } + // if they have a @Directive on there BUT it can't handle that type // then is a really bad situation String argType = GraphQLTypeUtil.simplePrint(inputType); @@ -88,7 +95,6 @@ public boolean appliesTo(GraphQLArgument argument, GraphQLFieldDefinition fieldD * A derived class will be called to indicate whether this input type applies to the constraint * * @param inputType the input type - * * @return true if the constraint can handle that type */ abstract protected boolean appliesToType(GraphQLInputType inputType); @@ -97,22 +103,20 @@ public boolean appliesTo(GraphQLArgument argument, GraphQLFieldDefinition fieldD * This is called to perform the constraint validation * * @param validationEnvironment the validation environment - * * @return a list of errors or an empty one if there are no errors */ abstract protected List runConstraint(ValidationEnvironment validationEnvironment); - @SuppressWarnings("unchecked") @Override public List runValidation(ValidationEnvironment validationEnvironment) { + Object validatedValue = validationEnvironment.getValidatedValue(); // output fields are special if (validationEnvironment.getValidatedElement() == FIELD) { - return runFieldValidationImpl(validationEnvironment); + return runValidationImpl(validationEnvironment); } - Object validatedValue = validationEnvironment.getValidatedValue(); // // all the directives validation code does NOT care for NULL ness since the graphql engine covers that. // eg a @NonNull validation directive makes no sense in graphql like it might in Java @@ -124,15 +128,10 @@ public List runValidation(ValidationEnvironment validationEnvironm GraphQLInputType inputType = Util.unwrapNonNull(validationEnvironment.getValidatedType()); validationEnvironment = validationEnvironment.transform(b -> b.validatedType(inputType)); - return runValidationImpl(validationEnvironment, inputType, validatedValue); + return runValidationImpl(validationEnvironment); } - private List runFieldValidationImpl(ValidationEnvironment validationEnvironment) { - return runConstraintOnDirectives(validationEnvironment); - } - - @SuppressWarnings("unchecked") - private List runValidationImpl(ValidationEnvironment validationEnvironment, GraphQLInputType inputType, Object validatedValue) { + private List runValidationImpl(ValidationEnvironment validationEnvironment) { return runConstraintOnDirectives(validationEnvironment); } @@ -152,22 +151,37 @@ private List runConstraintOnDirectives(ValidationEnvironment valid validationEnvironment = validationEnvironment.transform(b -> b.context(GraphQLDirective.class, directive)); // // now run the directive rule with this directive instance - List ruleErrors = this.runConstraint(validationEnvironment); + List ruleErrors = this.runConstrainOnPossibleListElements(validationEnvironment); errors.addAll(ruleErrors); } + return errors; } + private List runConstrainOnPossibleListElements(ValidationEnvironment validationEnvironment) { + if (appliesToListElements()) { + final GraphQLListElementValidator validator = new GraphQLListElementValidator(); + return validator.runConstraintOnListElements(validationEnvironment, this::runConstraint); + } + + return runConstraint(validationEnvironment); + } + + protected abstract boolean appliesToListElements(); + + + protected boolean isOneOfTheseTypes(GraphQLInputType inputType, GraphQLScalarType... scalarTypes) { + return isOneOfTheseTypes(inputType, Arrays.asList(scalarTypes)); + } /** * Returns true of the input type is one of the specified scalar types, regardless of non null ness * * @param inputType the type to check * @param scalarTypes the array of scalar types - * * @return true if its one of them */ - protected boolean isOneOfTheseTypes(GraphQLInputType inputType, GraphQLScalarType... scalarTypes) { + protected boolean isOneOfTheseTypes(GraphQLInputType inputType, Collection scalarTypes) { GraphQLInputType type = Util.unwrapNonNull(inputType); if (type instanceof GraphQLNamedInputType) { final GraphQLNamedInputType unwrappedType = (GraphQLNamedInputType) type; @@ -185,7 +199,6 @@ protected boolean isOneOfTheseTypes(GraphQLInputType inputType, GraphQLScalarTyp * * @param directive the directive to check * @param argName the argument name - * * @return a non null value */ protected int getIntArg(GraphQLDirective directive, String argName) { @@ -209,7 +222,6 @@ protected int getIntArg(GraphQLDirective directive, String argName) { * * @param directive the directive to check * @param argName the argument name - * * @return a non null value */ protected String getStrArg(GraphQLDirective directive, String argName) { @@ -232,7 +244,6 @@ protected String getStrArg(GraphQLDirective directive, String argName) { * * @param directive the directive to check * @param argName the argument name - * * @return a non null value */ protected boolean getBoolArg(GraphQLDirective directive, String argName) { @@ -255,7 +266,6 @@ protected boolean getBoolArg(GraphQLDirective directive, String argName) { * called "graphql.validation.{name}.message" * * @param directive the directive to check - * * @return a non null value */ protected String getMessageTemplate(GraphQLDirective directive) { @@ -279,7 +289,6 @@ protected String getMessageTemplate(GraphQLDirective directive) { * @param validatedValue the value being validated * @param validationEnvironment the validation environment * @param args must be an key / value array with String keys as the even params and values as then odd params - * * @return a map of message parameters */ protected Map mkMessageParams(Object validatedValue, ValidationEnvironment validationEnvironment, Object... args) { @@ -299,7 +308,6 @@ protected Map mkMessageParams(Object validatedValue, ValidationE * @param validationEnvironment the current validation environment * @param directive the directive being run * @param msgParams the map of parameters - * * @return a list of a single error */ protected List mkError(ValidationEnvironment validationEnvironment, GraphQLDirective directive, Map msgParams) { @@ -308,11 +316,18 @@ protected List mkError(ValidationEnvironment validationEnvironment return singletonList(error); } + protected List mkError(ValidationEnvironment validationEnvironment, Object... messageParameters) { + GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + String messageTemplate = getMessageTemplate(directive); + Object validatedValue = validationEnvironment.getValidatedValue(); + GraphQLError error = validationEnvironment.getInterpolator().interpolate(messageTemplate, mkMessageParams(validatedValue, validationEnvironment, messageParameters), validationEnvironment); + return singletonList(error); + } + /** * Return true if the type is a String or ID or List type, regardless of non null ness * * @param inputType the type to check - * * @return true if one of the above */ protected boolean isStringOrIDOrList(GraphQLInputType inputType) { @@ -324,21 +339,23 @@ protected boolean isStringOrIDOrList(GraphQLInputType inputType) { * Return true if the type is a String or ID or List type or {@link graphql.schema.GraphQLInputObjectType}, regardless of non null ness * * @param inputType the type to check - * * @return true if one of the above */ protected boolean isStringOrIDOrListOrMap(GraphQLInputType inputType) { - GraphQLInputType unwrappedType = Util.unwrapOneAndAllNonNull(inputType); return isStringOrID(inputType) || isList(inputType) || - (unwrappedType instanceof GraphQLInputObjectType); + isMap(inputType); + } + + protected boolean isMap(GraphQLInputType inputType) { + GraphQLInputType unwrappedType = Util.unwrapOneAndAllNonNull(inputType); + return (unwrappedType instanceof GraphQLInputObjectType); } /** * Return true if the type is a String or ID * * @param inputType the type to check - * * @return true if one of the above */ protected boolean isStringOrID(GraphQLInputType inputType) { @@ -350,7 +367,6 @@ protected boolean isStringOrID(GraphQLInputType inputType) { * Casts the object as a Map with an assertion of it is not one * * @param value the object to turn into a map - * * @return a Map */ @SuppressWarnings("ConstantConditions") @@ -363,7 +379,6 @@ protected Map asMap(Object value) { * Makes the object a BigDecimal with an assertion if we have no conversion of it * * @param value the object to turn into a BigDecimal - * * @return a BigDecimal */ protected BigDecimal asBigDecimal(Object value) throws NumberFormatException { @@ -388,7 +403,6 @@ protected BigDecimal asBigDecimal(Object value) throws NumberFormatException { * Makes the object a boolean with an assertion if we have no conversion of it * * @param value the boolean object - * * @return a boolean */ protected boolean asBoolean(Object value) { @@ -407,7 +421,6 @@ protected boolean asBoolean(Object value) { * * @param inputType the input type * @param value the value - * * @return the length of a String or Map or List */ protected int getStringOrIDOrObjectOrMapLength(GraphQLInputType inputType, Object value) { diff --git a/src/main/java/graphql/validation/constraints/DirectiveConstraints.java b/src/main/java/graphql/validation/constraints/DirectiveConstraints.java index 7c91471..a775d41 100644 --- a/src/main/java/graphql/validation/constraints/DirectiveConstraints.java +++ b/src/main/java/graphql/validation/constraints/DirectiveConstraints.java @@ -7,6 +7,8 @@ import graphql.schema.idl.TypeDefinitionRegistry; import graphql.validation.constraints.standard.AssertFalseConstraint; import graphql.validation.constraints.standard.AssertTrueConstraint; +import graphql.validation.constraints.standard.ContainerNotEmptyConstraint; +import graphql.validation.constraints.standard.ContainerSizeConstraint; import graphql.validation.constraints.standard.DecimalMaxConstraint; import graphql.validation.constraints.standard.DecimalMinConstraint; import graphql.validation.constraints.standard.DigitsConstraint; @@ -61,7 +63,10 @@ public class DirectiveConstraints { new PositiveOrZeroConstraint(), new PositiveConstraint(), new RangeConstraint(), - new SizeConstraint() + new SizeConstraint(), + new ContainerSizeConstraint(), + new ContainerNotEmptyConstraint() + ); private final Map constraints; diff --git a/src/main/java/graphql/validation/constraints/Documentation.java b/src/main/java/graphql/validation/constraints/Documentation.java index 355dba0..d1c746a 100644 --- a/src/main/java/graphql/validation/constraints/Documentation.java +++ b/src/main/java/graphql/validation/constraints/Documentation.java @@ -1,10 +1,11 @@ package graphql.validation.constraints; +import graphql.schema.GraphQLNamedType; import graphql.schema.idl.SchemaParser; import graphql.schema.idl.TypeDefinitionRegistry; - import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public class Documentation { @@ -80,14 +81,23 @@ public Builder messageTemplate(String messageTemplate) { return this; } + public Builder applicableTypes(List applicableTypes) { + this.applicableTypeNames = applicableTypes.stream().map(GraphQLNamedType::getName).collect(Collectors.toList()); + return this; + } + + public Builder applicableTypes(GraphQLNamedType... applicableTypes) { + return applicableTypes(Arrays.asList(applicableTypes)); + } + + public Builder applicableTypeNames(List applicableTypeNames) { this.applicableTypeNames = applicableTypeNames; return this; } public Builder applicableTypeNames(String... applicableTypeNames) { - this.applicableTypeNames = Arrays.asList(applicableTypeNames); - return this; + return applicableTypeNames(Arrays.asList(applicableTypeNames)); } public Documentation build() { diff --git a/src/main/java/graphql/validation/constraints/GraphQLListElementValidator.java b/src/main/java/graphql/validation/constraints/GraphQLListElementValidator.java new file mode 100644 index 0000000..662e1bb --- /dev/null +++ b/src/main/java/graphql/validation/constraints/GraphQLListElementValidator.java @@ -0,0 +1,41 @@ +package graphql.validation.constraints; + +import graphql.GraphQLError; +import graphql.schema.GraphQLInputType; +import graphql.schema.GraphQLTypeUtil; +import graphql.validation.rules.ValidationEnvironment; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class GraphQLListElementValidator { + public boolean appliesToType(GraphQLInputType inputType, Function appliesToTypeOrListElement) { + if (GraphQLTypeUtil.isList(inputType)) { + return appliesToTypeOrListElement.apply((GraphQLInputType) GraphQLTypeUtil.unwrapAll(inputType)); + } + + return appliesToTypeOrListElement.apply(inputType); + } + + public List runConstraintOnListElements(ValidationEnvironment validationEnvironment, Function> runConstraintOnElement) { + Object validatedValue = validationEnvironment.getValidatedValue(); + + if (validatedValue instanceof Collection) { + final AtomicInteger index = new AtomicInteger(0); + return ((Collection) validatedValue) + .stream() + .flatMap((item) -> item == null ? Stream.empty() : runConstraintOnElement.apply(validationEnvironment.transform((environment) -> { + environment + .validatedValue(item) + .validatedPath(validationEnvironment.getValidatedPath().segment(index.getAndIncrement())) + .validatedType((GraphQLInputType) GraphQLTypeUtil.unwrapAll(validationEnvironment.getValidatedType())); + })).stream()) + .collect(Collectors.toList()); + } + + return runConstraintOnElement.apply(validationEnvironment); + } +} diff --git a/src/main/java/graphql/validation/constraints/GraphQLScalars.java b/src/main/java/graphql/validation/constraints/GraphQLScalars.java new file mode 100644 index 0000000..b8dfb69 --- /dev/null +++ b/src/main/java/graphql/validation/constraints/GraphQLScalars.java @@ -0,0 +1,26 @@ +package graphql.validation.constraints; + +import graphql.Scalars; +import graphql.scalars.ExtendedScalars; +import graphql.schema.GraphQLScalarType; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class GraphQLScalars { + public static final List GRAPHQL_NUMBER_TYPES = Arrays.asList( + Scalars.GraphQLInt, + Scalars.GraphQLFloat, + ExtendedScalars.GraphQLByte, + ExtendedScalars.GraphQLShort, + ExtendedScalars.GraphQLLong, + ExtendedScalars.GraphQLBigDecimal, + ExtendedScalars.GraphQLBigInteger + ); + + public static final List GRAPHQL_NUMBER_AND_STRING_TYPES = Stream.concat( + Stream.of(Scalars.GraphQLString, Scalars.GraphQLID), + GraphQLScalars.GRAPHQL_NUMBER_TYPES.stream() + ).collect(Collectors.toList()); +} diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractAssertConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractAssertConstraint.java index 9f5ddc7..fadd286 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractAssertConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractAssertConstraint.java @@ -1,49 +1,40 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.rules.ValidationEnvironment; - import java.util.Collections; import java.util.List; - import static graphql.Scalars.GraphQLBoolean; abstract class AbstractAssertConstraint extends AbstractDirectiveConstraint { - public AbstractAssertConstraint(String name) { super(name); } - @Override public boolean appliesToType(GraphQLInputType inputType) { - return isOneOfTheseTypes(inputType, - GraphQLBoolean - ); + return isOneOfTheseTypes(inputType, GraphQLBoolean); } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - //null values are valid - if (validatedValue == null) { - return Collections.emptyList(); - } - - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); boolean isTrue = asBoolean(validatedValue); - if (!isOK(isTrue)) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); + if (!isOK(isTrue)) { + return mkError(validationEnvironment); } + return Collections.emptyList(); } protected abstract boolean isOK(boolean isTrue); - + @Override + protected boolean appliesToListElements() { + return true; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java index 1fb9119..5e92a30 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java @@ -1,60 +1,33 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.Scalars; -import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.rules.ValidationEnvironment; - import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; abstract class AbstractDecimalMinMaxConstraint extends AbstractDirectiveConstraint { - public AbstractDecimalMinMaxConstraint(String name) { super(name); } - @Override - public boolean appliesToType(GraphQLInputType inputType) { - return isOneOfTheseTypes(inputType, - Scalars.GraphQLString, // note we allow strings - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat - ); + public List getApplicableTypes() { + return GRAPHQL_NUMBER_AND_STRING_TYPES; } - public List getApplicableTypeNames() { - return Stream.of(Scalars.GraphQLString, // note we allow strings - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat) - .map(GraphQLScalarType::getName) - .collect(Collectors.toList()); + @Override + protected boolean appliesToType(GraphQLInputType inputType) { + return isOneOfTheseTypes(inputType, GRAPHQL_NUMBER_AND_STRING_TYPES); } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - //null values are valid - if (validatedValue == null) { - return Collections.emptyList(); - } GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); String value = getStrArg(directive, "value"); @@ -66,21 +39,21 @@ protected List runConstraint(ValidationEnvironment validationEnvir BigDecimal argBD = asBigDecimal(validatedValue); int comparisonResult = argBD.compareTo(directiveBD); isOK = isOK(inclusive, comparisonResult); - } catch (NumberFormatException nfe) { isOK = false; } if (!isOK) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment, - "value", validatedValue, - "inclusive", inclusive)); - + return mkError(validationEnvironment, "value", validatedValue, "inclusive", inclusive); } + return Collections.emptyList(); } abstract protected boolean isOK(boolean inclusive, int comparisonResult); - + @Override + protected boolean appliesToListElements() { + return true; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java index 52efb2e..cdfb40b 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java @@ -1,61 +1,34 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.Scalars; -import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; +import graphql.validation.constraints.GraphQLScalars; import graphql.validation.rules.ValidationEnvironment; - import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import java.util.stream.Stream; - -import static java.util.stream.Collectors.toList; abstract class AbstractMinMaxConstraint extends AbstractDirectiveConstraint { - public AbstractMinMaxConstraint(String name) { super(name); } - @Override - public boolean appliesToType(GraphQLInputType inputType) { - return isOneOfTheseTypes(inputType, - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat - ); + public List getApplicableTypes() { + return GraphQLScalars.GRAPHQL_NUMBER_TYPES; } - public List getApplicableTypeNames() { - return Stream.of(ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat) - .map(GraphQLScalarType::getName) - .collect(toList()); - } + @Override + protected boolean appliesToType(GraphQLInputType inputType) { + return isOneOfTheseTypes(inputType, GraphQLScalars.GRAPHQL_NUMBER_TYPES); + } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - //null values are valid - if (validatedValue == null) { - return Collections.emptyList(); - } - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); int value = getIntArg(directive, "value"); @@ -72,12 +45,16 @@ protected List runConstraint(ValidationEnvironment validationEnvir if (!isOK) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment, - "value", value)); - + return mkError(validationEnvironment, "value", value); } + return Collections.emptyList(); } abstract protected boolean isOK(int comparisonResult); + + @Override + protected boolean appliesToListElements() { + return true; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractNotEmptyRule.java b/src/main/java/graphql/validation/constraints/standard/AbstractNotEmptyRule.java new file mode 100644 index 0000000..1ed3adf --- /dev/null +++ b/src/main/java/graphql/validation/constraints/standard/AbstractNotEmptyRule.java @@ -0,0 +1,28 @@ +package graphql.validation.constraints.standard; + +import graphql.GraphQLError; +import graphql.schema.GraphQLInputType; +import graphql.validation.constraints.AbstractDirectiveConstraint; +import graphql.validation.rules.ValidationEnvironment; +import java.util.Collections; +import java.util.List; + +public abstract class AbstractNotEmptyRule extends AbstractDirectiveConstraint { + public AbstractNotEmptyRule(String name) { + super(name); + } + + @Override + final protected List runConstraint(ValidationEnvironment validationEnvironment) { + Object validatedValue = validationEnvironment.getValidatedValue(); + GraphQLInputType argumentType = validationEnvironment.getValidatedType(); + + int size = getStringOrIDOrObjectOrMapLength(argumentType, validatedValue); + + if (size <= 0) { + return mkError(validationEnvironment, "size", size); + } + + return Collections.emptyList(); + } +} diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java index 916875d..b6090e8 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractPositiveNegativeConstraint.java @@ -1,20 +1,14 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.Scalars; -import graphql.scalars.ExtendedScalars; -import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; +import graphql.validation.constraints.GraphQLScalars; import graphql.validation.rules.ValidationEnvironment; - import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import java.util.stream.Stream; - -import static java.util.stream.Collectors.toList; abstract class AbstractPositiveNegativeConstraint extends AbstractDirectiveConstraint { @@ -24,39 +18,17 @@ public AbstractPositiveNegativeConstraint(String name) { @Override public boolean appliesToType(GraphQLInputType inputType) { - return isOneOfTheseTypes(inputType, - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat - ); + return isOneOfTheseTypes(inputType, GraphQLScalars.GRAPHQL_NUMBER_TYPES); } - public List getApplicableTypeNames() { - return Stream.of(ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat) - .map(GraphQLScalarType::getName) - .collect(toList()); + public List getApplicableTypes() { + return GraphQLScalars.GRAPHQL_NUMBER_TYPES; } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - //null values are valid - if (validatedValue == null) { - return Collections.emptyList(); - } - - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); boolean isOK; try { @@ -67,11 +39,16 @@ protected List runConstraint(ValidationEnvironment validationEnvir } if (!isOK) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); + return mkError(validationEnvironment); } return Collections.emptyList(); } abstract protected boolean isOK(BigDecimal bigDecimal); + + @Override + protected boolean appliesToListElements() { + return true; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java new file mode 100644 index 0000000..329ff95 --- /dev/null +++ b/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java @@ -0,0 +1,33 @@ +package graphql.validation.constraints.standard; + +import graphql.GraphQLError; +import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLInputType; +import graphql.validation.constraints.AbstractDirectiveConstraint; +import graphql.validation.rules.ValidationEnvironment; +import java.util.Collections; +import java.util.List; + +public abstract class AbstractSizeConstraint extends AbstractDirectiveConstraint { + public AbstractSizeConstraint(String name) { + super(name); + } + + @Override + final protected List runConstraint(ValidationEnvironment validationEnvironment) { + Object validatedValue = validationEnvironment.getValidatedValue(); + GraphQLInputType argType = validationEnvironment.getValidatedType(); + + GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + int min = getIntArg(directive, "min"); + int max = getIntArg(directive, "max"); + + int size = getStringOrIDOrObjectOrMapLength(argType, validatedValue); + + if (size < min || size > max) { + return mkError(validationEnvironment, "min", min, "max", max, "size", size); + } + + return Collections.emptyList(); + } +} diff --git a/src/main/java/graphql/validation/constraints/standard/AssertFalseConstraint.java b/src/main/java/graphql/validation/constraints/standard/AssertFalseConstraint.java index 5f5fb01..392b0ee 100644 --- a/src/main/java/graphql/validation/constraints/standard/AssertFalseConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AssertFalseConstraint.java @@ -14,13 +14,9 @@ public AssertFalseConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The boolean value must be false.") - .example("updateDriver( isDrunk : Boolean @AssertFalse) : DriverDetails") - - .applicableTypeNames(GraphQLBoolean.getName()) - + .applicableTypes(GraphQLBoolean) .directiveSDL("directive @AssertFalse(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/AssertTrueConstraint.java b/src/main/java/graphql/validation/constraints/standard/AssertTrueConstraint.java index 69a81fb..fa33d40 100644 --- a/src/main/java/graphql/validation/constraints/standard/AssertTrueConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AssertTrueConstraint.java @@ -14,13 +14,9 @@ public AssertTrueConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The boolean value must be true.") - .example("driveCar( hasLicence : Boolean @AssertTrue) : DriverDetails") - - .applicableTypeNames(GraphQLBoolean.getName()) - + .applicableTypes(GraphQLBoolean) .directiveSDL("directive @AssertTrue(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/ContainerNotEmptyConstraint.java b/src/main/java/graphql/validation/constraints/standard/ContainerNotEmptyConstraint.java new file mode 100644 index 0000000..e5c4fa0 --- /dev/null +++ b/src/main/java/graphql/validation/constraints/standard/ContainerNotEmptyConstraint.java @@ -0,0 +1,34 @@ +package graphql.validation.constraints.standard; + +import graphql.schema.GraphQLInputType; +import graphql.validation.constraints.Documentation; +import static graphql.schema.GraphQLTypeUtil.isList; + +public class ContainerNotEmptyConstraint extends AbstractNotEmptyRule { + public ContainerNotEmptyConstraint() { + super("ContainerNotEmpty"); + } + + @Override + public Documentation getDocumentation() { + return Documentation.newDocumentation() + .messageTemplate(getMessageTemplate()) + .description("The container must have a non-zero size") + .example("updateAccident( accidentNotes : [Notes]! @ContainerNotEmpty) : DriverDetails") + .applicableTypeNames("Lists", "Input Objects") + .directiveSDL("directive @ContainerNotEmpty(message : String = \"%s\") " + + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", + getMessageTemplate()) + .build(); + } + + @Override + public boolean appliesToType(GraphQLInputType inputType) { + return isList(inputType) || isMap(inputType); + } + + @Override + protected boolean appliesToListElements() { + return false; + } +} diff --git a/src/main/java/graphql/validation/constraints/standard/ContainerSizeConstraint.java b/src/main/java/graphql/validation/constraints/standard/ContainerSizeConstraint.java new file mode 100644 index 0000000..775221b --- /dev/null +++ b/src/main/java/graphql/validation/constraints/standard/ContainerSizeConstraint.java @@ -0,0 +1,35 @@ +package graphql.validation.constraints.standard; + +import graphql.schema.GraphQLInputType; +import graphql.validation.constraints.Documentation; +import static graphql.schema.GraphQLTypeUtil.isList; + +public class ContainerSizeConstraint extends AbstractSizeConstraint { + public ContainerSizeConstraint() { + super("ContainerSize"); + } + + @Override + public Documentation getDocumentation() { + return Documentation.newDocumentation() + .messageTemplate(getMessageTemplate()) + .description("The element size must be between the specified `min` and `max` boundaries (inclusive).") + .example("updateDrivingNotes( drivingNote : String @ContainerSize( min : 1000, max : 100000)) : DriverDetails") + .applicableTypeNames("Lists", "Input Objects") + .directiveSDL("directive @ContainerSize(min : Int = 0, max : Int = %d, message : String = \"%s\") " + + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", + Integer.MAX_VALUE, getMessageTemplate()) + .build(); + } + + + @Override + public boolean appliesToType(GraphQLInputType inputType) { + return isList(inputType) || isMap(inputType); + } + + @Override + protected boolean appliesToListElements() { + return false; + } +} diff --git a/src/main/java/graphql/validation/constraints/standard/DecimalMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/DecimalMaxConstraint.java index fc2cd58..e06440e 100644 --- a/src/main/java/graphql/validation/constraints/standard/DecimalMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/DecimalMaxConstraint.java @@ -12,13 +12,9 @@ public DecimalMaxConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a number whose value must be less than or equal to the specified maximum.") - .example("driveCar( bloodAlcoholLevel : Float @DecimalMax(value : \"0.05\") : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @DecimalMax(value : String!, inclusive : Boolean! = true, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/DecimalMinConstraint.java b/src/main/java/graphql/validation/constraints/standard/DecimalMinConstraint.java index aeb6a00..895f1cf 100644 --- a/src/main/java/graphql/validation/constraints/standard/DecimalMinConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/DecimalMinConstraint.java @@ -12,13 +12,9 @@ public DecimalMinConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a number whose value must be greater than or equal to the specified minimum.") - .example("driveCar( carHorsePower : Float @DecimalMin(value : \"300.50\") : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @DecimalMin(value : String!, inclusive : Boolean! = true, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java index c162c36..3a93513 100644 --- a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java @@ -1,24 +1,17 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.Scalars; -import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; -import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; - import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import java.util.stream.Stream; - -import static java.util.stream.Collectors.toList; +import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; public class DigitsConstraint extends AbstractDirectiveConstraint { - public DigitsConstraint() { super("Digits"); } @@ -27,22 +20,9 @@ public DigitsConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a number inside the specified `integer` and `fraction` range.") - .example("buyCar( carCost : Float @Digits(integer : 5, fraction : 2) : DriverDetails") - - .applicableTypeNames(Stream.of(Scalars.GraphQLString, - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat) - .map(GraphQLScalarType::getName) - .collect(toList())) - + .applicableTypes(GRAPHQL_NUMBER_AND_STRING_TYPES) .directiveSDL("directive @Digits(integer : Int!, fraction : Int!, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -51,25 +31,13 @@ public Documentation getDocumentation() { @Override public boolean appliesToType(GraphQLInputType inputType) { - return isOneOfTheseTypes(inputType, - Scalars.GraphQLString, - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat - ); + return isOneOfTheseTypes(inputType, GRAPHQL_NUMBER_AND_STRING_TYPES); } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - if (validatedValue == null) { - return Collections.emptyList(); - } GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); int maxIntegerLength = getIntArg(directive, "integer"); @@ -84,17 +52,21 @@ protected List runConstraint(ValidationEnvironment validationEnvir } if (!isOk) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment, - "integer", maxIntegerLength, - "fraction", maxFractionLength)); + return mkError(validationEnvironment, "integer", maxIntegerLength, "fraction", maxFractionLength); } + return Collections.emptyList(); } private boolean isOk(BigDecimal bigNum, int maxIntegerLength, int maxFractionLength) { int integerPartLength = bigNum.precision() - bigNum.scale(); - int fractionPartLength = bigNum.scale() < 0 ? 0 : bigNum.scale(); + int fractionPartLength = Math.max(bigNum.scale(), 0); return maxIntegerLength >= integerPartLength && maxFractionLength >= fractionPartLength; } + + @Override + protected boolean appliesToListElements() { + return true; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java b/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java index 484cdfb..f2d4d6c 100644 --- a/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java @@ -26,16 +26,12 @@ public ExpressionConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The provided expression must evaluate to true. " + "The expression language is Java EL " + "and expressions MUST resolve to a boolean value, ie. it is valid or not.") - .example("drivers( first : Int, after : String!, last : Int, before : String) \n" + " : DriverConnection @Expression(value : \"${args.containsOneOf('first','last') }\"") - .applicableTypeNames("All Types and Scalars") - .directiveSDL("directive @Expression(value : String!, message : String = \"%s\") " + "on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -57,18 +53,15 @@ protected List runConstraint(ValidationEnvironment validationEnvir GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); String expression = helpWithCurlyBraces(getStrArg(directive, "value")); - Object validatedValue = validationEnvironment.getValidatedValue(); - Map variables = StandardELVariables.standardELVars(validationEnvironment); ELSupport elSupport = new ELSupport(validationEnvironment.getLocale()); boolean isOK = elSupport.evaluateBoolean(expression, variables); if (!isOK) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment, - "value", expression)); - + return mkError(validationEnvironment,"value", expression); } + return Collections.emptyList(); } @@ -82,4 +75,9 @@ private String helpWithCurlyBraces(String expression) { } return expression; } + + @Override + protected boolean appliesToListElements() { + return false; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/MaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/MaxConstraint.java index bc21d33..899c70d 100644 --- a/src/main/java/graphql/validation/constraints/standard/MaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/MaxConstraint.java @@ -12,13 +12,9 @@ public MaxConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a number whose value must be less than or equal to the specified maximum.") - .example("driveCar( horsePower : Float @Max(value : 1000) : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @Max(value : Int! = %d, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", Integer.MAX_VALUE, getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/MinConstraint.java b/src/main/java/graphql/validation/constraints/standard/MinConstraint.java index 421abf6..ff16edb 100644 --- a/src/main/java/graphql/validation/constraints/standard/MinConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/MinConstraint.java @@ -12,13 +12,9 @@ public MinConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a number whose value must be greater than or equal to the specified minimum.") - .example("driveCar( age : Int @Min(value : 18) : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @Min(value : Int! = 0, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/NegativeConstraint.java b/src/main/java/graphql/validation/constraints/standard/NegativeConstraint.java index f9acd29..e074771 100644 --- a/src/main/java/graphql/validation/constraints/standard/NegativeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/NegativeConstraint.java @@ -14,13 +14,9 @@ public NegativeConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a negative number.") - .example("driveCar( lostLicencePoints : Int @Negative) : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @Negative(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) diff --git a/src/main/java/graphql/validation/constraints/standard/NegativeOrZeroConstraint.java b/src/main/java/graphql/validation/constraints/standard/NegativeOrZeroConstraint.java index f61f1c1..4806470 100644 --- a/src/main/java/graphql/validation/constraints/standard/NegativeOrZeroConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/NegativeOrZeroConstraint.java @@ -14,23 +14,17 @@ public NegativeOrZeroConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a negative number or zero.") - .example("driveCar( lostLicencePoints : Int @NegativeOrZero) : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @NegativeOrZero(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) .build(); } - @Override protected boolean isOK(BigDecimal bigDecimal) { return bigDecimal.compareTo(BigDecimal.ZERO) <= 0; } - } diff --git a/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java b/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java index 0a89894..3af990d 100644 --- a/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java +++ b/src/main/java/graphql/validation/constraints/standard/NotBlankRule.java @@ -1,16 +1,11 @@ package graphql.validation.constraints.standard; -import static graphql.schema.GraphQLTypeUtil.isList; - import graphql.GraphQLError; import graphql.Scalars; -import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; - -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -24,13 +19,9 @@ public NotBlankRule() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The String must contain at least one non-whitespace character, according to Java's Character.isWhitespace().") - .example("updateAccident( accidentNotes : String @NotBlank) : DriverDetails") - .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName(), "Lists") - .directiveSDL("directive @NotBlank(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -45,42 +36,16 @@ public boolean appliesToType(GraphQLInputType inputType) { @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLInputType argumentType = validationEnvironment.getValidatedType(); - - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); - - if (validatedValue == null) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); - } - - List validatedValues; - - if (isList(argumentType)) { - validatedValues = (List)validatedValue; - } else { - validatedValues = Arrays.asList(validatedValue); - } - if (validatedValues.size() <= 0) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); - } - - for (Object value : validatedValues) { - if (isBlank(value)) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment)); - } + if (validatedValue.toString().trim().isEmpty()) { + return mkError(validationEnvironment); } return Collections.emptyList(); } - private boolean isBlank(Object value) { - char[] chars = value.toString().toCharArray(); - for (char c : chars) { - if (!Character.isWhitespace(c)) { - return false; - } - } + @Override + protected boolean appliesToListElements() { return true; } } diff --git a/src/main/java/graphql/validation/constraints/standard/NotEmptyRule.java b/src/main/java/graphql/validation/constraints/standard/NotEmptyRule.java index 06fe5c1..bdb3d0d 100644 --- a/src/main/java/graphql/validation/constraints/standard/NotEmptyRule.java +++ b/src/main/java/graphql/validation/constraints/standard/NotEmptyRule.java @@ -1,16 +1,10 @@ package graphql.validation.constraints.standard; -import graphql.GraphQLError; import graphql.Scalars; -import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; -import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; -import graphql.validation.rules.ValidationEnvironment; -import java.util.Collections; -import java.util.List; -public class NotEmptyRule extends AbstractDirectiveConstraint { +public class NotEmptyRule extends AbstractNotEmptyRule { public NotEmptyRule() { super("NotEmpty"); @@ -20,13 +14,9 @@ public NotEmptyRule() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - - .description("The element must have a non zero size.") - - .example("updateAccident( accidentNotes : [Notes]! @NotEmpty) : DriverDetails") - - .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName(), "Lists", "Input Objects") - + .description("The element must have a non zero size") + .example("updateAccident( accidentNotes : [String!]! @NotEmpty) : DriverDetails") + .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName()) .directiveSDL("directive @NotEmpty(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -35,24 +25,11 @@ public Documentation getDocumentation() { @Override public boolean appliesToType(GraphQLInputType inputType) { - return isStringOrIDOrListOrMap(inputType); + return isStringOrID(inputType); } @Override - protected List runConstraint(ValidationEnvironment validationEnvironment) { - Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLInputType argumentType = validationEnvironment.getValidatedType(); - - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); - int size = getStringOrIDOrObjectOrMapLength(argumentType, validatedValue); - - if (size <= 0) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment, - "size", size - )); - } - return Collections.emptyList(); + protected boolean appliesToListElements() { + return true; } - - } diff --git a/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java b/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java index 6a73c18..031af69 100644 --- a/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java @@ -7,14 +7,11 @@ import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; - -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - import static graphql.schema.GraphQLTypeUtil.isList; import static java.util.Collections.emptyList; @@ -30,13 +27,9 @@ public PatternConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The String must match the specified regular expression, which follows the Java regular expression conventions.") - .example("updateDriver( licencePlate : String @Pattern(regexp : \"[A-Z][A-Z][A-Z]-[0-9][0-9][0-9]\") : DriverDetails") - .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName(), "Lists") - .directiveSDL("directive @Pattern(regexp : String! =\".*\", message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -51,34 +44,19 @@ public boolean appliesToType(GraphQLInputType inputType) { @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLInputType argumentType = validationEnvironment.getValidatedType(); - if (validatedValue == null) { - return emptyList(); - } + String strValue = String.valueOf(validatedValue); - List validatedValues; + GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); - if (isList(argumentType)) { - validatedValues = (List)validatedValue; - } else { - validatedValues = Arrays.asList(validatedValue); - } + String patternArg = getStrArg(directive, "regexp"); + Pattern pattern = cachedPattern(patternArg); - for (Object value : validatedValues) { - String strValue = String.valueOf(value); - - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); - - String patternArg = getStrArg(directive, "regexp"); - Pattern pattern = cachedPattern(patternArg); - - Matcher matcher = pattern.matcher(strValue); - if (!matcher.matches()) { - return mkError(validationEnvironment, directive, - mkMessageParams(validatedValue, validationEnvironment, "regexp", patternArg)); - } + Matcher matcher = pattern.matcher(strValue); + if (!matcher.matches()) { + return mkError(validationEnvironment, "regexp", patternArg); } + return emptyList(); } @@ -86,5 +64,8 @@ private Pattern cachedPattern(String patternArg) { return SEEN_PATTERNS.computeIfAbsent(patternArg, Pattern::compile); } - + @Override + protected boolean appliesToListElements() { + return true; + } } diff --git a/src/main/java/graphql/validation/constraints/standard/PositiveConstraint.java b/src/main/java/graphql/validation/constraints/standard/PositiveConstraint.java index d48e689..93d164f 100644 --- a/src/main/java/graphql/validation/constraints/standard/PositiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/PositiveConstraint.java @@ -5,7 +5,6 @@ import java.math.BigDecimal; public class PositiveConstraint extends AbstractPositiveNegativeConstraint { - public PositiveConstraint() { super("Positive"); } @@ -14,13 +13,9 @@ public PositiveConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a positive number.") - .example("driver( licencePoints : Int @Positive) : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @Positive(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -31,5 +26,4 @@ public Documentation getDocumentation() { protected boolean isOK(BigDecimal bigDecimal) { return bigDecimal.compareTo(BigDecimal.ZERO) > 0; } - } diff --git a/src/main/java/graphql/validation/constraints/standard/PositiveOrZeroConstraint.java b/src/main/java/graphql/validation/constraints/standard/PositiveOrZeroConstraint.java index 3f1abf7..c8961c4 100644 --- a/src/main/java/graphql/validation/constraints/standard/PositiveOrZeroConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/PositiveOrZeroConstraint.java @@ -14,13 +14,9 @@ public PositiveOrZeroConstraint() { public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element must be a positive number or zero.") - .example("driver( licencePoints : Int @PositiveOrZero) : DriverDetails") - - .applicableTypeNames(getApplicableTypeNames()) - + .applicableTypes(getApplicableTypes()) .directiveSDL("directive @PositiveOrZero(message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", getMessageTemplate()) @@ -31,5 +27,4 @@ public Documentation getDocumentation() { protected boolean isOK(BigDecimal bigDecimal) { return bigDecimal.compareTo(BigDecimal.ZERO) >= 0; } - } diff --git a/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java b/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java index 17c28a8..73a412c 100644 --- a/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java @@ -1,51 +1,29 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.Scalars; -import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; -import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; - import java.math.BigDecimal; import java.util.Collections; import java.util.List; -import java.util.stream.Stream; - -import static graphql.Scalars.GraphQLString; -import static java.util.stream.Collectors.toList; +import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; public class RangeConstraint extends AbstractDirectiveConstraint { - public RangeConstraint() { super("Range"); } - @Override public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element range must be between the specified `min` and `max` boundaries (inclusive). It " + "accepts numbers and strings that represent numerical values.") - .example("driver( milesTravelled : Int @Range( min : 1000, max : 100000)) : DriverDetails") - - .applicableTypeNames(Stream.of(GraphQLString, - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat) - .map(GraphQLScalarType::getName) - .collect(toList())) - + .applicableTypes(GRAPHQL_NUMBER_AND_STRING_TYPES) .directiveSDL("directive @Range(min : Int = 0, max : Int = %d, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", Integer.MAX_VALUE, getMessageTemplate()) @@ -54,27 +32,13 @@ Integer.MAX_VALUE, getMessageTemplate()) @Override public boolean appliesToType(GraphQLInputType inputType) { - return isOneOfTheseTypes(inputType, - GraphQLString, - ExtendedScalars.GraphQLByte, - ExtendedScalars.GraphQLShort, - Scalars.GraphQLInt, - ExtendedScalars.GraphQLLong, - ExtendedScalars.GraphQLBigDecimal, - ExtendedScalars.GraphQLBigInteger, - Scalars.GraphQLFloat - ); + return isOneOfTheseTypes(inputType, GRAPHQL_NUMBER_AND_STRING_TYPES); } @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { - Object validatedValue = validationEnvironment.getValidatedValue(); - //null values are valid - if (validatedValue == null) { - return Collections.emptyList(); - } GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); BigDecimal min = asBigDecimal(getIntArg(directive, "min")); @@ -89,10 +53,7 @@ protected List runConstraint(ValidationEnvironment validationEnvir } if (!isOK) { - return mkError(validationEnvironment, directive, mkMessageParams(validatedValue, validationEnvironment, - "min", min, - "max", max - )); + return mkError(validationEnvironment, "min", min, "max", max); } return Collections.emptyList(); @@ -102,9 +63,12 @@ private boolean isOK(BigDecimal argBD, BigDecimal min, BigDecimal max) { if (argBD.compareTo(max) > 0) { return false; } - if (argBD.compareTo(min) < 0) { - return false; - } + + return argBD.compareTo(min) >= 0; + } + + @Override + protected boolean appliesToListElements() { return true; } } diff --git a/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java b/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java index 700c13d..876205e 100644 --- a/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/SizeConstraint.java @@ -1,35 +1,21 @@ package graphql.validation.constraints.standard; -import graphql.GraphQLError; import graphql.Scalars; -import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; -import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; -import graphql.validation.rules.ValidationEnvironment; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -public class SizeConstraint extends AbstractDirectiveConstraint { +public class SizeConstraint extends AbstractSizeConstraint { public SizeConstraint() { super("Size"); } - @Override public Documentation getDocumentation() { return Documentation.newDocumentation() .messageTemplate(getMessageTemplate()) - .description("The element size must be between the specified `min` and `max` boundaries (inclusive).") - .example("updateDrivingNotes( drivingNote : String @Size( min : 1000, max : 100000)) : DriverDetails") - - .applicableTypeNames(Scalars.GraphQLString.getName(), Scalars.GraphQLID.getName(), "Lists", "Input Objects") - + .applicableTypes(Scalars.GraphQLString, Scalars.GraphQLID) .directiveSDL("directive @Size(min : Int = 0, max : Int = %d, message : String = \"%s\") " + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", Integer.MAX_VALUE, getMessageTemplate()) @@ -39,39 +25,11 @@ Integer.MAX_VALUE, getMessageTemplate()) @Override public boolean appliesToType(GraphQLInputType inputType) { - return isStringOrIDOrListOrMap(inputType); + return isStringOrID(inputType); } @Override - protected List runConstraint(ValidationEnvironment validationEnvironment) { - Object validatedValue = validationEnvironment.getValidatedValue(); - - if(validatedValue == null) { - return Collections.emptyList(); - } - - GraphQLInputType argType = validationEnvironment.getValidatedType(); - - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); - int min = getIntArg(directive, "min"); - int max = getIntArg(directive, "max"); - - int size = getStringOrIDOrObjectOrMapLength(argType, validatedValue); - - if (size < min) { - return mkError(validationEnvironment, directive, mkParams(validatedValue, validationEnvironment, min, max, size)); - } - if (size > max) { - return mkError(validationEnvironment, directive, mkParams(validatedValue, validationEnvironment, min, max, size)); - } - return Collections.emptyList(); - } - - private Map mkParams(Object validatedValue, ValidationEnvironment validationEnvironment, int min, int max, int size) { - return mkMessageParams(validatedValue, validationEnvironment, - "min", min, - "max", max, - "size", size - ); + protected boolean appliesToListElements() { + return true; } } diff --git a/src/main/resources/graphql/validation/ValidationMessages.properties b/src/main/resources/graphql/validation/ValidationMessages.properties index 0ba4dca..e5759ac 100644 --- a/src/main/resources/graphql/validation/ValidationMessages.properties +++ b/src/main/resources/graphql/validation/ValidationMessages.properties @@ -13,9 +13,11 @@ graphql.validation.Negative.message={path} must be less than 0 graphql.validation.NegativeOrZero.message={path} must be less than or equal to 0 graphql.validation.NotBlank.message={path} must not be blank graphql.validation.NotEmpty.message={path} must not be empty +graphql.validation.ContainerNotEmpty.message={path} must contain at least one element graphql.validation.Pattern.message={path} must match "{regexp}" graphql.validation.Positive.message={path} must be greater than 0 graphql.validation.PositiveOrZero.message={path} must be greater than or equal to 0 graphql.validation.Range.message={path} range must be between {min} and {max} graphql.validation.Size.message={path} size must be between {min} and {max} +graphql.validation.ContainerSize.message={path} size must be between {min} and {max} diff --git a/src/test/groovy/graphql/validation/constraints/AbstractDirectiveConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/AbstractDirectiveConstraintTest.groovy index ff17de8..0b76ddb 100644 --- a/src/test/groovy/graphql/validation/constraints/AbstractDirectiveConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/AbstractDirectiveConstraintTest.groovy @@ -1,5 +1,6 @@ package graphql.validation.constraints + import graphql.validation.constraints.standard.SizeConstraint import spock.lang.Unroll @@ -8,7 +9,7 @@ class AbstractDirectiveConstraintTest extends BaseConstraintTestSupport { @Unroll def "complex object argument constraints"() { - def extraSDL = ''' + def extraSDL = """ input ProductItem { code : String @Size(max : 5) price : String @Size(max : 3) @@ -18,9 +19,8 @@ class AbstractDirectiveConstraintTest extends BaseConstraintTestSupport { name : String @Size(max : 7) items : [ProductItem!]! # crazy nulls crazyItems : [[[ProductItem!]!]] # nuts but can we handle it - } - - ''' + } + """ // this tests that we can walk a complex tree of types via one specific implementation // but the same applies to all AbstractDirectiveConstraint classes @@ -33,18 +33,18 @@ class AbstractDirectiveConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | eSize | expectedMessage + fieldDeclaration | argVal | eSize | expectedMessage // size can handle list elements - "field( testArg : [Product!] @Size(max : 2) ) : ID" | [[:], [:], [:]] | 1 | "graphql.validation.Size.message;path=/testArg;val:[[:], [:], [:]];\t" + "field( testArg : [Product!] ) : ID" | [[:], [:], [:]] | 0 | "" // goes down into input types - "field( testArg : [Product!] @Size(max : 2) ) : ID" | [[name: "morethan7"], [:]] | 1 | "graphql.validation.Size.message;path=/testArg[0]/name;val:morethan7;\t" + "field( testArg : [Product!] ) : ID" | [[name: "morethan7"], [:]] | 1 | "graphql.validation.Size.message;path=/testArg[0]/name;val:morethan7;\t" // shows that it traverses down lists - "field( testArg : [Product!] @Size(max : 2) ) : ID" | [[name: "ok"], [name: "notOkHere"]] | 1 | "graphql.validation.Size.message;path=/testArg[1]/name;val:notOkHere;\t" + "field( testArg : [Product!] ) : ID" | [[name: "ok"], [name: "notOkHere"]] | 1 | "graphql.validation.Size.message;path=/testArg[1]/name;val:notOkHere;\t" // shows that it traverses down lists and objects - "field( testArg : [Product!] @Size(max : 2) ) : ID" | [[items: [[code: "morethan5", price: "morethan3"]]]] | 2 | "graphql.validation.Size.message;path=/testArg[0]/items[0]/code;val:morethan5;\tgraphql.validation.Size.message;path=/testArg[0]/items[0]/price;val:morethan3;\t" + "field( testArg : [Product!] ) : ID" | [[items: [[code: "morethan5", price: "morethan3"]]]] | 2 | "graphql.validation.Size.message;path=/testArg[0]/items[0]/code;val:morethan5;\tgraphql.validation.Size.message;path=/testArg[0]/items[0]/price;val:morethan3;\t" // shows that it traverses down crazy lists and objects - "field( testArg : [Product!] @Size(max : 2) ) : ID" | [[crazyItems: [[[[code: "morethan5"]]]]]] | 1 | "graphql.validation.Size.message;path=/testArg[0]/crazyItems[0][0][0]/code;val:morethan5;\t" + "field( testArg : [Product!] ) : ID" | [[crazyItems: [[[[code: "morethan5"]]]]]] | 1 | "graphql.validation.Size.message;path=/testArg[0]/crazyItems[0][0][0]/code;val:morethan5;\t" } } diff --git a/src/test/groovy/graphql/validation/constraints/DirectiveConstraintsTest.groovy b/src/test/groovy/graphql/validation/constraints/DirectiveConstraintsTest.groovy index 0b4a7d4..a8225f7 100644 --- a/src/test/groovy/graphql/validation/constraints/DirectiveConstraintsTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/DirectiveConstraintsTest.groovy @@ -12,7 +12,7 @@ class DirectiveConstraintsTest extends BaseConstraintTestSupport { def rules = DirectiveConstraints.newDirectiveConstraints().build() then: - rules.getConstraints().size() == 17 + rules.getConstraints().size() == 19 when: rules = DirectiveConstraints.newDirectiveConstraints().clearRules().build() @@ -69,8 +69,8 @@ class DirectiveConstraintsTest extends BaseConstraintTestSupport { "field( testArg : NoSizeDirectives ) : ID" | "Range" - "field( testArg : [Product!] @Size(max : 2) ) : ID" | "Size" - "field( testArg : Product! @Size(max : 2) ) : ID" | "Size" + "field( testArg : [Product!] @ContainerSize(max : 2) ) : ID" | "ContainerSize,Size" + "field( testArg : Product! @ContainerSize(max : 2) ) : ID" | "ContainerSize,Size" "field( testArg : [Product!] ) : ID" | "Size" } @@ -116,7 +116,7 @@ class DirectiveConstraintsTest extends BaseConstraintTestSupport { def declaration = directiveValidationRules.getDirectivesDeclaration() then: declaration != null - declaration.getDirectiveDefinitions().size() == 17 + declaration.getDirectiveDefinitions().size() == 19 } } diff --git a/src/test/groovy/graphql/validation/constraints/standard/AssertTrueFalseConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/AssertTrueFalseConstraintTest.groovy index 41c2166..f386f1c 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/AssertTrueFalseConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/AssertTrueFalseConstraintTest.groovy @@ -19,14 +19,19 @@ class AssertTrueFalseConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - 'field( arg : Boolean @AssertTrue ) : ID' | false | 'AssertTrue;path=/arg;val:false;\t' - 'field( arg : Boolean @AssertTrue ): ID' | true | '' + fieldDeclaration | argVal | expectedMessage + 'field( arg : Boolean @AssertTrue ) : ID' | false | 'AssertTrue;path=/arg;val:false;\t' + 'field( arg : Boolean @AssertTrue ): ID' | true | '' - 'field( arg : Boolean @AssertTrue(message : "custom")) : ID' | false | 'custom;path=/arg;val:false;\t' + 'field( arg : Boolean @AssertTrue(message : "custom")) : ID' | false | 'custom;path=/arg;val:false;\t' // nulls are valid - 'field( arg : Boolean @AssertTrue ) : ID' | null | '' + 'field( arg : Boolean @AssertTrue ) : ID' | null | '' + + // Lists + 'field( arg : [Boolean] @AssertTrue ) : ID' | [true, true] | '' + 'field( arg : [Boolean] @AssertTrue ) : ID' | [true, false] | 'AssertTrue;path=/arg[1];val:false;\t' + 'field( arg : [Boolean] @AssertTrue ) : ID' | [null] | '' } @Unroll @@ -41,13 +46,18 @@ class AssertTrueFalseConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - 'field( arg : Boolean @AssertFalse ) : ID' | true | 'AssertFalse;path=/arg;val:true;\t' - 'field( arg : Boolean @AssertFalse ): ID' | false | '' + fieldDeclaration | argVal | expectedMessage + 'field( arg : Boolean @AssertFalse ) : ID' | true | 'AssertFalse;path=/arg;val:true;\t' + 'field( arg : Boolean @AssertFalse ): ID' | false | '' - 'field( arg : Boolean @AssertFalse(message : "custom")) : ID' | true | 'custom;path=/arg;val:true;\t' + 'field( arg : Boolean @AssertFalse(message : "custom")) : ID' | true | 'custom;path=/arg;val:true;\t' // nulls are valid - 'field( arg : Boolean @AssertFalse ) : ID' | null | '' + 'field( arg : Boolean @AssertFalse ) : ID' | null | '' + + // Lists + 'field( arg : [Boolean] @AssertFalse ) : ID' | [false, false] | '' + 'field( arg : [Boolean] @AssertFalse ) : ID' | [false, true] | 'AssertFalse;path=/arg[1];val:true;\t' + 'field( arg : [Boolean] @AssertFalse ) : ID' | [null] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/DecimalMinMaxConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/DecimalMinMaxConstraintTest.groovy index b7cd944..31755a4 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/DecimalMinMaxConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/DecimalMinMaxConstraintTest.groovy @@ -54,6 +54,11 @@ class DecimalMinMaxConstraintTest extends BaseConstraintTestSupport { // nulls are valid 'field( arg : Int @DecimalMin(value : "50" inclusive:false) ) : ID' | null | '' + + // Lists + 'field( arg : [Int] @DecimalMin( value: "50", inclusive: false ) ) : ID' | [50] | 'DecimalMin;path=/arg[0];val:50;\t' + 'field( arg : [Int] @DecimalMin( value: "50", inclusive: false ) ) : ID' | [51, 52] | '' + 'field( arg : [Int] @DecimalMin( value: "50", inclusive: false ) ) : ID' | [null] | '' } @Unroll @@ -68,24 +73,28 @@ class DecimalMinMaxConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - 'field( arg : Int @DecimalMax(value : "100") ) : ID' | 150 | 'DecimalMax;path=/arg;val:150;\t' - 'field( arg : Int @DecimalMax(value : "100") ) : ID' | 50 | '' + fieldDeclaration | argVal | expectedMessage + 'field( arg : Int @DecimalMax(value : "100") ) : ID' | 150 | 'DecimalMax;path=/arg;val:150;\t' + 'field( arg : Int @DecimalMax(value : "100") ) : ID' | 50 | '' - 'field( arg : Int @DecimalMax(value : "100", message : "custom") ) : ID' | 150 | 'custom;path=/arg;val:150;\t' + 'field( arg : Int @DecimalMax(value : "100", message : "custom") ) : ID' | 150 | 'custom;path=/arg;val:150;\t' // edge case - 'field( arg : Int @DecimalMax(value : "50") ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t' - 'field( arg : Int @DecimalMax(value : "50") ) : ID' | 50 | '' - 'field( arg : Int @DecimalMax(value : "50") ) : ID' | 49 | '' + 'field( arg : Int @DecimalMax(value : "50") ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t' + 'field( arg : Int @DecimalMax(value : "50") ) : ID' | 50 | '' + 'field( arg : Int @DecimalMax(value : "50") ) : ID' | 49 | '' // exclusive - 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 50 | 'DecimalMax;path=/arg;val:50;\t' - 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t' - 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 49 | '' + 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 50 | 'DecimalMax;path=/arg;val:50;\t' + 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 51 | 'DecimalMax;path=/arg;val:51;\t' + 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | 49 | '' // nulls are valid - 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | null | '' + 'field( arg : Int @DecimalMax(value : "50" inclusive:false) ) : ID' | null | '' + // Lists + 'field( arg : [Int] @DecimalMax( value: "50", inclusive: false ) ) : ID' | [50] | 'DecimalMax;path=/arg[0];val:50;\t' + 'field( arg : [Int] @DecimalMax( value: "50", inclusive: false ) ) : ID' | [48, 49] | '' + 'field( arg : [Int] @DecimalMax( value: "50", inclusive: false ) ) : ID' | [null] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy index 173a142..772ec36 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy @@ -19,33 +19,39 @@ class DigitsConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | null | '' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Byte.valueOf("0") | '' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("500.2") | '' + fieldDeclaration | argVal | expectedMessage + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | null | '' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Byte.valueOf("0") | '' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("500.2") | '' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.12") | '' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.12") | 'Digits;path=/arg;val:-123456.12;\t' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.123") | 'Digits;path=/arg;val:-123456.123;\t' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.123") | 'Digits;path=/arg;val:-12345.123;\t' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("12345.123") | 'Digits;path=/arg;val:12345.123;\t' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.12") | '' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.12") | 'Digits;path=/arg;val:-123456.12;\t' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.123") | 'Digits;path=/arg;val:-123456.123;\t' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.123") | 'Digits;path=/arg;val:-12345.123;\t' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("12345.123") | 'Digits;path=/arg;val:12345.123;\t' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Float.valueOf("-000000000.22") | '' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Float.valueOf("-000000000.22") | '' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Integer.valueOf("256874") | 'Digits;path=/arg;val:256874;\t' - 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("12.0001") | 'Digits;path=/arg;val:12.0001;\t' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Integer.valueOf("256874") | 'Digits;path=/arg;val:256874;\t' + 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("12.0001") | 'Digits;path=/arg;val:12.0001;\t' // zero length - 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | null | '' - 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Byte.valueOf("0") | 'Digits;path=/arg;val:0;\t' - 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Double.valueOf("0") | 'Digits;path=/arg;val:0.0;\t' - 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | new BigDecimal(0) | 'Digits;path=/arg;val:0;\t' - 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0 | 'Digits;path=/arg;val:0;\t' - 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0L | 'Digits;path=/arg;val:0;\t' + 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | null | '' + 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Byte.valueOf("0") | 'Digits;path=/arg;val:0;\t' + 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | Double.valueOf("0") | 'Digits;path=/arg;val:0.0;\t' + 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | new BigDecimal(0) | 'Digits;path=/arg;val:0;\t' + 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0 | 'Digits;path=/arg;val:0;\t' + 'field( arg : String @Digits(integer : 0, fraction : 0) ) : ID' | 0L | 'Digits;path=/arg;val:0;\t' // zeroes are trimmed - 'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.001d | '' - 'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.00100d | '' - 'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.0001d | 'Digits;path=/arg;val:1.0E-4;\t' + 'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.001d | '' + 'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.00100d | '' + 'field( arg : String @Digits(integer : 12, fraction : 3) ) : ID' | 0.0001d | 'Digits;path=/arg;val:1.0E-4;\t' + + + // Lists + 'field( arg : [String] @Digits( integer : 5, fraction : 2 ) ) : ID' | ["500.2", "343.2343"] | 'Digits;path=/arg[1];val:343.2343;\t' + 'field( arg : [String] @Digits( integer : 5, fraction : 2 ) ) : ID' | ["500.2", "343.2"] | '' + 'field( arg : [String] @Digits( integer : 5, fraction : 2 ) ) : ID' | [null] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/ExpressionConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/ExpressionConstraintTest.groovy index 30475df..835a7dc 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/ExpressionConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/ExpressionConstraintTest.groovy @@ -11,7 +11,6 @@ class ExpressionConstraintTest extends BaseConstraintTestSupport { @Unroll def "expression constraints on a field"() { - DirectiveConstraint ruleUnderTest = new ExpressionConstraint() expect: @@ -27,8 +26,8 @@ class ExpressionConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | args | expectedMessage - 'field( first : Int, last : Int) : ID ' + relayCheck | [first: 10] | "" + fieldDeclaration | args | expectedMessage + 'field( first : Int, last : Int) : ID ' + relayCheck | [first: 10] | "" 'field( first : Int, last : Int) : ID ' + relayCheck | [first: 10, last: 20] | "Expression;path=/field;val:null;\t" } diff --git a/src/test/groovy/graphql/validation/constraints/standard/MinMaxConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/MinMaxConstraintTest.groovy index eda68a3..fd6be57 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/MinMaxConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/MinMaxConstraintTest.groovy @@ -19,19 +19,23 @@ class MinMaxConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - "field( arg : Int @Min(value : 100) ) : ID" | 50 | "Min;path=/arg;val:50;\t" - "field( arg : Int @Min(value : 10) ) : ID" | 50 | "" + fieldDeclaration | argVal | expectedMessage + "field( arg : Int @Min(value : 100) ) : ID" | 50 | "Min;path=/arg;val:50;\t" + "field( arg : Int @Min(value : 10) ) : ID" | 50 | "" - 'field( arg : Int @Min(value : 100, message : "custom") ) : ID' | 50 | "custom;path=/arg;val:50;\t" + 'field( arg : Int @Min(value : 100, message : "custom") ) : ID' | 50 | "custom;path=/arg;val:50;\t" // edge case - "field( arg : Int @Min(value : 50) ) : ID" | 49 | "Min;path=/arg;val:49;\t" - "field( arg : Int @Min(value : 50) ) : ID" | 50 | "" - "field( arg : Int @Min(value : 50) ) : ID" | 51 | "" + "field( arg : Int @Min(value : 50) ) : ID" | 49 | "Min;path=/arg;val:49;\t" + "field( arg : Int @Min(value : 50) ) : ID" | 50 | "" + "field( arg : Int @Min(value : 50) ) : ID" | 51 | "" // nulls are valid - 'field( arg : Int @Min(value : 50) ) : ID' | null | '' + 'field( arg : Int @Min(value : 50) ) : ID' | null | '' + // Lists + 'field( arg : [Int] @Min( value : 50 ) ) : ID' | [50, 49] | 'Min;path=/arg[1];val:49;\t' + 'field( arg : [Int] @Min( value : 50 ) ) : ID' | [50, 51] | '' + 'field( arg : [Int] @Min( value : 50 ) ) : ID' | [null] | '' } @Unroll @@ -46,17 +50,22 @@ class MinMaxConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - "field( arg : Int @Max(value : 100) ) : ID" | 150 | "Max;path=/arg;val:150;\t" - "field( arg : Int @Max(value : 100) ) : ID" | 50 | "" + fieldDeclaration | argVal | expectedMessage + "field( arg : Int @Max(value : 100) ) : ID" | 150 | "Max;path=/arg;val:150;\t" + "field( arg : Int @Max(value : 100) ) : ID" | 50 | "" - 'field( arg : Int @Max(value : 100, message : "custom") ) : ID' | 150 | "custom;path=/arg;val:150;\t" + 'field( arg : Int @Max(value : 100, message : "custom") ) : ID' | 150 | "custom;path=/arg;val:150;\t" // edge case - "field( arg : Int @Max(value : 50) ) : ID" | 51 | "Max;path=/arg;val:51;\t" - "field( arg : Int @Max(value : 50) ) : ID" | 50 | "" - "field( arg : Int @Max(value : 50) ) : ID" | 49 | "" + "field( arg : Int @Max(value : 50) ) : ID" | 51 | "Max;path=/arg;val:51;\t" + "field( arg : Int @Max(value : 50) ) : ID" | 50 | "" + "field( arg : Int @Max(value : 50) ) : ID" | 49 | "" // nulls are valid - 'field( arg : Int @Max(value : 50) ) : ID' | null | '' + 'field( arg : Int @Max(value : 50) ) : ID' | null | '' + + // Lists + 'field( arg : [Int] @Max( value : 50 ) ) : ID' | [50, 51] | 'Max;path=/arg[1];val:51;\t' + 'field( arg : [Int] @Max( value : 50 ) ) : ID' | [50, 49] | '' + 'field( arg : [Int] @Max( value : 50 ) ) : ID' | [null] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/NegativePositiveConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/NegativePositiveConstraintTest.groovy index 81a0309..823853c 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/NegativePositiveConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/NegativePositiveConstraintTest.groovy @@ -19,19 +19,23 @@ class NegativePositiveConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - "field( arg : Int @Positive) : ID" | -50 | "Positive;path=/arg;val:-50;\t" - "field( arg : Int @Positive) : ID" | 50 | "" + fieldDeclaration | argVal | expectedMessage + "field( arg : Int @Positive) : ID" | -50 | "Positive;path=/arg;val:-50;\t" + "field( arg : Int @Positive) : ID" | 50 | "" - 'field( arg : Int @Positive(message : "custom") ) : ID' | -50 | "custom;path=/arg;val:-50;\t" + 'field( arg : Int @Positive(message : "custom") ) : ID' | -50 | "custom;path=/arg;val:-50;\t" // edge case - "field( arg : Int @Positive) : ID" | 0 | "Positive;path=/arg;val:0;\t" - "field( arg : Int @Positive) : ID" | 1 | "" + "field( arg : Int @Positive) : ID" | 0 | "Positive;path=/arg;val:0;\t" + "field( arg : Int @Positive) : ID" | 1 | "" // nulls are valid - 'field( arg : Int @Positive ) : ID' | null | '' + 'field( arg : Int @Positive ) : ID' | null | '' + // Lists + 'field( arg : [Int] @Positive ) : ID' | [50, 0] | 'Positive;path=/arg[1];val:0;\t' + 'field( arg : [Int] @Positive ) : ID' | [50, 51] | '' + 'field( arg : [Int] @Positive ) : ID' | [null] | '' } @Unroll @@ -46,19 +50,24 @@ class NegativePositiveConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - "field( arg : Int @PositiveOrZero) : ID" | -50 | "PositiveOrZero;path=/arg;val:-50;\t" - "field( arg : Int @PositiveOrZero) : ID" | 50 | "" + fieldDeclaration | argVal | expectedMessage + "field( arg : Int @PositiveOrZero) : ID" | -50 | "PositiveOrZero;path=/arg;val:-50;\t" + "field( arg : Int @PositiveOrZero) : ID" | 50 | "" - 'field( arg : Int @PositiveOrZero(message : "custom") ) : ID' | -50 | "custom;path=/arg;val:-50;\t" + 'field( arg : Int @PositiveOrZero(message : "custom") ) : ID' | -50 | "custom;path=/arg;val:-50;\t" // edge case - "field( arg : Int @PositiveOrZero) : ID" | -1 | "PositiveOrZero;path=/arg;val:-1;\t" - "field( arg : Int @PositiveOrZero) : ID" | 0 | "" - "field( arg : Int @PositiveOrZero) : ID" | 1 | "" + "field( arg : Int @PositiveOrZero) : ID" | -1 | "PositiveOrZero;path=/arg;val:-1;\t" + "field( arg : Int @PositiveOrZero) : ID" | 0 | "" + "field( arg : Int @PositiveOrZero) : ID" | 1 | "" // nulls are valid - 'field( arg : Int @PositiveOrZero ) : ID' | null | '' + 'field( arg : Int @PositiveOrZero ) : ID' | null | '' + + // Lists + 'field( arg : [Int] @PositiveOrZero ) : ID' | [50, -1] | 'PositiveOrZero;path=/arg[1];val:-1;\t' + 'field( arg : [Int] @PositiveOrZero ) : ID' | [50, 0] | '' + 'field( arg : [Int] @PositiveOrZero ) : ID' | [null] | '' } @Unroll @@ -73,18 +82,23 @@ class NegativePositiveConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - "field( arg : Int @Negative) : ID" | 50 | "Negative;path=/arg;val:50;\t" - "field( arg : Int @Negative) : ID" | -50 | "" + fieldDeclaration | argVal | expectedMessage + "field( arg : Int @Negative) : ID" | 50 | "Negative;path=/arg;val:50;\t" + "field( arg : Int @Negative) : ID" | -50 | "" - 'field( arg : Int @Negative(message : "custom") ) : ID' | 50 | "custom;path=/arg;val:50;\t" + 'field( arg : Int @Negative(message : "custom") ) : ID' | 50 | "custom;path=/arg;val:50;\t" // edge case - "field( arg : Int @Negative) : ID" | 0 | "Negative;path=/arg;val:0;\t" - "field( arg : Int @Negative) : ID" | -1 | "" + "field( arg : Int @Negative) : ID" | 0 | "Negative;path=/arg;val:0;\t" + "field( arg : Int @Negative) : ID" | -1 | "" // nulls are valid - 'field( arg : Int @Negative ) : ID' | null | '' + 'field( arg : Int @Negative ) : ID' | null | '' + + // Lists + 'field( arg : [Int] @Negative ) : ID' | [0, -1] | 'Negative;path=/arg[0];val:0;\t' + 'field( arg : [Int] @Negative ) : ID' | [-50, -1] | '' + 'field( arg : [Int] @Negative ) : ID' | [null] | '' } @Unroll @@ -99,18 +113,23 @@ class NegativePositiveConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage - 'field( arg : Int @NegativeOrZero) : ID' | 50 | 'NegativeOrZero;path=/arg;val:50;\t' - "field( arg : Int @NegativeOrZero) : ID" | -50 | '' + fieldDeclaration | argVal | expectedMessage + 'field( arg : Int @NegativeOrZero) : ID' | 50 | 'NegativeOrZero;path=/arg;val:50;\t' + "field( arg : Int @NegativeOrZero) : ID" | -50 | '' - 'field( arg : Int @NegativeOrZero(message : "custom") ) : ID' | 50 | 'custom;path=/arg;val:50;\t' + 'field( arg : Int @NegativeOrZero(message : "custom") ) : ID' | 50 | 'custom;path=/arg;val:50;\t' // edge case - 'field( arg : Int @NegativeOrZero) : ID' | 1 | 'NegativeOrZero;path=/arg;val:1;\t' - 'field( arg : Int @NegativeOrZero) : ID' | 0 | '' - 'field( arg : Int @NegativeOrZero) : ID' | -1 | '' + 'field( arg : Int @NegativeOrZero) : ID' | 1 | 'NegativeOrZero;path=/arg;val:1;\t' + 'field( arg : Int @NegativeOrZero) : ID' | 0 | '' + 'field( arg : Int @NegativeOrZero) : ID' | -1 | '' // nulls are valid - 'field( arg : Int @NegativeOrZero ) : ID' | null | '' + 'field( arg : Int @NegativeOrZero ) : ID' | null | '' + + // Lists + 'field( arg : [Int] @NegativeOrZero ) : ID' | [1, -1] | 'NegativeOrZero;path=/arg[0];val:1;\t' + 'field( arg : [Int] @NegativeOrZero ) : ID' | [0, -1] | '' + 'field( arg : [Int] @NegativeOrZero ) : ID' | [null] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy index 0dd29d2..ce2c668 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/NoEmptyBlankConstraintTest.groovy @@ -9,7 +9,6 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { @Unroll def "not blank rule constraints"() { - DirectiveConstraint ruleUnderTest = new NotBlankRule() expect: @@ -19,35 +18,34 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { where: - fieldDeclaration | argVal | expectedMessage + fieldDeclaration | argVal | expectedMessage // strings - 'field( arg : String @NotBlank ) : ID' | "\t\n\r " | 'NotBlank;path=/arg;val:\t\n\r ;\t' - 'field( arg : String @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' - 'field( arg : String @NotBlank ) : ID' | "\t\n\r X" | '' - 'field( arg : String @NotBlank ) : ID' | null | '' + 'field( arg : String @NotBlank ) : ID' | "\t\n\r " | 'NotBlank;path=/arg;val:\t\n\r ;\t' + 'field( arg : String @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' + 'field( arg : String @NotBlank ) : ID' | "\t\n\r X" | '' + 'field( arg : String @NotBlank ) : ID' | null | '' // IDs - 'field( arg : ID @NotBlank ) : ID' | "\t\n\r " | 'NotBlank;path=/arg;val:\t\n\r ;\t' - 'field( arg : ID @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' - 'field( arg : ID @NotBlank ) : ID' | "\t\n\r X" | '' - 'field( arg : ID @NotBlank ) : ID' | null | '' + 'field( arg : ID @NotBlank ) : ID' | "\t\n\r " | 'NotBlank;path=/arg;val:\t\n\r ;\t' + 'field( arg : ID @NotBlank ) : ID' | "" | 'NotBlank;path=/arg;val:;\t' + 'field( arg : ID @NotBlank ) : ID' | "\t\n\r X" | '' + 'field( arg : ID @NotBlank ) : ID' | null | '' // Lists - 'field( arg : [String] @NotBlank ) : ID' | [] | 'NotBlank;path=/arg;val:[];\t' - 'field( arg : [String] @NotBlank ) : ID' | null | '' - 'field( arg : [String] @NotBlank ) : ID' | ["x"] | '' - 'field( arg : [String] @NotBlank ) : ID' | ["x", "y"] | '' - 'field( arg : [String] @NotBlank ) : ID' | ["x", " "] | 'NotBlank;path=/arg;val:[x, ];\t' - 'field( arg : [ID] @NotBlank ) : ID' | [] | 'NotBlank;path=/arg;val:[];\t' - 'field( arg : [ID] @NotBlank ) : ID' | null | '' - 'field( arg : [ID] @NotBlank ) : ID' | ["x"] | '' - 'field( arg : [ID] @NotBlank ) : ID' | ["x", "y"] | '' - 'field( arg : [String] @NotBlank ) : ID' | ["x", " "] | 'NotBlank;path=/arg;val:[x, ];\t' + 'field( arg : [String] @NotBlank ) : ID' | [] | '' + 'field( arg : [String] @NotBlank ) : ID' | null | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x"] | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x", "y"] | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x", " "] | 'NotBlank;path=/arg[1];val: ;\t' + 'field( arg : [ID] @NotBlank ) : ID' | [] | '' + 'field( arg : [ID] @NotBlank ) : ID' | null | '' + 'field( arg : [ID] @NotBlank ) : ID' | ["x"] | '' + 'field( arg : [ID] @NotBlank ) : ID' | ["x", "y"] | '' + 'field( arg : [String] @NotBlank ) : ID' | ["x", " "] | 'NotBlank;path=/arg[1];val: ;\t' } @Unroll def "not empty rule constraints"() { - DirectiveConstraint ruleUnderTest = new NotEmptyRule() expect: @@ -65,10 +63,10 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { 'field( arg : String @NotEmpty ) : ID' | "ABC" | '' // IDs - 'field( arg : ID @NotEmpty ) : ID' | "" | 'NotEmpty;path=/arg;val:;\t' - 'field( arg : ID @NotEmpty ) : ID' | null | '' - 'field( arg : ID @NotEmpty ) : ID' | "\t\n\r" | '' - 'field( arg : ID @NotEmpty ) : ID' | "ABC" | '' + 'field( arg : ID @NotEmpty ) : ID' | "" | 'NotEmpty;path=/arg;val:;\t' + 'field( arg : ID @NotEmpty ) : ID' | null | '' + 'field( arg : ID @NotEmpty ) : ID' | "\t\n\r" | '' + 'field( arg : ID @NotEmpty ) : ID' | "ABC" | '' // objects @@ -77,13 +75,42 @@ class NoEmptyBlankConstraintTest extends BaseConstraintTestSupport { 'field( arg : InputObject @NotEmpty ) : ID' | [name: "x"] | '' // lists - 'field( arg : [String] @NotEmpty ) : ID' | [] | 'NotEmpty;path=/arg;val:[];\t' + 'field( arg : [String] @NotEmpty ) : ID' | [] | '' // Validated by @ContainerNotEmpty 'field( arg : [String] @NotEmpty ) : ID' | null | '' 'field( arg : [String] @NotEmpty ) : ID' | ["x"] | '' - 'field( arg : [ID] @NotEmpty ) : ID' | [] | 'NotEmpty;path=/arg;val:[];\t' - 'field( arg : [ID] @NotEmpty ) : ID' | null | '' - 'field( arg : [ID] @NotEmpty ) : ID' | ["x"] | '' + 'field( arg : [String] @NotEmpty ) : ID' | ["\t"] | '' + 'field( arg : [String] @NotEmpty ) : ID' | [""] | 'NotEmpty;path=/arg[0];val:;\t' + 'field( arg : [ID] @NotEmpty ) : ID' | [] | '' + 'field( arg : [ID] @NotEmpty ) : ID' | null | '' + 'field( arg : [ID] @NotEmpty ) : ID' | ["x"] | '' + 'field( arg : [ID] @NotEmpty ) : ID' | ["\t"] | '' + 'field( arg : [ID] @NotEmpty ) : ID' | [""] | 'NotEmpty;path=/arg[0];val:;\t' + } + + @Unroll + def "container not empty rule constraints"() { + + DirectiveConstraint ruleUnderTest = new ContainerNotEmptyConstraint() + + expect: + def errors = runValidation(ruleUnderTest, fieldDeclaration, "arg", argVal) + assertErrors(errors, expectedMessage) + + where: + + fieldDeclaration | argVal | expectedMessage + // lists + 'field( arg : [String] @ContainerNotEmpty ) : ID' | [] | 'ContainerNotEmpty;path=/arg;val:[];\t' + 'field( arg : [String] @ContainerNotEmpty ) : ID' | null | '' + 'field( arg : [String] @ContainerNotEmpty ) : ID' | ["x"] | '' + 'field( arg : [String] @ContainerNotEmpty ) : ID' | ["\t"] | '' + 'field( arg : [String] @ContainerNotEmpty ) : ID' | [""] | '' + 'field( arg : [ID] @ContainerNotEmpty ) : ID' | [] | 'ContainerNotEmpty;path=/arg;val:[];\t' + 'field( arg : [ID] @ContainerNotEmpty ) : ID' | null | '' + 'field( arg : [ID] @ContainerNotEmpty ) : ID' | ["x"] | '' + 'field( arg : [ID] @ContainerNotEmpty ) : ID' | ["\t"] | '' + 'field( arg : [ID] @ContainerNotEmpty ) : ID' | [""] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/PatternConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/PatternConstraintTest.groovy index 56bae51..3e932a4 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/PatternConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/PatternConstraintTest.groovy @@ -24,10 +24,12 @@ class PatternConstraintTest extends BaseConstraintTestSupport { 'field( arg : String @Pattern(regexp:"[A-Z]*") ) : ID' | "ABC" | '' 'field( arg : ID @Pattern(regexp:"[A-Z]*") ) : ID' | "ABCd" | 'Pattern;path=/arg;val:ABCd;\t' 'field( arg : ID @Pattern(regexp:"[A-Z]*") ) : ID' | "ABC" | '' + + // Lists 'field( arg : [String] @Pattern(regexp:"[A-Z]*") ) : ID' | ["ABC"] | '' - 'field( arg : [String] @Pattern(regexp:"[A-Z]*") ) : ID' | ["ABC", "ABCd"] | 'Pattern;path=/arg;val:[ABC, ABCd];\t' + 'field( arg : [String] @Pattern(regexp:"[A-Z]*") ) : ID' | ["ABC", "ABCd"] | 'Pattern;path=/arg[1];val:ABCd;\t' 'field( arg : [ID] @Pattern(regexp:"[A-Z]*") ) : ID' | ["ABC"] | '' - 'field( arg : [ID] @Pattern(regexp:"[A-Z]*") ) : ID' | ["ABC", "ABCd"] | 'Pattern;path=/arg;val:[ABC, ABCd];\t' + 'field( arg : [ID] @Pattern(regexp:"[A-Z]*") ) : ID' | ["ABC", "ABCd"] | 'Pattern;path=/arg[1];val:ABCd;\t' // nulls are valid 'field( arg : String @Pattern(regexp:"[A-Z]*") ) : ID' | null | '' diff --git a/src/test/groovy/graphql/validation/constraints/standard/RangeConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/RangeConstraintTest.groovy index 3c618f0..e47791d 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/RangeConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/RangeConstraintTest.groovy @@ -33,5 +33,10 @@ class RangeConstraintTest extends BaseConstraintTestSupport { "field( arg : String @Range(max : 10) ) : ID" | Long.valueOf("12") | "Range;path=/arg;val:12;\t" "field( arg : String @Range(max : 10) ) : ID" | Integer.valueOf("12") | "Range;path=/arg;val:12;\t" "field( arg : String @Range(max : 10) ) : ID" | Short.valueOf("12") | "Range;path=/arg;val:12;\t" + + // Lists + 'field( arg : [String] @Range(max : 10) ) : ID' | [50, 0] | 'Range;path=/arg[0];val:50;\t' + 'field( arg : [String] @Range(max : 10) ) : ID' | [9, 8] | '' + 'field( arg : [String] @Range(max : 10) ) : ID' | [null] | '' } } \ No newline at end of file diff --git a/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy index b34f24a..a67ae2e 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy @@ -5,11 +5,8 @@ import graphql.validation.constraints.DirectiveConstraint import spock.lang.Unroll class SizeConstraintTest extends BaseConstraintTestSupport { - - @Unroll def "size rule constraints"() { - DirectiveConstraint ruleUnderTest = new SizeConstraint() expect: @@ -28,12 +25,36 @@ class SizeConstraintTest extends BaseConstraintTestSupport { 'field( arg : String @Size(min : 5, message : "custom") ) : ID' | "123" | "custom;path=/arg;val:123;\t" "field( arg : String @Size(min : 5) ) : ID" | null | "" - //IDs - "field( arg : ID @Size(max : 10) ) : ID" | "1234567891011" | "Size;path=/arg;val:1234567891011;\t" - "field( arg : ID @Size(max : 100) ) : ID" | "1234567891011" | "" - "field( arg : ID @Size(max : 10, min : 5) ) : ID" | "123" | "Size;path=/arg;val:123;\t" + // IDs + "field( arg : ID @Size(max : 10) ) : ID" | "1234567891011" | "Size;path=/arg;val:1234567891011;\t" + "field( arg : ID @Size(max : 100) ) : ID" | "1234567891011" | "" + "field( arg : ID @Size(max : 10, min : 5) ) : ID" | "123" | "Size;path=/arg;val:123;\t" + + 'field( arg : ID @Size(min : 5, message : "custom") ) : ID' | "123" | "custom;path=/arg;val:123;\t" + "field( arg : ID @Size(min : 5) ) : ID" | null | "" + + // Lists + 'field (arg : [String] @Size(min: 5)) : ID' | [] | "" // Validated by @ContainerSize + } + + @Unroll + def "container size rule constraints"() { + DirectiveConstraint ruleUnderTest = new ContainerSizeConstraint() + + expect: + + def errors = runValidation(ruleUnderTest, fieldDeclaration, "arg", argVal) + assertErrors(errors, expectedMessage) + + where: - 'field( arg : ID @Size(min : 5, message : "custom") ) : ID' | "123" | "custom;path=/arg;val:123;\t" - "field( arg : ID @Size(min : 5) ) : ID" | null | "" + fieldDeclaration | argVal | expectedMessage + // Lists + 'field (arg : [String] @ContainerSize(min: 2)) : ID' | [] | "ContainerSize;path=/arg;val:[];\t" + 'field (arg : [String] @ContainerSize(max: 1)) : ID' | ["asd", "sdf"] | "ContainerSize;path=/arg;val:[asd, sdf];\t" + 'field (arg : [String] @ContainerSize(min: 2)) : ID' | ["a", "b"] | "" + 'field (arg : [String] @ContainerSize(max: 2)) : ID' | ["a", "b"] | "" + 'field (arg : [String] @ContainerSize(max: 5)) : ID' | [] | "" + 'field (arg : [String] @ContainerSize(min: 2)) : ID' | null | "" } } \ No newline at end of file From 0cf370cd1e792e2277a7a4b50a0cdf4df427c552 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 4 Mar 2022 10:18:46 -0500 Subject: [PATCH 18/65] Update README.md Update readme to correctly reference 17.0 versions of this library --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a4fdcb3..976c849 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,12 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 17.0.0 - pom + 17.0 ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:17.0.0' +compile 'com.graphql-java:graphql-java-extended-validation:17.0' ``` > Note: @@ -37,7 +36,9 @@ compile 'com.graphql-java:graphql-java-extended-validation:17.0.0' > > use 16.0.0 or above for graphql-java 16.x and above > -> use 17.0.0 or above for graphql-java 17.x and above +> use 17.0 or above for graphql-java 17.x and above +> +> use 17.0-hibernate-validator-6.2.0.Final for graphql-java 17.x and SpringBoot 2.x support It's currently available from Maven central. From 50bbe74931b9e7aae12f6219dd96ec06e3eb3e22 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 15 Apr 2022 21:53:02 -0400 Subject: [PATCH 19/65] chore(deps): Updating to use graphql-java 18.0 (#60) --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 88ad13e..5ad6e1a 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ repositories { dependencies { - api "com.graphql-java:graphql-java:17.0" - api "com.graphql-java:graphql-java-extended-scalars:17.0" + api "com.graphql-java:graphql-java:18.0" + api "com.graphql-java:graphql-java-extended-scalars:18.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.0" From 1319d3d4d673154439d2413aea60bf89f4e8b8c6 Mon Sep 17 00:00:00 2001 From: Paul Pop Date: Sat, 16 Apr 2022 04:55:12 +0300 Subject: [PATCH 20/65] Pass in the correct value when building the error message (#63) --- .../constraints/standard/AbstractDecimalMinMaxConstraint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java index 5e92a30..00f6da3 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java @@ -44,7 +44,7 @@ protected List runConstraint(ValidationEnvironment validationEnvir } if (!isOK) { - return mkError(validationEnvironment, "value", validatedValue, "inclusive", inclusive); + return mkError(validationEnvironment, "value", value, "inclusive", inclusive); } return Collections.emptyList(); From b3d9bc378742ae7aa5c217810129bb8322e42edf Mon Sep 17 00:00:00 2001 From: WonChul Heo Date: Wed, 27 Apr 2022 14:14:59 +0900 Subject: [PATCH 21/65] Replace to `ConcurrentMap` from `Map` (#65) Co-authored-by: heowc --- .../validation/constraints/standard/PatternConstraint.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java b/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java index 031af69..f377b83 100644 --- a/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java @@ -7,9 +7,9 @@ import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; import java.util.regex.Pattern; import static graphql.schema.GraphQLTypeUtil.isList; @@ -17,7 +17,7 @@ public class PatternConstraint extends AbstractDirectiveConstraint { - private final static Map SEEN_PATTERNS = new HashMap<>(); + private final static ConcurrentMap SEEN_PATTERNS = new ConcurrentHashMap<>(); public PatternConstraint() { super("Pattern"); From cd60d11ef60843a46e1e148d4a08bd940975fca6 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 3 May 2022 06:51:11 -0400 Subject: [PATCH 22/65] chore(deps): update to grapqhl-java:18.1 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5ad6e1a..8932608 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ repositories { dependencies { - api "com.graphql-java:graphql-java:18.0" - api "com.graphql-java:graphql-java-extended-scalars:18.0" + api "com.graphql-java:graphql-java:18.1" + api "com.graphql-java:graphql-java-extended-scalars:18.1" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.0" From 03f22ffd4b08b7b8e1799347191c93e8a1014d39 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 25 May 2022 05:28:35 -0400 Subject: [PATCH 23/65] docs: add release and snapshot badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 976c849..8d38d69 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionPrefix=17)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) - This library provides extended validation of fields and field arguments for [graphql-java](https://github.com/graphql-java/graphql-java) From b7bc9de7ded207ebe4c2cbd4cc3e87c88ba4aa8e Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 26 May 2022 22:06:01 -0400 Subject: [PATCH 24/65] docs: update readme for 18.x series of releases --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8d38d69..2548d46 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionPrefix=17)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?version=18.1&color=blue)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release - Jakarta EE8](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionSuffix=6.2.0.Final&label=maven-central%20jakarta%20ee8)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) @@ -18,27 +19,25 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 17.0 + 18.1 ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:17.0' +compile 'com.graphql-java:graphql-java-extended-validation:18.1' ``` > Note: -> -> use 0.0.3 or below for graphql-java 13.x and below -> -> use 14.0.1 or above for graphql-java 14.x and above -> -> use 15.0.1 or above for graphql-java 15.x and above > > use 16.0.0 or above for graphql-java 16.x and above > > use 17.0 or above for graphql-java 17.x and above > > use 17.0-hibernate-validator-6.2.0.Final for graphql-java 17.x and SpringBoot 2.x support +> +> use 18.1 or above for graphql-java 18.x and above +> +> use 18.1-hibernate-validator-6.2.0.Final for graphql-java 18.x and SpringBoot 2.x support It's currently available from Maven central. From 598e37504d72417818dbdbd9a893ddc3fada73fe Mon Sep 17 00:00:00 2001 From: Sunny Pelletier Date: Thu, 15 Sep 2022 04:50:10 +0000 Subject: [PATCH 25/65] merge with master (#72) --- .../AbstractDirectiveConstraint.java | 66 +++++++------------ .../AbstractDecimalMinMaxConstraint.java | 6 +- .../standard/AbstractMinMaxConstraint.java | 5 +- .../standard/AbstractSizeConstraint.java | 5 +- .../standard/DigitsConstraint.java | 6 +- .../standard/ExpressionConstraint.java | 7 +- .../standard/PatternConstraint.java | 3 +- .../constraints/standard/RangeConstraint.java | 6 +- .../ResourceBundleMessageInterpolator.java | 34 ++++------ .../rules/TargetedValidationRules.java | 20 ++---- .../rules/ValidationEnvironment.java | 19 ++---- .../util/DirectivesAndTypeWalker.java | 21 ++---- src/test/groovy/ELDiscover.java | 6 +- .../groovy/graphql/validation/TestUtil.groovy | 5 +- .../BaseConstraintTestSupport.groovy | 16 ++--- 15 files changed, 89 insertions(+), 136 deletions(-) diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index 4cfc79b..bb21406 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -4,18 +4,11 @@ import graphql.GraphQLError; import graphql.PublicSpi; import graphql.Scalars; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLDirective; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLFieldsContainer; -import graphql.schema.GraphQLInputObjectType; -import graphql.schema.GraphQLInputType; -import graphql.schema.GraphQLNamedInputType; -import graphql.schema.GraphQLScalarType; -import graphql.schema.GraphQLTypeUtil; +import graphql.schema.*; import graphql.validation.rules.ValidationEnvironment; import graphql.validation.util.DirectivesAndTypeWalker; import graphql.validation.util.Util; + import java.lang.reflect.Array; import java.math.BigDecimal; import java.util.ArrayList; @@ -25,6 +18,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import static graphql.schema.GraphQLTypeUtil.isList; import static graphql.validation.rules.ValidationEnvironment.ValidatedElement.FIELD; import static graphql.validation.util.Util.mkMap; @@ -138,17 +132,17 @@ private List runValidationImpl(ValidationEnvironment validationEnv private List runConstraintOnDirectives(ValidationEnvironment validationEnvironment) { List errors = new ArrayList<>(); - List directives = validationEnvironment.getDirectives(); - directives = Util.sort(directives, GraphQLDirective::getName); + List directives = validationEnvironment.getDirectives(); + directives = Util.sort(directives, GraphQLAppliedDirective::getName); - for (GraphQLDirective directive : directives) { + for (GraphQLAppliedDirective directive : directives) { // we get called for arguments and input field and field types which can have multiple directive constraints on them and hence no just for this one boolean isOurDirective = directive.getName().equals(this.getName()); if (!isOurDirective) { continue; } - validationEnvironment = validationEnvironment.transform(b -> b.context(GraphQLDirective.class, directive)); + validationEnvironment = validationEnvironment.transform(b -> b.context(GraphQLAppliedDirective.class, directive)); // // now run the directive rule with this directive instance List ruleErrors = this.runConstrainOnPossibleListElements(validationEnvironment); @@ -201,18 +195,15 @@ protected boolean isOneOfTheseTypes(GraphQLInputType inputType, Collection mkMessageParams(Object validatedValue, ValidationE * @param msgParams the map of parameters * @return a list of a single error */ - protected List mkError(ValidationEnvironment validationEnvironment, GraphQLDirective directive, Map msgParams) { + protected List mkError(ValidationEnvironment validationEnvironment, GraphQLAppliedDirective directive, Map msgParams) { String messageTemplate = getMessageTemplate(directive); GraphQLError error = validationEnvironment.getInterpolator().interpolate(messageTemplate, msgParams, validationEnvironment); return singletonList(error); } protected List mkError(ValidationEnvironment validationEnvironment, Object... messageParameters) { - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); String messageTemplate = getMessageTemplate(directive); Object validatedValue = validationEnvironment.getValidatedValue(); GraphQLError error = validationEnvironment.getInterpolator().interpolate(messageTemplate, mkMessageParams(validatedValue, validationEnvironment, messageParameters), validationEnvironment); diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java index 00f6da3..1bedd8b 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractDecimalMinMaxConstraint.java @@ -1,14 +1,16 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLAppliedDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.rules.ValidationEnvironment; + import java.math.BigDecimal; import java.util.Collections; import java.util.List; + import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; abstract class AbstractDecimalMinMaxConstraint extends AbstractDirectiveConstraint { @@ -29,7 +31,7 @@ protected boolean appliesToType(GraphQLInputType inputType) { protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); String value = getStrArg(directive, "value"); boolean inclusive = getBoolArg(directive, "inclusive"); diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java index cdfb40b..e66cad5 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractMinMaxConstraint.java @@ -1,12 +1,13 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLAppliedDirective; import graphql.schema.GraphQLInputType; import graphql.schema.GraphQLScalarType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.GraphQLScalars; import graphql.validation.rules.ValidationEnvironment; + import java.math.BigDecimal; import java.util.Collections; import java.util.List; @@ -29,7 +30,7 @@ protected boolean appliesToType(GraphQLInputType inputType) { @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); int value = getIntArg(directive, "value"); boolean isOK; diff --git a/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java b/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java index 329ff95..7a61e0e 100644 --- a/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/AbstractSizeConstraint.java @@ -1,10 +1,11 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLAppliedDirective; import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.rules.ValidationEnvironment; + import java.util.Collections; import java.util.List; @@ -18,7 +19,7 @@ final protected List runConstraint(ValidationEnvironment validatio Object validatedValue = validationEnvironment.getValidatedValue(); GraphQLInputType argType = validationEnvironment.getValidatedType(); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); int min = getIntArg(directive, "min"); int max = getIntArg(directive, "max"); diff --git a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java index 3a93513..fe94bbd 100644 --- a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java @@ -1,14 +1,16 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLAppliedDirective; import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; + import java.math.BigDecimal; import java.util.Collections; import java.util.List; + import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; public class DigitsConstraint extends AbstractDirectiveConstraint { @@ -39,7 +41,7 @@ public boolean appliesToType(GraphQLInputType inputType) { protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); int maxIntegerLength = getIntArg(directive, "integer"); int maxFractionLength = getIntArg(directive, "fraction"); diff --git a/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java b/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java index f2d4d6c..16a03dd 100644 --- a/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java @@ -1,10 +1,7 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLFieldsContainer; -import graphql.schema.GraphQLInputType; +import graphql.schema.*; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.el.ELSupport; @@ -50,7 +47,7 @@ public boolean appliesTo(GraphQLFieldDefinition fieldDefinition, GraphQLFieldsCo @Override protected List runConstraint(ValidationEnvironment validationEnvironment) { - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); String expression = helpWithCurlyBraces(getStrArg(directive, "value")); Map variables = StandardELVariables.standardELVars(validationEnvironment); diff --git a/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java b/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java index f377b83..b670bf8 100644 --- a/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/PatternConstraint.java @@ -2,6 +2,7 @@ import graphql.GraphQLError; import graphql.Scalars; +import graphql.schema.GraphQLAppliedDirective; import graphql.schema.GraphQLDirective; import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; @@ -47,7 +48,7 @@ protected List runConstraint(ValidationEnvironment validationEnvir String strValue = String.valueOf(validatedValue); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); String patternArg = getStrArg(directive, "regexp"); Pattern pattern = cachedPattern(patternArg); diff --git a/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java b/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java index 73a412c..1ad9ad6 100644 --- a/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/RangeConstraint.java @@ -1,14 +1,16 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLAppliedDirective; import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.rules.ValidationEnvironment; + import java.math.BigDecimal; import java.util.Collections; import java.util.List; + import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; public class RangeConstraint extends AbstractDirectiveConstraint { @@ -40,7 +42,7 @@ public boolean appliesToType(GraphQLInputType inputType) { protected List runConstraint(ValidationEnvironment validationEnvironment) { Object validatedValue = validationEnvironment.getValidatedValue(); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); BigDecimal min = asBigDecimal(getIntArg(directive, "min")); BigDecimal max = asBigDecimal(getIntArg(directive, "max")); diff --git a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java index 0896a8b..348b11f 100644 --- a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java +++ b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java @@ -4,20 +4,9 @@ import graphql.GraphQLError; import graphql.GraphqlErrorBuilder; import graphql.execution.ResultPath; -import graphql.schema.GraphQLDirective; +import graphql.schema.GraphQLAppliedDirective; import graphql.validation.el.StandardELVariables; import graphql.validation.rules.ValidationEnvironment; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.Optional; -import java.util.ResourceBundle; -import jakarta.validation.Constraint; -import jakarta.validation.Path; -import jakarta.validation.Payload; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.metadata.core.ConstraintHelper; import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl; @@ -27,12 +16,15 @@ import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel; import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator; import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE_USE; + +import jakarta.validation.Constraint; +import jakarta.validation.Path; +import jakarta.validation.Payload; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.*; + +import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** @@ -70,7 +62,7 @@ public class ResourceBundleMessageInterpolator implements MessageInterpolator { @SuppressWarnings("unused") protected ErrorClassification buildErrorClassification(String messageTemplate, Map messageParams, ValidationEnvironment validationEnvironment) { ResultPath fieldOrArgumentPath = validationEnvironment.getValidatedPath(); - GraphQLDirective directive = validationEnvironment.getContextObject(GraphQLDirective.class); + GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); return new ValidationErrorType(fieldOrArgumentPath, directive); } @@ -183,9 +175,9 @@ private org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterp private static class ValidationErrorType implements ErrorClassification { private final ResultPath fieldOrArgumentPath; - private final GraphQLDirective directive; + private final GraphQLAppliedDirective directive; - ValidationErrorType(ResultPath fieldOrArgumentPath, GraphQLDirective directive) { + ValidationErrorType(ResultPath fieldOrArgumentPath, GraphQLAppliedDirective directive) { this.fieldOrArgumentPath = fieldOrArgumentPath; this.directive = directive; } diff --git a/src/main/java/graphql/validation/rules/TargetedValidationRules.java b/src/main/java/graphql/validation/rules/TargetedValidationRules.java index b12a8aa..9d72206 100644 --- a/src/main/java/graphql/validation/rules/TargetedValidationRules.java +++ b/src/main/java/graphql/validation/rules/TargetedValidationRules.java @@ -4,17 +4,7 @@ import graphql.GraphQLError; import graphql.PublicApi; import graphql.execution.ResultPath; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLDirective; -import graphql.schema.GraphQLDirectiveContainer; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLInputObjectField; -import graphql.schema.GraphQLInputObjectType; -import graphql.schema.GraphQLInputType; -import graphql.schema.GraphQLList; -import graphql.schema.GraphQLObjectType; -import graphql.schema.GraphQLTypeUtil; +import graphql.schema.*; import graphql.util.FpKit; import graphql.validation.interpolation.MessageInterpolator; import graphql.validation.locale.LocaleUtil; @@ -112,7 +102,7 @@ public List runValidationRules(DataFetchingEnvironment env, Messag .validatedType(inputType) .validatedValue(argValue) .validatedPath(fieldPath.segment(fieldArg.getName())) - .directives(fieldArg.getDirectives()) + .directives(fieldArg.getAppliedDirectives()) .messageInterpolator(interpolator) .locale(defaultLocale) .build(); @@ -173,7 +163,7 @@ private List walkObjectArg(ValidationRule rule, ValidationEnvironm .validatedPath(newPath) .validatedValue(validatedValue) .validatedType(fieldType) - .directives(inputField.getDirectives()) + .directives(inputField.getAppliedDirectives()) .validatedElement(INPUT_OBJECT_FIELD) ); @@ -187,11 +177,11 @@ private List walkListArg(ValidationRule rule, ValidationEnvironmen List errors = new ArrayList<>(); GraphQLInputType listItemType = Util.unwrapOneAndAllNonNull(argumentType); - List directives; + List directives; if (!(listItemType instanceof GraphQLDirectiveContainer)) { directives = Collections.emptyList(); } else { - directives = ((GraphQLDirectiveContainer) listItemType).getDirectives(); + directives = ((GraphQLDirectiveContainer) listItemType).getAppliedDirectives(); } int ix = 0; for (Object value : objectList) { diff --git a/src/main/java/graphql/validation/rules/ValidationEnvironment.java b/src/main/java/graphql/validation/rules/ValidationEnvironment.java index 088063b..ecbb5cd 100644 --- a/src/main/java/graphql/validation/rules/ValidationEnvironment.java +++ b/src/main/java/graphql/validation/rules/ValidationEnvironment.java @@ -3,12 +3,7 @@ import graphql.PublicApi; import graphql.execution.ResultPath; import graphql.language.SourceLocation; -import graphql.schema.DataFetchingEnvironment; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLDirective; -import graphql.schema.GraphQLFieldDefinition; -import graphql.schema.GraphQLFieldsContainer; -import graphql.schema.GraphQLInputType; +import graphql.schema.*; import graphql.validation.interpolation.MessageInterpolator; import java.util.Collections; @@ -55,7 +50,7 @@ public enum ValidatedElement { private final Object validatedValue; private final GraphQLInputType validatedType; private final ValidatedElement validatedElement; - private final List directives; + private final List directives; private ValidationEnvironment(Builder builder) { this.argument = builder.argument; @@ -131,7 +126,7 @@ public ValidatedElement getValidatedElement() { return validatedElement; } - public List getDirectives() { + public List getDirectives() { return directives; } @@ -155,7 +150,7 @@ public static class Builder { private Object validatedValue; private GraphQLInputType validatedType; private ValidatedElement validatedElement; - private List directives = Collections.emptyList(); + private List directives = Collections.emptyList(); public Builder validationEnvironment(ValidationEnvironment validationEnvironment) { this.argument = validationEnvironment.argument; @@ -176,9 +171,9 @@ public Builder validationEnvironment(ValidationEnvironment validationEnvironment } public Builder dataFetchingEnvironment(DataFetchingEnvironment dataFetchingEnvironment) { - fieldsContainer(dataFetchingEnvironment.getExecutionStepInfo().getFieldContainer()); + fieldsContainer(dataFetchingEnvironment.getExecutionStepInfo().getObjectType()); fieldDefinition(dataFetchingEnvironment.getFieldDefinition()); - directives(dataFetchingEnvironment.getFieldDefinition().getDirectives()); + directives(dataFetchingEnvironment.getFieldDefinition().getAppliedDirectives()); executionPath(dataFetchingEnvironment.getExecutionStepInfo().getPath()); validatedPath(dataFetchingEnvironment.getExecutionStepInfo().getPath()); location(dataFetchingEnvironment.getField().getSourceLocation()); @@ -252,7 +247,7 @@ public Builder locale(Locale locale) { return this; } - public Builder directives(List directives) { + public Builder directives(List directives) { this.directives = directives; return this; } diff --git a/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java b/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java index 53d7e07..ae46f3f 100644 --- a/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java +++ b/src/main/java/graphql/validation/util/DirectivesAndTypeWalker.java @@ -1,14 +1,7 @@ package graphql.validation.util; import graphql.Internal; -import graphql.schema.GraphQLArgument; -import graphql.schema.GraphQLDirective; -import graphql.schema.GraphQLDirectiveContainer; -import graphql.schema.GraphQLInputObjectField; -import graphql.schema.GraphQLInputObjectType; -import graphql.schema.GraphQLInputType; -import graphql.schema.GraphQLList; -import graphql.schema.GraphQLTypeUtil; +import graphql.schema.*; import java.util.HashMap; import java.util.List; @@ -20,16 +13,16 @@ public class DirectivesAndTypeWalker { private final Map seenTypes = new HashMap<>(); - public boolean isSuitable(GraphQLArgument argument, BiFunction isSuitable) { + public boolean isSuitable(GraphQLArgument argument, BiFunction isSuitable) { GraphQLInputType inputType = argument.getType(); - List directives = argument.getDirectives(); + List directives = argument.getAppliedDirectives(); return walkInputType(inputType, directives, isSuitable); } - private boolean walkInputType(GraphQLInputType inputType, List directives, BiFunction isSuitable) { + private boolean walkInputType(GraphQLInputType inputType, List directives, BiFunction isSuitable) { String typeName = GraphQLTypeUtil.unwrapAll(inputType).getName(); GraphQLInputType unwrappedInputType = Util.unwrapNonNull(inputType); - for (GraphQLDirective directive : directives) { + for (GraphQLAppliedDirective directive : directives) { if (isSuitable.apply(unwrappedInputType, directive)) { return seen(typeName,true); } @@ -43,7 +36,7 @@ private boolean walkInputType(GraphQLInputType inputType, List for (GraphQLInputObjectField inputField : inputObjType.getFieldDefinitions()) { inputType = inputField.getType(); - directives = inputField.getDirectives(); + directives = inputField.getAppliedDirectives(); if (walkInputType(inputType, directives, isSuitable)) { return seen(typeName,true); @@ -53,7 +46,7 @@ private boolean walkInputType(GraphQLInputType inputType, List if (unwrappedInputType instanceof GraphQLList) { GraphQLInputType innerListType = Util.unwrapOneAndAllNonNull(unwrappedInputType); if (innerListType instanceof GraphQLDirectiveContainer) { - directives = ((GraphQLDirectiveContainer) innerListType).getDirectives(); + directives = ((GraphQLDirectiveContainer) innerListType).getAppliedDirectives(); if (walkInputType(innerListType, directives, isSuitable)) { return seen(typeName,true); } diff --git a/src/test/groovy/ELDiscover.java b/src/test/groovy/ELDiscover.java index e09e511..7c280b1 100644 --- a/src/test/groovy/ELDiscover.java +++ b/src/test/groovy/ELDiscover.java @@ -3,9 +3,6 @@ import jakarta.el.ExpressionFactory; import jakarta.el.StandardELContext; import jakarta.el.ValueExpression; -import jakarta.validation.MessageInterpolator; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotNull; import org.hibernate.validator.constraints.Range; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.engine.path.PathImpl; @@ -17,6 +14,9 @@ import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel; import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotNull; import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; diff --git a/src/test/groovy/graphql/validation/TestUtil.groovy b/src/test/groovy/graphql/validation/TestUtil.groovy index 4fe940b..f642efb 100644 --- a/src/test/groovy/graphql/validation/TestUtil.groovy +++ b/src/test/groovy/graphql/validation/TestUtil.groovy @@ -15,6 +15,7 @@ import graphql.language.Type import graphql.parser.Parser import graphql.schema.Coercing import graphql.schema.DataFetcher +import graphql.schema.GraphQLAppliedDirective import graphql.schema.GraphQLArgument import graphql.schema.GraphQLDirective import graphql.schema.GraphQLFieldDefinition @@ -189,8 +190,8 @@ class TestUtil { definition) } - static GraphQLDirective mockDirective(String name) { - new GraphQLDirective(name, name, EnumSet.noneOf(DirectiveLocation.class), Collections.emptyList(), false, false, false) + static GraphQLAppliedDirective mockDirective(String name) { + new GraphQLAppliedDirective(name, name, EnumSet.noneOf(DirectiveLocation.class), Collections.emptyList(), false, false, false) } static TypeRuntimeWiring mockTypeRuntimeWiring(String typeName, boolean withResolver) { diff --git a/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy b/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy index 1c3606e..801c654 100644 --- a/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy +++ b/src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy @@ -2,18 +2,12 @@ package graphql.validation.constraints import graphql.GraphQLError import graphql.GraphqlErrorBuilder -import graphql.execution.ResultPath import graphql.execution.ExecutionStepInfo import graphql.execution.MergedField +import graphql.execution.ResultPath import graphql.language.Field import graphql.language.SourceLocation -import graphql.schema.DataFetchingEnvironmentImpl -import graphql.schema.GraphQLArgument -import graphql.schema.GraphQLDirective -import graphql.schema.GraphQLFieldDefinition -import graphql.schema.GraphQLFieldsContainer -import graphql.schema.GraphQLObjectType -import graphql.schema.GraphQLSchema +import graphql.schema.* import graphql.validation.TestUtil import graphql.validation.interpolation.MessageInterpolator import graphql.validation.rules.TargetedValidationRules @@ -102,7 +96,7 @@ class BaseConstraintTestSupport extends Specification { .fieldsContainer(fieldsContainer) .executionPath(ResultPath.rootPath().segment(fieldDefinition.getName())) .validatedPath(ResultPath.rootPath().segment(argName)) - .context(GraphQLDirective.class, argUnderTest.getDirective(targetDirective)) + .context(GraphQLAppliedDirective.class, argUnderTest.getAppliedDirective(targetDirective)) .messageInterpolator(interpolator) .build() ruleEnvironment @@ -120,8 +114,8 @@ class BaseConstraintTestSupport extends Specification { .executionPath(path) .validatedElement(ValidationEnvironment.ValidatedElement.FIELD) .validatedPath(path) - .directives(fieldDefinition.getDirectives()) - .context(GraphQLDirective.class, fieldDefinition.getDirective(targetDirective.name)) + .directives(fieldDefinition.getAppliedDirectives()) + .context(GraphQLAppliedDirective.class, fieldDefinition.getAppliedDirective(targetDirective.name)) .messageInterpolator(interpolator) .build() ruleEnvironment From 3d1969c530fb176fcdf99393b46649ad0ec749d5 Mon Sep 17 00:00:00 2001 From: Sunny Pelletier Date: Sun, 18 Sep 2022 21:39:57 +0000 Subject: [PATCH 26/65] Remove wildcard imports (#75) * merge with master * remove all wildcard imports --- .../AbstractDirectiveConstraint.java | 11 +++++++++- .../standard/ExpressionConstraint.java | 5 ++++- .../ResourceBundleMessageInterpolator.java | 22 ++++++++++++++----- .../rules/TargetedValidationRules.java | 12 +++++++++- .../rules/ValidationEnvironment.java | 7 +++++- .../FieldValidatorDataFetcher.java | 7 ++++-- 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index bb21406..ddb7a7f 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -4,7 +4,16 @@ import graphql.GraphQLError; import graphql.PublicSpi; import graphql.Scalars; -import graphql.schema.*; +import graphql.schema.GraphQLAppliedDirective; +import graphql.schema.GraphQLAppliedDirectiveArgument; +import graphql.schema.GraphQLArgument; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLFieldsContainer; +import graphql.schema.GraphQLInputObjectType; +import graphql.schema.GraphQLInputType; +import graphql.schema.GraphQLNamedInputType; +import graphql.schema.GraphQLScalarType; +import graphql.schema.GraphQLTypeUtil; import graphql.validation.rules.ValidationEnvironment; import graphql.validation.util.DirectivesAndTypeWalker; import graphql.validation.util.Util; diff --git a/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java b/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java index 16a03dd..3f003ff 100644 --- a/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/ExpressionConstraint.java @@ -1,7 +1,10 @@ package graphql.validation.constraints.standard; import graphql.GraphQLError; -import graphql.schema.*; +import graphql.schema.GraphQLAppliedDirective; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLFieldsContainer; +import graphql.schema.GraphQLInputType; import graphql.validation.constraints.AbstractDirectiveConstraint; import graphql.validation.constraints.Documentation; import graphql.validation.el.ELSupport; diff --git a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java index 348b11f..99df8c1 100644 --- a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java +++ b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java @@ -7,6 +7,9 @@ import graphql.schema.GraphQLAppliedDirective; import graphql.validation.el.StandardELVariables; import graphql.validation.rules.ValidationEnvironment; +import jakarta.validation.Constraint; +import jakarta.validation.Path; +import jakarta.validation.Payload; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.metadata.core.ConstraintHelper; import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl; @@ -17,14 +20,21 @@ import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator; import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator; -import jakarta.validation.Constraint; -import jakarta.validation.Path; -import jakarta.validation.Payload; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.util.*; - -import static java.lang.annotation.ElementType.*; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.Optional; +import java.util.ResourceBundle; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE_USE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/src/main/java/graphql/validation/rules/TargetedValidationRules.java b/src/main/java/graphql/validation/rules/TargetedValidationRules.java index 9d72206..f0a5b20 100644 --- a/src/main/java/graphql/validation/rules/TargetedValidationRules.java +++ b/src/main/java/graphql/validation/rules/TargetedValidationRules.java @@ -4,7 +4,17 @@ import graphql.GraphQLError; import graphql.PublicApi; import graphql.execution.ResultPath; -import graphql.schema.*; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLAppliedDirective; +import graphql.schema.GraphQLArgument; +import graphql.schema.GraphQLDirectiveContainer; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLInputObjectField; +import graphql.schema.GraphQLInputObjectType; +import graphql.schema.GraphQLInputType; +import graphql.schema.GraphQLList; +import graphql.schema.GraphQLObjectType; +import graphql.schema.GraphQLTypeUtil; import graphql.util.FpKit; import graphql.validation.interpolation.MessageInterpolator; import graphql.validation.locale.LocaleUtil; diff --git a/src/main/java/graphql/validation/rules/ValidationEnvironment.java b/src/main/java/graphql/validation/rules/ValidationEnvironment.java index ecbb5cd..903b5bb 100644 --- a/src/main/java/graphql/validation/rules/ValidationEnvironment.java +++ b/src/main/java/graphql/validation/rules/ValidationEnvironment.java @@ -3,7 +3,12 @@ import graphql.PublicApi; import graphql.execution.ResultPath; import graphql.language.SourceLocation; -import graphql.schema.*; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLAppliedDirective; +import graphql.schema.GraphQLArgument; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLFieldsContainer; +import graphql.schema.GraphQLInputType; import graphql.validation.interpolation.MessageInterpolator; import java.util.Collections; diff --git a/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java b/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java index a02836a..58c1769 100644 --- a/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java +++ b/src/main/java/graphql/validation/schemawiring/FieldValidatorDataFetcher.java @@ -1,11 +1,14 @@ package graphql.validation.schemawiring; import graphql.GraphQLError; -import graphql.schema.*; +import graphql.schema.DataFetcher; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLFieldsContainer; +import graphql.schema.GraphQLType; import graphql.validation.interpolation.MessageInterpolator; import graphql.validation.rules.OnValidationErrorStrategy; import graphql.validation.rules.TargetedValidationRules; -import graphql.validation.rules.ValidationRule; import graphql.validation.rules.ValidationRules; import graphql.validation.util.Util; From 994b9f97d304f3f19255a8dff84c3a514454d134 Mon Sep 17 00:00:00 2001 From: Donna Zhou Date: Mon, 19 Sep 2022 16:25:07 +1000 Subject: [PATCH 27/65] Update graphql-java to 19.2 --- README.md | 15 ++++++++------- build.gradle | 10 ++++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2548d46..610e535 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 18.1 + 19.0 ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:18.1' +compile 'com.graphql-java:graphql-java-extended-validation:19.0' ``` > Note: @@ -38,6 +38,8 @@ compile 'com.graphql-java:graphql-java-extended-validation:18.1' > use 18.1 or above for graphql-java 18.x and above > > use 18.1-hibernate-validator-6.2.0.Final for graphql-java 18.x and SpringBoot 2.x support +> +> use 19.0 or above for graphql-java 19.x and above It's currently available from Maven central. @@ -134,14 +136,13 @@ Like javax.validation, this library ships with some default error message templa # I18n Locale Support The validation library aims to offer Internationalisation (18N) of the error messages. When the validation rules -run they are passed in a `java.util.Locale`. A `ResourceBundleMessageInterpolator` can then be used to build up messages +run they are passed in a `java.util.Locale`. A `ResourceBundleMessageInterpolator` can then be used to build up messages that come from I18N bundles. -A `Locale` should be created per graphql execution. However at the time of writing graphql-java does not -pass in a `Locale` per request `ExecutionInput` . A PR exists to fix this and it will be released in v14.0. This -library will then be updated to to take advantage of this. +A `Locale` should be created per graphql execution, and can be passed to `ExecutionInput`. More i18n is being added to graphql-java +and later this library will then be updated to to take advantage of i18n. -In the mean time you can work around this by having the `context`, `source` or `root` implement `graphql.validation.locale.LocaleProvider` and +In the meantime you can work around this by having the `context`, `source` or `root` implement `graphql.validation.locale.LocaleProvider` and the library will extract a `Locale` from that. # Schema Directive Wiring diff --git a/build.gradle b/build.gradle index 8932608..8b971cb 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,12 @@ version = releaseVersion ? releaseVersion : getDevelopmentVersion() println "Building version = " + version group = 'com.graphql-java' +if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + def msg = String.format("This build must be run with java 1.8 - you are running %s - gradle finds the JDK via JAVA_HOME=%s", + JavaVersion.current(), System.getenv("JAVA_HOME")) + throw new GradleException(msg) +} + sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -39,8 +45,8 @@ repositories { dependencies { - api "com.graphql-java:graphql-java:18.1" - api "com.graphql-java:graphql-java-extended-scalars:18.1" + api "com.graphql-java:graphql-java:19.2" + api "com.graphql-java:graphql-java-extended-scalars:19.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.0" From 671a939ac4d77074004e468b75770875b0c7de3b Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:24:11 +1000 Subject: [PATCH 28/65] Update jakarta.el to include patch for CVE-2021-28170 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8b971cb..d6912da 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { api "com.graphql-java:graphql-java:19.2" api "com.graphql-java:graphql-java-extended-scalars:19.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" - api "org.glassfish:jakarta.el:4.0.0" + api "org.glassfish:jakarta.el:4.0.2" testImplementation 'org.slf4j:slf4j-simple:1.7.31' testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' From f76c71907c143791d0070f71d11b178e17a231b7 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:25:12 +1000 Subject: [PATCH 29/65] Update jakarta.el to include patch for CVE-2021-28170 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8b971cb..d6912da 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { api "com.graphql-java:graphql-java:19.2" api "com.graphql-java:graphql-java-extended-scalars:19.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" - api "org.glassfish:jakarta.el:4.0.0" + api "org.glassfish:jakarta.el:4.0.2" testImplementation 'org.slf4j:slf4j-simple:1.7.31' testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' From eb15bfe16bca87866b70a02fcee4552674b06c7f Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 13 Nov 2022 14:18:48 +1100 Subject: [PATCH 30/65] Fix badge to 19.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 610e535..6d32dba 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?version=18.1&color=blue)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?version=19.1&color=blue)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Release - Jakarta EE8](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionSuffix=6.2.0.Final&label=maven-central%20jakarta%20ee8)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) From d0fb9c45b173df62575ceb0e6f5aba9fd5166eca Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 8 Dec 2022 07:59:20 -0500 Subject: [PATCH 31/65] docs: update version to 19.1 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6d32dba..586603b 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 19.0 + 19.1 ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:19.0' +compile 'com.graphql-java:graphql-java-extended-validation:19.1' ``` > Note: From f636623d5db41790702d575a09f6e557b9892b3f Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 18 Dec 2022 13:15:54 +1100 Subject: [PATCH 32/65] Upgrade to graphql-java 20 --- README.md | 18 +++++++----------- build.gradle | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 586603b..f03fd25 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?version=19.1&color=blue)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?version=20.0&color=blue)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Release - Jakarta EE8](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionSuffix=6.2.0.Final&label=maven-central%20jakarta%20ee8)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) @@ -19,27 +19,23 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 19.1 + 20.0 ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:19.1' +compile 'com.graphql-java:graphql-java-extended-validation:20.0' ``` > Note: > -> use 16.0.0 or above for graphql-java 16.x and above +> use 19.1 or above for graphql-java 19.x and above > -> use 17.0 or above for graphql-java 17.x and above +> use 19.1-hibernate-validator-6.2.0.Final for graphql-java 19.x and SpringBoot 2.x support > -> use 17.0-hibernate-validator-6.2.0.Final for graphql-java 17.x and SpringBoot 2.x support +> use 20.0 or above for graphql-java 20.x and above > -> use 18.1 or above for graphql-java 18.x and above -> -> use 18.1-hibernate-validator-6.2.0.Final for graphql-java 18.x and SpringBoot 2.x support -> -> use 19.0 or above for graphql-java 19.x and above +> use 20.0-hibernate-validator-6.2.0.Final for graphql-java 20.x and SpringBoot 2.x support It's currently available from Maven central. diff --git a/build.gradle b/build.gradle index d6912da..5ba7df2 100644 --- a/build.gradle +++ b/build.gradle @@ -45,8 +45,8 @@ repositories { dependencies { - api "com.graphql-java:graphql-java:19.2" - api "com.graphql-java:graphql-java-extended-scalars:19.0" + api "com.graphql-java:graphql-java:20.0" + api "com.graphql-java:graphql-java-extended-scalars:20.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From d0c903227645cab26d28a05d6a2ee023125cbd91 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 18 Dec 2022 13:26:14 +1100 Subject: [PATCH 33/65] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 586603b..39dfc36 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This library provides extended validation of fields and field arguments for [gra ``` ```groovy -compile 'com.graphql-java:graphql-java-extended-validation:19.1' +implementation 'com.graphql-java:graphql-java-extended-validation:19.1' ``` > Note: From 7bbe4e69bfc93ea0baf2215b2bd47a3165139228 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 18 Dec 2022 14:01:49 +1100 Subject: [PATCH 34/65] Upgrade to Java 11 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- build.gradle | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index bc9d5f8..0215b16 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,9 +15,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: '8.0.282' + java-version: '11.0.17' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 13a366a..2829e7d 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -13,9 +13,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: '8.0.282' + java-version: '11.0.17' - name: build and test run: ./gradlew assemble && ./gradlew check --info --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b61d755..9158bea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,9 +19,9 @@ jobs: steps: - uses: actions/checkout@v1 - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: '8.0.282' + java-version: '11.0.17' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/build.gradle b/build.gradle index 5ba7df2..acb39a3 100644 --- a/build.gradle +++ b/build.gradle @@ -29,14 +29,14 @@ version = releaseVersion ? releaseVersion : getDevelopmentVersion() println "Building version = " + version group = 'com.graphql-java' -if (JavaVersion.current() != JavaVersion.VERSION_1_8) { - def msg = String.format("This build must be run with java 1.8 - you are running %s - gradle finds the JDK via JAVA_HOME=%s", +if (JavaVersion.current() != JavaVersion.VERSION_11) { + def msg = String.format("This build must be run with Java 11 - you are running %s - gradle finds the JDK via JAVA_HOME=%s", JavaVersion.current(), System.getenv("JAVA_HOME")) throw new GradleException(msg) } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = JavaVersion.VERSION_11.toString() +targetCompatibility = JavaVersion.VERSION_11.toString() repositories { mavenCentral() From 4ea1731b355107ea74138136a6c0ae634492c30e Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Tue, 7 Mar 2023 14:46:03 +1100 Subject: [PATCH 35/65] Prepend 0.0.0 to master build versions --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index acb39a3..d732651 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ def getDevelopmentVersion() { println "git hash is empty: error: ${error.toString()}" throw new IllegalStateException("git hash could not be determined") } - new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash + "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash } From bcaa29fcba23310b0459014391e9cfb8744776d3 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 21 Aug 2023 15:23:29 +1000 Subject: [PATCH 36/65] Upgrade Gradle to 8.3 --- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 178 +++++++++++------------ 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9 zXZjcT^`bL6qvL}gvXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*! z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV% z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB` z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX zQg*0)$G3%Es$otA@p_1N!hIPT(iSE=8OPZG+t)oFyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5 zbn@3IG5I2mk;8K>*RZ zPV6iL006)S001s%0eYj)9hu1 z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror= z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF zo_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O% zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@ z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2 z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe z(qDM!FX_7;`U3rxX#QHT{f%h;)Eursw=*#qvV)~y%^Uo^% zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~` zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh z@_LmwcFDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3 z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV* ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv} zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6 zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va z%z9Ef6QmfoXAlQ3)PF8#3Y% zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnXr*SGY&xUb>2678A+Y z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5| zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{? z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4 z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0 zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq zaHT($Qy2=MMuj@lir(iyxI1HnMlaJwpX86je}e=2n|Esb6hB?SmtDH3 z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jSLp+LQ7uU(iib%IyB(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E z$Sk-hd$Fs2nL4w9p@O*Y$c;U)W#d~)&8Js;i^Dp^* z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8 zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3 zeBPRTDf3?3mfdI$&WOg(nr9Gyzg`&u^o!f2rKJ57D_>p z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3 zB^5N=* zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{ zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0 z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2 z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A= zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I zdMmhAJrO%@0f%YW! z^gLByEGSk+R0v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s- z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5 zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g zXJ`-N?D-n~5_QNF_5+Un-4&l$1b zVlHFqtluoN85b^C{A==lp#hS9J(npJ#6P4aY41r) zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8 z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9 zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oGzo z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9 z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AWv2WJ zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d zud3LNuL;cR*xS+;X+N^Br+x2{&hDMhb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0 zZVkM*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?| zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JCqVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc zJx&MB$me(a*@lLLWZ=>PhKs!}#!ICa0! zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK z++G*8j)K=$#57N)hj_gSA8golO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9 z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y zfvOC)-HYjNfcpi`=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O* zitR+Np{QZ(D2~p_Jh-k|dL!LPmexLM?tEqI^qRDq9Mg z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB% zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M} z!e`jbUR3AG4XvnBVcyIZht6Vi~?pCC!$XF2 z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC% zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^ zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn zgLD^{X0A+{ySY+&7RpldwpC6=E zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#QN9Ry zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU8|9RXvu`-ECS`jcO1x1MP{P zcr;Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM? zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2 z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5- zE1FX=ru?X=zAk4_6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd>UZ1 zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+( z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d? zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg zyUjM+Y*!$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq25_L&oSl}DOMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1 zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt z(kzx{$*>g5L<;u}HzS4XD%ml zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n z{3+hA^QZYnjXxtF2XwxPZ`S#J8h>5qLwtwM-{5abbEnRS z`9_`Zq8FJiI#0syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv zw}1bq~AD0_Xerm`%ryiG9_$S z5G|btfiAUNdV09SO2l9v+e#(H6HYOdQs=^ z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>rpUzKBxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z zvzEdIc2|HA2RFN_4#EkzMqKnbbw!?!?%B@M0^^5Z;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8 z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E z&1oTd%!Qbw$W58s!6ms>F z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH8kSkk$>!f0;FM zX_t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax z9(|As$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z zKSC4A%8!s%R&j*2si(OEc*fy!q)?%=TjDZJ2}O zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VTZ5J| zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$ zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X} zP!~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7& zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)( zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{8wd_!Y#~tMJ7yk!F8| zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8CH< zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+bB->oH3#t(AY3 zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+ zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$ zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpWfu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{ z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~ zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil z(nOv_nlZB^c4s&&O3h=OLiCz&(|f0 zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov zVi;eNa1>t-<14KERUW>^KwoF+8zNo`Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml& zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51 zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l` zW^bjkyZTJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+DgzNe6d)1q zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8 ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#| z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%TrgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5GcXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY zzr%8JJ5BdcEYsR9eGzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~-- z`63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X zdYtQ?-K5xDAdfomEd6(yPtZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W& zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT( zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(> z(=5Bg?EWq-ldEywgzXW965%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oTiMzzlx8KnHqUi z8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8 z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?` zW(>$oktzY@GO{|Ln~Bt^A4)(%?l-&(Dm!iL#$K_xOyhwAf=K2<+Bom zw7|hl6E5}B$d%n0sfZvfQRy9Fyz2~ z83#=#LaHnf1th^k*p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{ zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@ X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..db9a6b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..744e882 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/gradlew.bat b/gradlew.bat index 107acd3..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 868bf164f93df1e8d8e3e814fe5e9b979fc86951 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 21 Aug 2023 15:23:45 +1000 Subject: [PATCH 37/65] Update GitHub actions --- .github/workflows/master.yml | 7 ++++--- .github/workflows/pull_request.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0215b16..d80d5ef 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -13,11 +13,12 @@ jobs: MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: '11.0.17' + java-version: '11' + distribution: 'corretto' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2829e7d..48c7e45 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -11,11 +11,12 @@ jobs: buildAndTest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: '11.0.17' + java-version: '11' + distribution: 'corretto' - name: build and test run: ./gradlew assemble && ./gradlew check --info --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9158bea..6de60e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,11 +17,12 @@ jobs: RELEASE_VERSION: ${{ github.event.inputs.version }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: '11.0.17' + java-version: '11' + distribution: 'corretto' - name: build test and publish run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace From 720bd16056e59d0ff4ab69ccd72114cd7763b202 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 21 Aug 2023 15:24:14 +1000 Subject: [PATCH 38/65] Update to GraphQL Java v21.0 and add Java toolchain --- build.gradle | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index d732651..3584595 100644 --- a/build.gradle +++ b/build.gradle @@ -23,29 +23,25 @@ def getDevelopmentVersion() { "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash } - def releaseVersion = System.env.RELEASE_VERSION version = releaseVersion ? releaseVersion : getDevelopmentVersion() println "Building version = " + version group = 'com.graphql-java' -if (JavaVersion.current() != JavaVersion.VERSION_11) { - def msg = String.format("This build must be run with Java 11 - you are running %s - gradle finds the JDK via JAVA_HOME=%s", - JavaVersion.current(), System.getenv("JAVA_HOME")) - throw new GradleException(msg) +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } } -sourceCompatibility = JavaVersion.VERSION_11.toString() -targetCompatibility = JavaVersion.VERSION_11.toString() - repositories { mavenCentral() mavenLocal() } - dependencies { - api "com.graphql-java:graphql-java:20.0" + api "com.graphql-java:graphql-java:21.0" + // todo: upgrade to 21.0 api "com.graphql-java:graphql-java-extended-scalars:20.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" @@ -91,7 +87,7 @@ publishing { asNode().children().last() + { resolveStrategy = Closure.DELEGATE_FIRST name 'graphql-java-extended-validation' - description 'A library fo extended validation for graphql-java' + description 'A library of extended validation for graphql-java' url 'https://github.com/graphql-java/graphql-java-extended-validation' inceptionYear '2019' @@ -137,9 +133,7 @@ signing { sign publishing.publications } - // all publish tasks depend on the build task tasks.withType(PublishToMavenRepository) { dependsOn build } - From 7ec4ffdb2abde5ae639c1a93045586638627e417 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 21 Aug 2023 15:28:11 +1000 Subject: [PATCH 39/65] Update extended scalars to v21 --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3584595..da5f461 100644 --- a/build.gradle +++ b/build.gradle @@ -41,8 +41,7 @@ repositories { dependencies { api "com.graphql-java:graphql-java:21.0" - // todo: upgrade to 21.0 - api "com.graphql-java:graphql-java-extended-scalars:20.0" + api "com.graphql-java:graphql-java-extended-scalars:21.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From 34df7d315d66029c91be125dc2f10a58995fab61 Mon Sep 17 00:00:00 2001 From: mushipeas <8151412+mushipeas@users.noreply.github.com> Date: Thu, 24 Aug 2023 04:20:26 +0100 Subject: [PATCH 40/65] Retain trivial DataFetcher marker when original DataFetcher was trivial (#88) Create a TrivialFieldValidatorDataFetcher which implements TrivialDataFetcher instead of a standard FieldValidatorDataFetcher if the original dataFetcher was an instance of TrivialDataFetcher. --- .../TrivialFieldValidatorDataFetcher.java | 15 +++++++++++++++ .../schemawiring/ValidationSchemaWiring.java | 12 +++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/main/java/graphql/validation/schemawiring/TrivialFieldValidatorDataFetcher.java diff --git a/src/main/java/graphql/validation/schemawiring/TrivialFieldValidatorDataFetcher.java b/src/main/java/graphql/validation/schemawiring/TrivialFieldValidatorDataFetcher.java new file mode 100644 index 0000000..1a6a98c --- /dev/null +++ b/src/main/java/graphql/validation/schemawiring/TrivialFieldValidatorDataFetcher.java @@ -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 { + public TrivialFieldValidatorDataFetcher(OnValidationErrorStrategy errorStrategy, MessageInterpolator messageInterpolator, DataFetcher defaultDataFetcher, Locale defaultLocale, ValidationRules validationRules) { + super(errorStrategy, messageInterpolator, defaultDataFetcher, defaultLocale, validationRules); + } +} diff --git a/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java b/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java index 36cf6ba..30867b9 100644 --- a/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java +++ b/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java @@ -1,6 +1,7 @@ package graphql.validation.schemawiring; import graphql.PublicApi; +import graphql.TrivialDataFetcher; import graphql.schema.DataFetcher; import graphql.schema.GraphQLFieldDefinition; import graphql.schema.GraphQLFieldsContainer; @@ -8,7 +9,6 @@ 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; @@ -51,6 +51,16 @@ private DataFetcher 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, From 6f77b8082a7930eb2ea92b75254c6c36a3e57b44 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Thu, 24 Aug 2023 16:25:57 +1000 Subject: [PATCH 41/65] Added graphql context to ValidationEnvironment --- .../validation/rules/ValidationEnvironment.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/graphql/validation/rules/ValidationEnvironment.java b/src/main/java/graphql/validation/rules/ValidationEnvironment.java index 903b5bb..ae3c4b1 100644 --- a/src/main/java/graphql/validation/rules/ValidationEnvironment.java +++ b/src/main/java/graphql/validation/rules/ValidationEnvironment.java @@ -1,5 +1,6 @@ package graphql.validation.rules; +import graphql.GraphQLContext; import graphql.PublicApi; import graphql.execution.ResultPath; import graphql.language.SourceLocation; @@ -55,6 +56,8 @@ public enum ValidatedElement { private final Object validatedValue; private final GraphQLInputType validatedType; private final ValidatedElement validatedElement; + + private final GraphQLContext graphQLContext; private final List directives; private ValidationEnvironment(Builder builder) { @@ -71,6 +74,7 @@ private ValidationEnvironment(Builder builder) { this.location = builder.location; this.validatedValue = builder.validatedValue; this.validatedElement = builder.validatedElement; + this.graphQLContext = builder.graphQLContext; this.directives = builder.directives; } @@ -135,6 +139,10 @@ public List getDirectives() { return directives; } + public GraphQLContext getGraphQLContext() { + return graphQLContext; + } + public ValidationEnvironment transform(Consumer builderConsumer) { Builder builder = newValidationEnvironment().validationEnvironment(this); builderConsumer.accept(builder); @@ -156,6 +164,7 @@ public static class Builder { private GraphQLInputType validatedType; private ValidatedElement validatedElement; private List directives = Collections.emptyList(); + private GraphQLContext graphQLContext = GraphQLContext.getDefault(); public Builder validationEnvironment(ValidationEnvironment validationEnvironment) { this.argument = validationEnvironment.argument; @@ -172,6 +181,7 @@ public Builder validationEnvironment(ValidationEnvironment validationEnvironment this.validatedValue = validationEnvironment.validatedValue; this.validatedElement = validationEnvironment.validatedElement; this.directives = validationEnvironment.directives; + this.graphQLContext = validationEnvironment.graphQLContext; return this; } @@ -184,6 +194,7 @@ public Builder dataFetchingEnvironment(DataFetchingEnvironment dataFetchingEnvir location(dataFetchingEnvironment.getField().getSourceLocation()); argumentValues(dataFetchingEnvironment.getArguments()); validatedElement(ValidatedElement.FIELD); + graphQLContext(dataFetchingEnvironment.getGraphQlContext()); return this; } @@ -252,6 +263,11 @@ public Builder locale(Locale locale) { return this; } + public Builder graphQLContext(GraphQLContext graphQLContext) { + this.graphQLContext = graphQLContext; + return this; + } + public Builder directives(List directives) { this.directives = directives; return this; From e1bcdaa48da42e7e88a5250d1d687e127966ad8c Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Thu, 24 Aug 2023 17:27:24 +1000 Subject: [PATCH 42/65] Locale is now in DFE --- .../graphql/validation/locale/LocaleUtil.java | 17 +++++---- .../validation/locale/LocaleUtilTest.groovy | 35 +++++++++++++++++-- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/main/java/graphql/validation/locale/LocaleUtil.java b/src/main/java/graphql/validation/locale/LocaleUtil.java index 13fffdb..718da5b 100644 --- a/src/main/java/graphql/validation/locale/LocaleUtil.java +++ b/src/main/java/graphql/validation/locale/LocaleUtil.java @@ -23,17 +23,20 @@ public class LocaleUtil { */ public static Locale determineLocale(DataFetchingEnvironment environment, Locale defaultLocale) { // - // in a future version of graphql java the DFE will have the Locale but in the mean time - Locale locale; - locale = extractLocale(environment); + // The DFE has a locale now, but we retain the old look-ups for backwards compat reasons + // + Locale locale = environment.getLocale(); if (locale == null) { - locale = extractLocale(environment.getContext()); + locale = extractLocale(environment); if (locale == null) { - locale = extractLocale(environment.getSource()); + locale = extractLocale(environment.getContext()); if (locale == null) { - locale = extractLocale(environment.getRoot()); + locale = extractLocale(environment.getSource()); if (locale == null) { - locale = defaultLocale; + locale = extractLocale(environment.getRoot()); + if (locale == null) { + locale = defaultLocale; + } } } } diff --git a/src/test/groovy/graphql/validation/locale/LocaleUtilTest.groovy b/src/test/groovy/graphql/validation/locale/LocaleUtilTest.groovy index b01b5eb..cda044b 100644 --- a/src/test/groovy/graphql/validation/locale/LocaleUtilTest.groovy +++ b/src/test/groovy/graphql/validation/locale/LocaleUtilTest.groovy @@ -1,7 +1,7 @@ package graphql.validation.locale +import graphql.GraphQLContext import graphql.GraphQLError -import graphql.GraphqlErrorBuilder import graphql.execution.ExecutionStepInfo import graphql.execution.MergedField import graphql.schema.DataFetchingEnvironment @@ -18,6 +18,8 @@ import graphql.validation.rules.ValidationEnvironment import graphql.validation.rules.ValidationRule import spock.lang.Specification +import static graphql.GraphqlErrorBuilder.newError + class LocaleUtilTest extends Specification { def directiveRules = DirectiveConstraints.newDirectiveConstraints().build() @@ -99,7 +101,10 @@ class LocaleUtilTest extends Specification { @Override List runValidation(ValidationEnvironment validationEnvironment) { - return [GraphqlErrorBuilder.newError().message("Locale=" + validationEnvironment.getLocale().getCountry()).build()] + return [ + newError().message("Locale=" + validationEnvironment.getLocale().getCountry()).build(), + newError().message("Context=" + (validationEnvironment.getGraphQLContext() != null)).build() + ] } } @@ -176,5 +181,31 @@ class LocaleUtilTest extends Specification { errors = targetedValidationRules.runValidationRules(dfe, new ResourceBundleMessageInterpolator(), Locale.CHINA) then: errors[0].message == "Locale=GB" + + // use DFE direct + when: + + dfe = DataFetchingEnvironmentImpl.newDataFetchingEnvironment(dfe) + .locale(Locale.UK) + .build() + + errors = targetedValidationRules.runValidationRules(dfe, new ResourceBundleMessageInterpolator(), Locale.CHINA) + then: + errors[0].message == "Locale=GB" + errors[1].message == "Context=false" + + // sneaking in a test that graphql context gets picked up here + // cheeky I know but the setup of a clean test in the exact right place is not worth it + when: + + dfe = DataFetchingEnvironmentImpl.newDataFetchingEnvironment(dfe) + .locale(Locale.UK) + .graphQLContext(GraphQLContext.of([x: "present"])) + .build() + + errors = targetedValidationRules.runValidationRules(dfe, new ResourceBundleMessageInterpolator(), Locale.CHINA) + then: + errors[0].message == "Locale=GB" + errors[1].message == "Context=true" } } From d04517c6a0ef034b0698557eb1dd6213ad7def86 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Thu, 24 Aug 2023 17:46:05 +1000 Subject: [PATCH 43/65] Locale is now in DFE - no need for reflection --- .../java/graphql/validation/locale/LocaleUtil.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/graphql/validation/locale/LocaleUtil.java b/src/main/java/graphql/validation/locale/LocaleUtil.java index 718da5b..11eabcd 100644 --- a/src/main/java/graphql/validation/locale/LocaleUtil.java +++ b/src/main/java/graphql/validation/locale/LocaleUtil.java @@ -27,16 +27,13 @@ public static Locale determineLocale(DataFetchingEnvironment environment, Locale // Locale locale = environment.getLocale(); if (locale == null) { - locale = extractLocale(environment); + locale = extractLocale(environment.getContext()); if (locale == null) { - locale = extractLocale(environment.getContext()); + locale = extractLocale(environment.getSource()); if (locale == null) { - locale = extractLocale(environment.getSource()); + locale = extractLocale(environment.getRoot()); if (locale == null) { - locale = extractLocale(environment.getRoot()); - if (locale == null) { - locale = defaultLocale; - } + locale = defaultLocale; } } } From 3ab5b291516c93bf146fe1285378866ac9fe803f Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Fri, 25 Aug 2023 13:34:05 +1000 Subject: [PATCH 44/65] Update readme for v21 --- README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index cbe7c3d..05e87cc 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,8 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?version=20.0&color=blue)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) -[![Latest Release - Jakarta EE8](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionSuffix=6.2.0.Final&label=maven-central%20jakarta%20ee8)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) -[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?versionPrefix=21.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot&versionPrefix=0.0.0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) @@ -19,25 +18,27 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 20.0 + 21.0 ``` ```groovy -implementation 'com.graphql-java:graphql-java-extended-validation:20.0' +implementation 'com.graphql-java:graphql-java-extended-validation:21.0' ``` > Note: +> +> use 21.0 or above for graphql-java 21.x and above +> +> use 20.0 for graphql-java 20.x and above +> +> use 20.0-hibernate-validator-6.2.0.Final for graphql-java 20.x and SpringBoot 2.x support > -> use 19.1 or above for graphql-java 19.x and above +> use 19.1 for graphql-java 19.x and above > > use 19.1-hibernate-validator-6.2.0.Final for graphql-java 19.x and SpringBoot 2.x support -> -> use 20.0 or above for graphql-java 20.x and above -> -> use 20.0-hibernate-validator-6.2.0.Final for graphql-java 20.x and SpringBoot 2.x support -It's currently available from Maven central. +The library is currently available on Maven Central. # SDL @Directive constraints From c22f5ec5933fa923b403916001f53a6589d63aa2 Mon Sep 17 00:00:00 2001 From: lgemela <136724403+lgemela@users.noreply.github.com> Date: Thu, 19 Oct 2023 03:02:16 +0200 Subject: [PATCH 45/65] make fraction part in DigitsConstraint optional (#92) * make fragment part in DigitsConstraint optional * make fragment part in DigitsConstraint optional * fix tests * update docu to make fraction optional --- README.md | 2 +- .../AbstractDirectiveConstraint.java | 26 ++++++----- .../standard/DigitsConstraint.java | 43 ++++++++++++------- .../standard/DigitsConstraintTest.groovy | 1 + 4 files changed, 46 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 05e87cc..5dddf16 100644 --- a/README.md +++ b/README.md @@ -313,7 +313,7 @@ The element must be a number inside the specified `integer` and `fraction` range - Applies to : `String`, `Byte`, `Short`, `Int`, `Long`, `BigDecimal`, `BigInteger`, `Float`, `Lists` -- SDL : `directive @Digits(integer : Int!, fraction : Int!, message : String = "graphql.validation.Digits.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` +- SDL : `directive @Digits(integer : Int!, fraction : Int, message : String = "graphql.validation.Digits.message") on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION` - Message : `graphql.validation.Digits.message` diff --git a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java index ddb7a7f..3cfd0e9 100644 --- a/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java +++ b/src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java @@ -27,6 +27,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import static graphql.schema.GraphQLTypeUtil.isList; import static graphql.validation.rules.ValidationEnvironment.ValidatedElement.FIELD; @@ -198,23 +199,28 @@ protected boolean isOneOfTheseTypes(GraphQLInputType inputType, Collection assertExpectedArgType(argName, "Int")); + } - Number value = argument.getValue(); - if (value == null) { - return assertExpectedArgType(argName, "Int"); - } - return value.intValue(); + /** + * Returns an optional integer argument from a directive (or its default), or empty Optional if the argument is null. + * + * @param directive the directive to check + * @param argName the argument name + * @return an optional null value + */ + protected Optional getIntArgOpt(GraphQLAppliedDirective directive, String argName) { + return Optional.ofNullable(directive.getArgument(argName)) + .map(GraphQLAppliedDirectiveArgument::getValue) + .map(Number::intValue); } /** diff --git a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java index fe94bbd..a8f963e 100644 --- a/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java +++ b/src/main/java/graphql/validation/constraints/standard/DigitsConstraint.java @@ -10,6 +10,7 @@ import java.math.BigDecimal; import java.util.Collections; import java.util.List; +import java.util.Optional; import static graphql.validation.constraints.GraphQLScalars.GRAPHQL_NUMBER_AND_STRING_TYPES; @@ -21,14 +22,14 @@ public DigitsConstraint() { @Override public Documentation getDocumentation() { return Documentation.newDocumentation() - .messageTemplate(getMessageTemplate()) - .description("The element must be a number inside the specified `integer` and `fraction` range.") - .example("buyCar( carCost : Float @Digits(integer : 5, fraction : 2) : DriverDetails") - .applicableTypes(GRAPHQL_NUMBER_AND_STRING_TYPES) - .directiveSDL("directive @Digits(integer : Int!, fraction : Int!, message : String = \"%s\") " + - "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", - getMessageTemplate()) - .build(); + .messageTemplate(getMessageTemplate()) + .description("The element must be a number inside the specified `integer` and optionally inside `fraction` range.") + .example("buyCar( carCost : Float @Digits(integer : 5, fraction : 2) : DriverDetails") + .applicableTypes(GRAPHQL_NUMBER_AND_STRING_TYPES) + .directiveSDL("directive @Digits(integer : Int!, fraction : Int, message : String = \"%s\") " + + "on ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION", + getMessageTemplate()) + .build(); } @Override @@ -43,28 +44,40 @@ protected List runConstraint(ValidationEnvironment validationEnvir GraphQLAppliedDirective directive = validationEnvironment.getContextObject(GraphQLAppliedDirective.class); int maxIntegerLength = getIntArg(directive, "integer"); - int maxFractionLength = getIntArg(directive, "fraction"); + Optional maxFractionLengthOpt = getIntArgOpt(directive, "fraction"); boolean isOk; try { BigDecimal bigNum = asBigDecimal(validatedValue); - isOk = isOk(bigNum, maxIntegerLength, maxFractionLength); + boolean isFractionPartOk = maxFractionLengthOpt + .map(maxFractionLength -> isFractionPartOk(bigNum, maxFractionLength)) + .orElse(true); + + isOk = isFractionPartOk && isIntegerPartOk(bigNum, maxIntegerLength); } catch (NumberFormatException e) { isOk = false; } if (!isOk) { - return mkError(validationEnvironment, "integer", maxIntegerLength, "fraction", maxFractionLength); + return mkError( + validationEnvironment, + "integer", + maxIntegerLength, "fraction", + maxFractionLengthOpt.map(Object::toString).orElse("unlimited") + ); } return Collections.emptyList(); } - private boolean isOk(BigDecimal bigNum, int maxIntegerLength, int maxFractionLength) { - int integerPartLength = bigNum.precision() - bigNum.scale(); - int fractionPartLength = Math.max(bigNum.scale(), 0); + private static boolean isIntegerPartOk(BigDecimal bigNum, int maxIntegerLength) { + final int integerPartLength = bigNum.precision() - bigNum.scale(); + return maxIntegerLength >= integerPartLength; + } - return maxIntegerLength >= integerPartLength && maxFractionLength >= fractionPartLength; + private static boolean isFractionPartOk(BigDecimal bigNum, int maxFractionLength) { + final int fractionPartLength = Math.max(bigNum.scale(), 0); + return maxFractionLength >= fractionPartLength; } @Override diff --git a/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy b/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy index 772ec36..701746c 100644 --- a/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy +++ b/src/test/groovy/graphql/validation/constraints/standard/DigitsConstraintTest.groovy @@ -23,6 +23,7 @@ class DigitsConstraintTest extends BaseConstraintTestSupport { 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | null | '' 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Byte.valueOf("0") | '' 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | Double.valueOf("500.2") | '' + 'field( arg : String @Digits(integer : 5) ) : ID' | Double.valueOf("500.2345678") | '' 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-12345.12") | '' 'field( arg : String @Digits(integer : 5, fraction : 2) ) : ID' | new BigDecimal("-123456.12") | 'Digits;path=/arg;val:-123456.12;\t' From 9d3c73d14363d26222637d55aa805e3410514998 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Mon, 8 Apr 2024 09:30:44 +1000 Subject: [PATCH 46/65] Adding v22 to the mix --- README.md | 4 +++- build.gradle | 2 +- .../schemawiring/ValidationSchemaWiring.java | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5dddf16..ade1d41 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,13 @@ This library provides extended validation of fields and field arguments for [gra ``` ```groovy -implementation 'com.graphql-java:graphql-java-extended-validation:21.0' +implementation 'com.graphql-java:graphql-java-extended-validation:22.0' ``` > Note: > +> use 22.0 or above for graphql-java 22.x and above +> > use 21.0 or above for graphql-java 21.x and above > > use 20.0 for graphql-java 20.x and above diff --git a/build.gradle b/build.gradle index da5f461..4fe28f1 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - api "com.graphql-java:graphql-java:21.0" + api "com.graphql-java:graphql-java:22.0-rc1" api "com.graphql-java:graphql-java-extended-scalars:21.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" diff --git a/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java b/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java index 30867b9..65d0a23 100644 --- a/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java +++ b/src/main/java/graphql/validation/schemawiring/ValidationSchemaWiring.java @@ -5,10 +5,12 @@ import graphql.schema.DataFetcher; import graphql.schema.GraphQLFieldDefinition; import graphql.schema.GraphQLFieldsContainer; +import graphql.schema.GraphQLObjectType; 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; @@ -34,15 +36,23 @@ public ValidationSchemaWiring(ValidationRules ruleCandidates) { public GraphQLFieldDefinition onField(SchemaDirectiveWiringEnvironment env) { GraphQLFieldsContainer fieldsContainer = env.getFieldsContainer(); GraphQLFieldDefinition fieldDefinition = env.getFieldDefinition(); - + TargetedValidationRules rules = ruleCandidates.buildRulesFor(fieldDefinition, fieldsContainer); + if (rules.isEmpty()) { + return fieldDefinition; + } + if (! (fieldsContainer instanceof GraphQLObjectType)) { + // only object type fields can have data fetchers + return fieldDefinition; + } + GraphQLObjectType graphQLObjectType = (GraphQLObjectType) fieldsContainer; OnValidationErrorStrategy errorStrategy = ruleCandidates.getOnValidationErrorStrategy(); MessageInterpolator messageInterpolator = ruleCandidates.getMessageInterpolator(); Locale locale = ruleCandidates.getLocale(); - final DataFetcher currentDF = env.getCodeRegistry().getDataFetcher(fieldsContainer, fieldDefinition); + final DataFetcher currentDF = env.getCodeRegistry().getDataFetcher(graphQLObjectType, fieldDefinition); final DataFetcher newDF = buildValidatingDataFetcher(errorStrategy, messageInterpolator, currentDF, locale); - env.getCodeRegistry().dataFetcher(fieldsContainer, fieldDefinition, newDF); + env.getCodeRegistry().dataFetcher(graphQLObjectType, fieldDefinition, newDF); return fieldDefinition; } From 9439062a0ad0d4dca5f4a1e5fae99e62301cbbfb Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:35:39 +1000 Subject: [PATCH 47/65] Update to v22.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4fe28f1..2169b15 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - api "com.graphql-java:graphql-java:22.0-rc1" + api "com.graphql-java:graphql-java:22.0" api "com.graphql-java:graphql-java-extended-scalars:21.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From 6ede11385abe080da7c4f03f53cb8c7b5e2e8636 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:42:25 +1000 Subject: [PATCH 48/65] Pull in v22 scalars and update readme --- README.md | 8 ++------ build.gradle | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ade1d41..35aa365 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?versionPrefix=21.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?versionPrefix=22.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot&versionPrefix=0.0.0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) @@ -18,7 +18,7 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 21.0 + 22.0 ``` @@ -35,10 +35,6 @@ implementation 'com.graphql-java:graphql-java-extended-validation:22.0' > use 20.0 for graphql-java 20.x and above > > use 20.0-hibernate-validator-6.2.0.Final for graphql-java 20.x and SpringBoot 2.x support -> -> use 19.1 for graphql-java 19.x and above -> -> use 19.1-hibernate-validator-6.2.0.Final for graphql-java 19.x and SpringBoot 2.x support The library is currently available on Maven Central. diff --git a/build.gradle b/build.gradle index 2169b15..86d43e5 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { dependencies { api "com.graphql-java:graphql-java:22.0" - api "com.graphql-java:graphql-java-extended-scalars:21.0" + api "com.graphql-java:graphql-java-extended-scalars:22.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From 57b6773ab29d7e172010060227e37315adddf830 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Wed, 18 Jun 2025 14:50:36 +1000 Subject: [PATCH 49/65] Updated to new Sonatype URLs (#104) --- .github/workflows/master.yml | 2 ++ .github/workflows/release.yml | 2 ++ build.gradle | 9 ++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d80d5ef..4fe962e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,6 +10,8 @@ jobs: env: MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }} MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + MAVEN_CENTRAL_USER_NEW: ${{ secrets.MAVEN_CENTRAL_USER_NEW }} + MAVEN_CENTRAL_PASSWORD_NEW: ${{ secrets.MAVEN_CENTRAL_PASSWORD_NEW }} MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6de60e8..ebbdd70 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,8 @@ jobs: MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }} MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + MAVEN_CENTRAL_USER_NEW: ${{ secrets.MAVEN_CENTRAL_USER_NEW }} + MAVEN_CENTRAL_PASSWORD_NEW: ${{ secrets.MAVEN_CENTRAL_PASSWORD_NEW }} RELEASE_VERSION: ${{ github.event.inputs.version }} steps: diff --git a/build.gradle b/build.gradle index 86d43e5..5d53276 100644 --- a/build.gradle +++ b/build.gradle @@ -120,9 +120,12 @@ publishing { nexusPublishing { repositories { sonatype { - username = System.env.MAVEN_CENTRAL_USER - password = System.env.MAVEN_CENTRAL_PASSWORD - } + username = System.env.MAVEN_CENTRAL_USER_NEW + password = System.env.MAVEN_CENTRAL_PASSWORD_NEW + // https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#configuration + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + // GraphQL Java does not publish snapshots, but adding this URL for completeness + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) } } } From 81b31757d83192be1893630fe2ebd13d9c04843c Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sat, 21 Jun 2025 12:26:39 +1000 Subject: [PATCH 50/65] Update GitHub actions to reduce CI flakes --- .github/workflows/master.yml | 6 +++--- .github/workflows/pull_request.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4fe962e..7e28332 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,10 +15,10 @@ jobs: MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 48c7e45..d640744 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -11,10 +11,10 @@ jobs: buildAndTest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ebbdd70..f6bf4aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,10 +19,10 @@ jobs: RELEASE_VERSION: ${{ github.event.inputs.version }} steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' From 7c8b5e2bf7db89227d2032e61093cd0041e19ac6 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sat, 21 Jun 2025 21:22:59 +1000 Subject: [PATCH 51/65] Update actions name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6bf4aa..dd2ca38 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v4 + - uses: gradle/actions/wrapper-validation@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 with: From 0da9e57bde63ed5a0a2f22b09de081ca9404cd30 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sat, 21 Jun 2025 21:29:08 +1000 Subject: [PATCH 52/65] Update more actions --- .github/workflows/master.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7e28332..52024ea 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v4 + - uses: gradle/actions/wrapper-validation@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d640744..f9579b0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v4 + - uses: gradle/actions/wrapper-validation@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 with: From f17a4fb006ddc3872579dfa7213f3c02ca737a8e Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 22 Jun 2025 10:17:17 +1000 Subject: [PATCH 53/65] Add dependabot --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..10ef831 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From f8c1e76dff09c278dde47928aa6ffca5f9d8c86a Mon Sep 17 00:00:00 2001 From: Josie Atkins <20967788+josie-atkins@users.noreply.github.com> Date: Mon, 7 Jul 2025 20:12:23 +1200 Subject: [PATCH 54/65] Update to graphql-java 24 (#112) --- build.gradle | 2 +- src/main/java/graphql/validation/rules/ValidationRules.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5d53276..99b6cbf 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - api "com.graphql-java:graphql-java:22.0" + api "com.graphql-java:graphql-java:24.0" api "com.graphql-java:graphql-java-extended-scalars:22.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" diff --git a/src/main/java/graphql/validation/rules/ValidationRules.java b/src/main/java/graphql/validation/rules/ValidationRules.java index a7fdc43..b23f9fe 100644 --- a/src/main/java/graphql/validation/rules/ValidationRules.java +++ b/src/main/java/graphql/validation/rules/ValidationRules.java @@ -97,7 +97,7 @@ public List getRulesFor(GraphQLFieldDefinition fieldDefinition, * @return a list of zero or more input data validation errors */ public List runValidationRules(DataFetchingEnvironment env) { - GraphQLFieldsContainer fieldsContainer = env.getExecutionStepInfo().getFieldContainer(); + GraphQLFieldsContainer fieldsContainer = env.getExecutionStepInfo().getObjectType(); GraphQLFieldDefinition fieldDefinition = env.getFieldDefinition(); MessageInterpolator messageInterpolator = this.getMessageInterpolator(); From 60cc2bfa91b3981bbf988301b5350024816d469b Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Mon, 7 Jul 2025 18:18:20 +1000 Subject: [PATCH 55/65] Updated to 24.1 of graphql-java ready for a release (#113) --- README.md | 8 +++++--- build.gradle | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 35aa365..f6556ae 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?versionPrefix=22.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?versionPrefix=24.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot&versionPrefix=0.0.0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) @@ -18,16 +18,18 @@ This library provides extended validation of fields and field arguments for [gra com.graphql-java graphql-java-extended-validation - 22.0 + 24.0 ``` ```groovy -implementation 'com.graphql-java:graphql-java-extended-validation:22.0' +implementation 'com.graphql-java:graphql-java-extended-validation:24.0' ``` > Note: > +> use 24.0 or above for graphql-java 24.x and above +> > use 22.0 or above for graphql-java 22.x and above > > use 21.0 or above for graphql-java 21.x and above diff --git a/build.gradle b/build.gradle index 99b6cbf..5404683 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - api "com.graphql-java:graphql-java:24.0" + api "com.graphql-java:graphql-java:24.1" api "com.graphql-java:graphql-java-extended-scalars:22.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From a7cf157aefc5b0f56f3cdac6709dd403e3a9931e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 16:56:44 +0000 Subject: [PATCH 56/65] Bump io.github.gradle-nexus.publish-plugin from 1.0.0 to 2.0.0 Bumps io.github.gradle-nexus.publish-plugin from 1.0.0 to 2.0.0. --- updated-dependencies: - dependency-name: io.github.gradle-nexus.publish-plugin dependency-version: 2.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5404683..0a2be21 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'java-library' id 'maven-publish' id 'signing' - id "io.github.gradle-nexus.publish-plugin" version "1.0.0" + id "io.github.gradle-nexus.publish-plugin" version "2.0.0" } def getDevelopmentVersion() { From 2e97b1cc495c45c54fef3af5ae5a721d182f21d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 19:04:51 +0000 Subject: [PATCH 57/65] Bump com.graphql-java:graphql-java from 24.1 to 24.2 Bumps [com.graphql-java:graphql-java](https://github.com/graphql-java/graphql-java) from 24.1 to 24.2. - [Release notes](https://github.com/graphql-java/graphql-java/releases) - [Commits](https://github.com/graphql-java/graphql-java/compare/v24.1...v24.2) --- updated-dependencies: - dependency-name: com.graphql-java:graphql-java dependency-version: '24.2' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0a2be21..f914d7a 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - api "com.graphql-java:graphql-java:24.1" + api "com.graphql-java:graphql-java:24.2" api "com.graphql-java:graphql-java-extended-scalars:22.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From 9a4eb18c17b0a914ab239c3d59eac9183ad8f1c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 20:44:45 +0000 Subject: [PATCH 58/65] Bump com.graphql-java:graphql-java-extended-scalars from 22.0 to 24.0 Bumps [com.graphql-java:graphql-java-extended-scalars](https://github.com/graphql-java/graphql-java-extended-scalars) from 22.0 to 24.0. - [Release notes](https://github.com/graphql-java/graphql-java-extended-scalars/releases) - [Commits](https://github.com/graphql-java/graphql-java-extended-scalars/compare/v22.0...v24.0) --- updated-dependencies: - dependency-name: com.graphql-java:graphql-java-extended-scalars dependency-version: '24.0' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f914d7a..f17def2 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { dependencies { api "com.graphql-java:graphql-java:24.2" - api "com.graphql-java:graphql-java-extended-scalars:22.0" + api "com.graphql-java:graphql-java-extended-scalars:24.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From b5efab24535d9dd439f0350a65be24a0f0ccb005 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 10 Aug 2025 08:53:38 +1000 Subject: [PATCH 59/65] Remove SLF4J remnants --- build.gradle | 1 - src/test/resources/simplelogger.properties | 35 ---------------------- 2 files changed, 36 deletions(-) delete mode 100644 src/test/resources/simplelogger.properties diff --git a/build.gradle b/build.gradle index f17def2..63b14ca 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,6 @@ dependencies { api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" - testImplementation 'org.slf4j:slf4j-simple:1.7.31' testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' testImplementation 'org.codehaus.groovy:groovy-all:2.5.14' } diff --git a/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties deleted file mode 100644 index 21ed7fe..0000000 --- a/src/test/resources/simplelogger.properties +++ /dev/null @@ -1,35 +0,0 @@ -# SLF4J's SimpleLogger configuration file -# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err. - -# Default logging detail level for all instances of SimpleLogger. -# Must be one of ("trace", "debug", "info", "warn", or "error"). -# If not specified, defaults to "info". - -org.slf4j.simpleLogger.defaultLogLevel=info - -# Logging detail level for a SimpleLogger instance named "xxxxx". -# Must be one of ("trace", "debug", "info", "warn", or "error"). -# If not specified, the default logging detail level is used. -org.slf4j.simpleLogger.log.graphql=info - -# Set to true if you want the current date and time to be included in output messages. -# Default is false, and will output the number of milliseconds elapsed since startup. -#org.slf4j.simpleLogger.showDateTime=false - -# The date and time format to be used in the output messages. -# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat. -# If the format is not specified or is invalid, the default format is used. -# The default format is yyyy-MM-dd HH:mm:ss:SSS Z. -#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z - -# Set to true if you want to output the current thread name. -# Defaults to true. -#org.slf4j.simpleLogger.showThreadName=true - -# Set to true if you want the Logger instance name to be included in output messages. -# Defaults to true. -#org.slf4j.simpleLogger.showLogName=true - -# Set to true if you want the last component of the name to be included in output messages. -# Defaults to false. -#org.slf4j.simpleLogger.showShortLogName=false \ No newline at end of file From 144facd554c04ddd57e445f34bab3363fb70f132 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sun, 10 Aug 2025 09:01:00 +1000 Subject: [PATCH 60/65] Fix badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6556ae..1cc532b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-validation/actions/workflows/master.yml) -[![Latest Release](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/badge.svg?versionPrefix=24.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) +[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?versionPrefix=24.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-validation?label=maven-central%20snapshot&versionPrefix=0.0.0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-validation/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-validation/blob/master/LICENSE.md) From bdb81db92e7b0412dc9db1960ae0d72c94fc68a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Aug 2025 06:13:39 +0000 Subject: [PATCH 61/65] Bump org.codehaus.groovy:groovy-all from 2.5.14 to 3.0.25 Bumps [org.codehaus.groovy:groovy-all](https://github.com/apache/groovy) from 2.5.14 to 3.0.25. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy-all dependency-version: 3.0.25 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f17def2..a56d9a2 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ dependencies { testImplementation 'org.slf4j:slf4j-simple:1.7.31' testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' - testImplementation 'org.codehaus.groovy:groovy-all:2.5.14' + testImplementation 'org.codehaus.groovy:groovy-all:3.0.25' } task sourcesJar(type: Jar, dependsOn: classes) { From f078642ef9e58af189f9247ea73c64e5a33afcc8 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Sat, 16 Aug 2025 07:58:45 +1000 Subject: [PATCH 62/65] Add compatible Spock version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a56d9a2..0c3e49f 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { api "org.glassfish:jakarta.el:4.0.2" testImplementation 'org.slf4j:slf4j-simple:1.7.31' - testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' + testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0' testImplementation 'org.codehaus.groovy:groovy-all:3.0.25' } From 0ac2e9efd2a4e7832caf523a3704a81986579695 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 22:16:29 +0000 Subject: [PATCH 63/65] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/master.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 52024ea..d7d199f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,7 +15,7 @@ jobs: MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f9579b0..b3ce092 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -11,7 +11,7 @@ jobs: buildAndTest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd2ca38..9466050 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: RELEASE_VERSION: ${{ github.event.inputs.version }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: gradle/actions/wrapper-validation@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 From 6d5fa41ca3209f18e748f3138659d420bef3df87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 20:03:11 +0000 Subject: [PATCH 64/65] Bump com.graphql-java:graphql-java from 24.2 to 24.3 Bumps [com.graphql-java:graphql-java](https://github.com/graphql-java/graphql-java) from 24.2 to 24.3. - [Release notes](https://github.com/graphql-java/graphql-java/releases) - [Commits](https://github.com/graphql-java/graphql-java/compare/v24.2...v24.3) --- updated-dependencies: - dependency-name: com.graphql-java:graphql-java dependency-version: '24.3' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e6c3fb2..d1d94fb 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ repositories { } dependencies { - api "com.graphql-java:graphql-java:24.2" + api "com.graphql-java:graphql-java:24.3" api "com.graphql-java:graphql-java-extended-scalars:24.0" api "org.hibernate.validator:hibernate-validator:7.0.1.Final" api "org.glassfish:jakarta.el:4.0.2" From 4724fd802e7a7449734e79c237399aad6de92e1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 14:57:16 +0000 Subject: [PATCH 65/65] Bump gradle/actions from 4 to 5 Bumps [gradle/actions](https://github.com/gradle/actions) from 4 to 5. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/v4...v5) --- updated-dependencies: - dependency-name: gradle/actions dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/master.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d7d199f..9c8d3b9 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v5 - - uses: gradle/actions/wrapper-validation@v4 + - uses: gradle/actions/wrapper-validation@v5 - name: Set up JDK 11 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index b3ce092..a841559 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - - uses: gradle/actions/wrapper-validation@v4 + - uses: gradle/actions/wrapper-validation@v5 - name: Set up JDK 11 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9466050..43f0035 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v5 - - uses: gradle/actions/wrapper-validation@v4 + - uses: gradle/actions/wrapper-validation@v5 - name: Set up JDK 11 uses: actions/setup-java@v4 with: