Skip to content

Commit 6f3b293

Browse files
authored
build(*): Upgrade project dependencies (#14)
fix issue with GraphQL Java 14
1 parent bef87f7 commit 6f3b293

File tree

7 files changed

+24
-25
lines changed

7 files changed

+24
-25
lines changed

readme.md renamed to README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ But the project welcomes all feedback and input on code design and validation re
2121
<dependency>
2222
<groupId>com.graphql-java</groupId>
2323
<artifactId>graphql-java-extended-validation</artifactId>
24-
<version>0.0.1</version>
24+
<version>0.0.3</version>
2525
<type>pom</type>
2626
</dependency>
2727
```
2828

2929
```groovy
30-
compile 'com.graphql-java:graphql-java-extended-validation:0.0.1'
30+
compile 'com.graphql-java:graphql-java-extended-validation:0.0.3'
3131
```
3232

3333
Its currently available from JCenter repo and Maven central is pending.

build.gradle

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
22

33

44
plugins {
5-
id "com.jfrog.bintray" version "1.8.4"
5+
id "com.jfrog.bintray" version "1.8.5"
66
}
77

88
apply plugin: 'java'
@@ -39,26 +39,25 @@ repositories {
3939

4040

4141
dependencies {
42-
compile "com.graphql-java:graphql-java:13.0"
42+
compile "com.graphql-java:graphql-java:14.0"
4343
compile 'org.slf4j:slf4j-api:1.7.25'
44-
compile "javax.validation:validation-api:2.0.1.Final"
45-
compile "org.hibernate.validator:hibernate-validator:6.0.17.Final"
46-
//compile "org.hibernate.validator:hibernate-validator:6.1.0.Alpha5"
47-
compile "javax.el:javax.el-api:3.0.0"
48-
compile "org.glassfish:javax.el:3.0.0"
49-
50-
testCompile 'org.slf4j:slf4j-simple:1.7.25'
51-
testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
52-
testCompile 'org.codehaus.groovy:groovy-all:2.5.7'
44+
compile "jakarta.validation:jakarta.validation-api:2.0.2"
45+
compile "org.hibernate.validator:hibernate-validator:6.0.19.Final"
46+
compile "jakarta.el:jakarta.el-api:3.0.3"
47+
compile "org.glassfish:jakarta.el:3.0.3"
48+
49+
testCompile 'org.slf4j:slf4j-simple:1.7.30'
50+
testCompile 'org.spockframework:spock-core:1.3-groovy-2.5'
51+
testCompile 'org.codehaus.groovy:groovy-all:2.5.11'
5352
}
5453

5554
task sourcesJar(type: Jar, dependsOn: classes) {
56-
classifier = 'sources'
55+
archiveClassifier.set("sources")
5756
from sourceSets.main.allSource
5857
}
5958

6059
task javadocJar(type: Jar, dependsOn: javadoc) {
61-
classifier = 'javadoc'
60+
archiveClassifier.set("javadoc")
6261
from javadoc.destinationDir
6362
}
6463

src/main/java/graphql/validation/constraints/AbstractDirectiveConstraint.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import graphql.schema.GraphQLFieldsContainer;
1111
import graphql.schema.GraphQLInputObjectType;
1212
import graphql.schema.GraphQLInputType;
13+
import graphql.schema.GraphQLNamedInputType;
1314
import graphql.schema.GraphQLScalarType;
1415
import graphql.schema.GraphQLTypeUtil;
1516
import graphql.validation.rules.ValidationEnvironment;
@@ -162,10 +163,13 @@ private List<GraphQLError> runConstraintOnDirectives(ValidationEnvironment valid
162163
* @return true ifits oneof them
163164
*/
164165
protected boolean isOneOfTheseTypes(GraphQLInputType inputType, GraphQLScalarType... scalarTypes) {
165-
GraphQLInputType unwrappedType = Util.unwrapNonNull(inputType);
166-
for (GraphQLScalarType scalarType : scalarTypes) {
167-
if (unwrappedType.getName().equals(scalarType.getName())) {
168-
return true;
166+
GraphQLInputType type = Util.unwrapNonNull(inputType);
167+
if (type instanceof GraphQLNamedInputType) {
168+
final GraphQLNamedInputType unwrappedType = (GraphQLNamedInputType) type;
169+
for (GraphQLScalarType scalarType : scalarTypes) {
170+
if (unwrappedType.getName().equals(scalarType.getName())) {
171+
return true;
172+
}
169173
}
170174
}
171175
return false;
@@ -283,7 +287,6 @@ protected Map<String, Object> mkMessageParams(Object validatedValue, ValidationE
283287
}
284288

285289

286-
287290
/**
288291
* Creates a new {@link graphql.GraphQLError}
289292
*

src/main/java/graphql/validation/constraints/DirectiveConstraint.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import graphql.PublicSpi;
44
import graphql.validation.rules.ValidationRule;
55

6-
import java.util.List;
7-
86
/**
97
* A DirectiveConstraint is a specialised form of validation rule
108
* that assumes it is backed by a SDL directive on fields, field arguments

src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.lang.annotation.ElementType;
2020
import java.lang.annotation.Retention;
2121
import java.lang.annotation.Target;
22-
import java.util.Collections;
2322
import java.util.LinkedHashMap;
2423
import java.util.Locale;
2524
import java.util.Map;

src/test/groovy/graphql/validation/constraints/BaseConstraintTestSupport.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import graphql.schema.GraphQLObjectType
1616
import graphql.schema.GraphQLSchema
1717
import graphql.validation.TestUtil
1818
import graphql.validation.interpolation.MessageInterpolator
19+
import graphql.validation.rules.TargetedValidationRules
1920
import graphql.validation.rules.ValidationCoordinates
2021
import graphql.validation.rules.ValidationEnvironment
21-
import graphql.validation.rules.TargetedValidationRules
2222
import spock.lang.Specification
2323

2424
class BaseConstraintTestSupport extends Specification {

src/test/groovy/graphql/validation/constraints/standard/SizeConstraintTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package graphql.validation.constraints.standard
22

33
import graphql.validation.constraints.BaseConstraintTestSupport
4-
import graphql.validation.constraints.DirectiveConstraint
4+
import graphql.validation.constraints.DirectiveConstraint
55
import spock.lang.Unroll
66

77
class SizeConstraintTest extends BaseConstraintTestSupport {

0 commit comments

Comments
 (0)