From 66348e6e921ec8dd51852ab81f2468177343558f Mon Sep 17 00:00:00 2001 From: Bernardo Gomez Palacio Date: Thu, 5 Aug 2021 20:36:29 -0700 Subject: [PATCH] Upgrade to graphql-java 17.0 --- buildSrc/src/main/kotlin/Versions.kt | 6 ++--- graphql-dgs-client/dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- graphql-dgs-example-java/dependencies.lock | 16 ++++++------- graphql-dgs-example-shared/dependencies.lock | 16 ++++++------- .../dependencies.lock | 24 +++++++++---------- graphql-dgs-mocking/dependencies.lock | 8 +++---- graphql-dgs-pagination/dependencies.lock | 16 ++++++------- graphql-dgs-reactive/dependencies.lock | 16 ++++++------- .../dgs/reactive/LocalDateTimeScalar.kt | 6 ++--- .../dependencies.lock | 12 +++++----- .../dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- graphql-dgs-spring-webmvc/dependencies.lock | 16 ++++++------- .../dependencies.lock | 8 +++---- .../dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- graphql-dgs-webflux-starter/dependencies.lock | 16 ++++++------- graphql-dgs/dependencies.lock | 24 +++++++++---------- .../graphql/dgs/DgsDataFetchingEnvironment.kt | 6 +++++ .../dgs/DataFetcherWithDirectivesTest.kt | 23 +++++++++++++++--- .../graphql/dgs/DgsFederationResolverTest.kt | 3 ++- .../graphql/dgs/LocalDateTimeScalar.kt | 6 ++--- graphql-error-types/dependencies.lock | 8 +++---- 28 files changed, 207 insertions(+), 183 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 90132dae7..4463e8150 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -20,8 +20,8 @@ object Versions { const val SPRING_BOOT_VERSION = "2.3.9.RELEASE" const val SPRING_SECURITY_VERSION = "5.3.9.RELEASE" const val SPRING_CLOUD_VERSION = "Hoxton.SR10" - const val GRAPHQL_JAVA = "16.2" - const val GRAPHQL_JAVA_EXTENDED_SCALARS = "16.0.1" - const val GRAPHQL_JAVA_FEDERATION = "0.6.3" + const val GRAPHQL_JAVA = "17.3" + const val GRAPHQL_JAVA_EXTENDED_SCALARS = "17.0" + const val GRAPHQL_JAVA_FEDERATION = "0.7.0" const val JACKSON_BOM = "2.12.3" } diff --git a/graphql-dgs-client/dependencies.lock b/graphql-dgs-client/dependencies.lock index 4238857eb..afd695322 100644 --- a/graphql-dgs-client/dependencies.lock +++ b/graphql-dgs-client/dependencies.lock @@ -45,7 +45,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-subscription-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.6.0" @@ -302,7 +302,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-subscription-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.6.0" @@ -388,10 +388,10 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -550,7 +550,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -594,10 +594,10 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -756,7 +756,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ diff --git a/graphql-dgs-example-java-webflux/dependencies.lock b/graphql-dgs-example-java-webflux/dependencies.lock index dd729a56d..4699545e5 100644 --- a/graphql-dgs-example-java-webflux/dependencies.lock +++ b/graphql-dgs-example-java-webflux/dependencies.lock @@ -43,7 +43,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -374,7 +374,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -424,7 +424,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -574,7 +574,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ @@ -671,7 +671,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -816,7 +816,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -866,7 +866,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -1019,7 +1019,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ diff --git a/graphql-dgs-example-java/dependencies.lock b/graphql-dgs-example-java/dependencies.lock index 39e393eb3..60b6a9558 100644 --- a/graphql-dgs-example-java/dependencies.lock +++ b/graphql-dgs-example-java/dependencies.lock @@ -46,7 +46,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -380,7 +380,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -432,7 +432,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -594,7 +594,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ @@ -711,7 +711,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -865,7 +865,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -917,7 +917,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -1086,7 +1086,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ diff --git a/graphql-dgs-example-shared/dependencies.lock b/graphql-dgs-example-shared/dependencies.lock index c15e1bf0e..16a73a03b 100644 --- a/graphql-dgs-example-shared/dependencies.lock +++ b/graphql-dgs-example-shared/dependencies.lock @@ -38,7 +38,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -322,7 +322,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.12.3" @@ -356,7 +356,7 @@ "com.netflix.graphql.dgs:graphql-dgs-pagination", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -448,7 +448,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ @@ -522,7 +522,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -623,7 +623,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-databind": { "locked": "2.12.3" @@ -657,7 +657,7 @@ "com.netflix.graphql.dgs:graphql-dgs-pagination", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -755,7 +755,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ diff --git a/graphql-dgs-extended-scalars/dependencies.lock b/graphql-dgs-extended-scalars/dependencies.lock index 2c5ac32bf..7cd8903df 100644 --- a/graphql-dgs-extended-scalars/dependencies.lock +++ b/graphql-dgs-extended-scalars/dependencies.lock @@ -35,10 +35,10 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -293,7 +293,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -322,10 +322,10 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -389,7 +389,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" @@ -457,10 +457,10 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -588,7 +588,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -629,10 +629,10 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -765,7 +765,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-mocking/dependencies.lock b/graphql-dgs-mocking/dependencies.lock index 5a7d192dd..67db82f06 100644 --- a/graphql-dgs-mocking/dependencies.lock +++ b/graphql-dgs-mocking/dependencies.lock @@ -33,7 +33,7 @@ "locked": "1.0.2" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -260,7 +260,7 @@ "locked": "1.0.2" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -315,7 +315,7 @@ "locked": "1.0.2" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -356,7 +356,7 @@ "locked": "1.0.2" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true diff --git a/graphql-dgs-pagination/dependencies.lock b/graphql-dgs-pagination/dependencies.lock index 63bd345f4..1f571ddef 100644 --- a/graphql-dgs-pagination/dependencies.lock +++ b/graphql-dgs-pagination/dependencies.lock @@ -35,7 +35,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -290,7 +290,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -319,7 +319,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -383,7 +383,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" @@ -443,7 +443,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -512,7 +512,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -541,7 +541,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -608,7 +608,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-reactive/dependencies.lock b/graphql-dgs-reactive/dependencies.lock index a38574118..3fa6edfb6 100644 --- a/graphql-dgs-reactive/dependencies.lock +++ b/graphql-dgs-reactive/dependencies.lock @@ -38,7 +38,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -299,7 +299,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -328,7 +328,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -392,7 +392,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -458,7 +458,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -554,7 +554,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -584,7 +584,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -673,7 +673,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-reactive/src/test/kotlin/com/netflix/graphql/dgs/reactive/LocalDateTimeScalar.kt b/graphql-dgs-reactive/src/test/kotlin/com/netflix/graphql/dgs/reactive/LocalDateTimeScalar.kt index 61e77f96a..35cda1b59 100644 --- a/graphql-dgs-reactive/src/test/kotlin/com/netflix/graphql/dgs/reactive/LocalDateTimeScalar.kt +++ b/graphql-dgs-reactive/src/test/kotlin/com/netflix/graphql/dgs/reactive/LocalDateTimeScalar.kt @@ -26,11 +26,11 @@ import java.time.format.DateTimeFormatter @DgsScalar(name = "DateTime") class LocalDateTimeScalar : Coercing { - override fun parseValue(input: Any?): LocalDateTime { + override fun parseValue(input: Any): LocalDateTime { return LocalDateTime.parse(input.toString(), DateTimeFormatter.ISO_DATE_TIME) } - override fun parseLiteral(input: Any?): LocalDateTime { + override fun parseLiteral(input: Any): LocalDateTime { if (input is StringValue) { return LocalDateTime.parse(input.value, DateTimeFormatter.ISO_DATE_TIME) } @@ -38,7 +38,7 @@ class LocalDateTimeScalar : Coercing { throw CoercingParseLiteralException("Value is not a valid ISO date time") } - override fun serialize(dataFetcherResult: Any?): String { + override fun serialize(dataFetcherResult: Any): String { if (dataFetcherResult is LocalDateTime) { return dataFetcherResult.format(DateTimeFormatter.ISO_DATE_TIME) } else { diff --git a/graphql-dgs-spring-boot-micrometer/dependencies.lock b/graphql-dgs-spring-boot-micrometer/dependencies.lock index 3af98ab4e..3826a5ec6 100644 --- a/graphql-dgs-spring-boot-micrometer/dependencies.lock +++ b/graphql-dgs-spring-boot-micrometer/dependencies.lock @@ -46,7 +46,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -378,7 +378,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -410,7 +410,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -557,7 +557,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -703,7 +703,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -747,7 +747,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ diff --git a/graphql-dgs-spring-boot-oss-autoconfigure/dependencies.lock b/graphql-dgs-spring-boot-oss-autoconfigure/dependencies.lock index 8e24ea6d7..bbbd14c52 100644 --- a/graphql-dgs-spring-boot-oss-autoconfigure/dependencies.lock +++ b/graphql-dgs-spring-boot-oss-autoconfigure/dependencies.lock @@ -35,7 +35,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -302,7 +302,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -332,7 +332,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -406,7 +406,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -467,7 +467,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -551,7 +551,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -581,7 +581,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -658,7 +658,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-spring-boot-starter/dependencies.lock b/graphql-dgs-spring-boot-starter/dependencies.lock index 734940394..b0310bcf6 100644 --- a/graphql-dgs-spring-boot-starter/dependencies.lock +++ b/graphql-dgs-spring-boot-starter/dependencies.lock @@ -43,7 +43,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -346,7 +346,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -387,7 +387,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -503,7 +503,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -590,7 +590,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -707,7 +707,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -748,7 +748,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -867,7 +867,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-spring-webflux-autoconfigure/dependencies.lock b/graphql-dgs-spring-webflux-autoconfigure/dependencies.lock index 5883ac6bf..c8baa62c5 100644 --- a/graphql-dgs-spring-webflux-autoconfigure/dependencies.lock +++ b/graphql-dgs-spring-webflux-autoconfigure/dependencies.lock @@ -38,7 +38,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -304,7 +304,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -334,7 +334,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -407,7 +407,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -479,7 +479,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -581,7 +581,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -612,7 +612,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -708,7 +708,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-spring-webmvc-autoconfigure/dependencies.lock b/graphql-dgs-spring-webmvc-autoconfigure/dependencies.lock index 6f1178434..4b0c7c655 100644 --- a/graphql-dgs-spring-webmvc-autoconfigure/dependencies.lock +++ b/graphql-dgs-spring-webmvc-autoconfigure/dependencies.lock @@ -35,7 +35,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -305,7 +305,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -335,7 +335,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -412,7 +412,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -476,7 +476,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -572,7 +572,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -602,7 +602,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -691,7 +691,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-spring-webmvc/dependencies.lock b/graphql-dgs-spring-webmvc/dependencies.lock index 41d53ccc9..dc5905537 100644 --- a/graphql-dgs-spring-webmvc/dependencies.lock +++ b/graphql-dgs-spring-webmvc/dependencies.lock @@ -38,7 +38,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -299,7 +299,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -328,7 +328,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -392,7 +392,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -452,7 +452,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -524,7 +524,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "firstLevelTransitive": [ @@ -553,7 +553,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -620,7 +620,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-subscription-types/dependencies.lock b/graphql-dgs-subscription-types/dependencies.lock index a14cc75a2..dfd5db542 100644 --- a/graphql-dgs-subscription-types/dependencies.lock +++ b/graphql-dgs-subscription-types/dependencies.lock @@ -33,7 +33,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -257,7 +257,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -312,7 +312,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -353,7 +353,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true diff --git a/graphql-dgs-subscriptions-sse-autoconfigure/dependencies.lock b/graphql-dgs-subscriptions-sse-autoconfigure/dependencies.lock index b7d82c26f..20192f063 100644 --- a/graphql-dgs-subscriptions-sse-autoconfigure/dependencies.lock +++ b/graphql-dgs-subscriptions-sse-autoconfigure/dependencies.lock @@ -35,7 +35,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -301,7 +301,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -338,7 +338,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -418,7 +418,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" @@ -485,7 +485,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -565,7 +565,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -602,7 +602,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -685,7 +685,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-subscriptions-sse/dependencies.lock b/graphql-dgs-subscriptions-sse/dependencies.lock index 6bcba924e..fbe30ca72 100644 --- a/graphql-dgs-subscriptions-sse/dependencies.lock +++ b/graphql-dgs-subscriptions-sse/dependencies.lock @@ -45,7 +45,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -308,7 +308,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -344,7 +344,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -413,7 +413,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -483,7 +483,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -563,7 +563,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -599,7 +599,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -674,7 +674,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-subscriptions-websockets-autoconfigure/dependencies.lock b/graphql-dgs-subscriptions-websockets-autoconfigure/dependencies.lock index 7aac5ea60..13319591f 100644 --- a/graphql-dgs-subscriptions-websockets-autoconfigure/dependencies.lock +++ b/graphql-dgs-subscriptions-websockets-autoconfigure/dependencies.lock @@ -42,7 +42,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -313,7 +313,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -350,7 +350,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -430,7 +430,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ @@ -507,7 +507,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -592,7 +592,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -629,7 +629,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -712,7 +712,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "firstLevelTransitive": [ diff --git a/graphql-dgs-subscriptions-websockets/dependencies.lock b/graphql-dgs-subscriptions-websockets/dependencies.lock index dd5469f47..f4c5bc14a 100644 --- a/graphql-dgs-subscriptions-websockets/dependencies.lock +++ b/graphql-dgs-subscriptions-websockets/dependencies.lock @@ -45,7 +45,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -311,7 +311,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -347,7 +347,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -416,7 +416,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" @@ -489,7 +489,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -575,7 +575,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -611,7 +611,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -689,7 +689,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-autoconfigure": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs-webflux-starter/dependencies.lock b/graphql-dgs-webflux-starter/dependencies.lock index bb41c795d..f5b4d303f 100644 --- a/graphql-dgs-webflux-starter/dependencies.lock +++ b/graphql-dgs-webflux-starter/dependencies.lock @@ -43,7 +43,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -351,7 +351,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -394,7 +394,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -513,7 +513,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -599,7 +599,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -721,7 +721,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs" ], - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.core:jackson-annotations": { "firstLevelTransitive": [ @@ -764,7 +764,7 @@ "com.netflix.graphql.dgs:graphql-dgs-subscription-types", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "firstLevelTransitive": [ @@ -886,7 +886,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs/dependencies.lock b/graphql-dgs/dependencies.lock index b9909b518..fdfe06c06 100644 --- a/graphql-dgs/dependencies.lock +++ b/graphql-dgs/dependencies.lock @@ -27,7 +27,7 @@ }, "compileClasspath": { "com.apollographql.federation:federation-graphql-java-support": { - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "locked": "2.12.3" @@ -43,7 +43,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.6.0" @@ -296,7 +296,7 @@ }, "runtimeClasspath": { "com.apollographql.federation:federation-graphql-java-support": { - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "locked": "2.12.3" @@ -318,7 +318,7 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.jayway.jsonpath:json-path": { "locked": "2.6.0" @@ -359,7 +359,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" @@ -402,7 +402,7 @@ }, "testCompileClasspath": { "com.apollographql.federation:federation-graphql-java-support": { - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "locked": "2.12.3" @@ -418,10 +418,10 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "locked": "2.6.0" @@ -494,7 +494,7 @@ }, "testRuntimeClasspath": { "com.apollographql.federation:federation-graphql-java-support": { - "locked": "0.6.3" + "locked": "0.7.0" }, "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": { "locked": "2.12.3" @@ -516,10 +516,10 @@ "com.netflix.graphql.dgs:graphql-dgs-mocking", "com.netflix.graphql.dgs:graphql-error-types" ], - "locked": "16.2" + "locked": "17.3" }, "com.graphql-java:graphql-java-extended-scalars": { - "locked": "16.0.1" + "locked": "17.0" }, "com.jayway.jsonpath:json-path": { "locked": "2.6.0" @@ -569,7 +569,7 @@ "firstLevelTransitive": [ "com.netflix.graphql.dgs:graphql-dgs-mocking" ], - "locked": "1.7.30" + "locked": "1.7.32" }, "org.springframework.boot:spring-boot-dependencies": { "locked": "2.3.9.RELEASE" diff --git a/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/DgsDataFetchingEnvironment.kt b/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/DgsDataFetchingEnvironment.kt index 258d3d8c2..7a05b46e4 100644 --- a/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/DgsDataFetchingEnvironment.kt +++ b/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/DgsDataFetchingEnvironment.kt @@ -19,6 +19,7 @@ package com.netflix.graphql.dgs import com.netflix.graphql.dgs.context.DgsContext import com.netflix.graphql.dgs.exceptions.MultipleDataLoadersDefinedException import com.netflix.graphql.dgs.exceptions.NoDataLoaderFoundException +import graphql.GraphQLContext import graphql.cachecontrol.CacheControl import graphql.execution.ExecutionId import graphql.execution.ExecutionStepInfo @@ -78,10 +79,15 @@ class DgsDataFetchingEnvironment(private val dfe: DataFetchingEnvironment) : Dat return dfe.getArgumentOrDefault(name, defaultValue) } + @Deprecated(message = "Use getGraphQLContext() instead.", replaceWith = ReplaceWith(expression = "getGraphQLContext().get()")) override fun getContext(): T { return dfe.getContext() } + override fun getGraphQlContext(): GraphQLContext { + return dfe.graphQlContext + } + override fun getLocalContext(): T { return dfe.getLocalContext() } diff --git a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DataFetcherWithDirectivesTest.kt b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DataFetcherWithDirectivesTest.kt index 42232d8d0..7511a91a2 100644 --- a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DataFetcherWithDirectivesTest.kt +++ b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DataFetcherWithDirectivesTest.kt @@ -18,10 +18,12 @@ package com.netflix.graphql.dgs import com.netflix.graphql.dgs.internal.DgsSchemaProvider import graphql.GraphQL +import graphql.language.StringValue import io.mockk.every import io.mockk.impl.annotations.MockK import io.mockk.junit5.MockKExtension import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.InstanceOfAssertFactories import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.context.ApplicationContext @@ -38,12 +40,27 @@ class DataFetcherWithDirectivesTest { val queryFetcher = object : Any() { @DgsData(parentType = "Query", field = "hello") fun hellOFetcher(dataFetchingEnvironment: DgsDataFetchingEnvironment): String { - val directive = dataFetchingEnvironment.fieldDefinition.directives[0] - return "hello ${directive.arguments[0].value}" + assertThat(dataFetchingEnvironment.fieldDefinition.directives) + .hasSize(1) + .first() + .extracting({ it.arguments }, InstanceOfAssertFactories.LIST) + .hasSize(1) + + val graphQLArgument = + dataFetchingEnvironment.fieldDefinition.directives.first().arguments.first() + + assertThat(graphQLArgument.argumentValue) + .isNotNull + .extracting { it.value } + .isInstanceOf(StringValue::class.java) + + val value = (graphQLArgument.argumentValue.value as StringValue).value + assertThat(value).isEqualTo("some name") + return "hello $value" } } - every { applicationContextMock.getBeansWithAnnotation(DgsComponent::class.java) } returns mapOf(Pair("helloFetcher", queryFetcher)) + every { applicationContextMock.getBeansWithAnnotation(DgsComponent::class.java) } returns mapOf("helloFetcher" to queryFetcher) every { applicationContextMock.getBeansWithAnnotation(DgsScalar::class.java) } returns emptyMap() every { applicationContextMock.getBeansWithAnnotation(DgsDirective::class.java) } returns emptyMap() diff --git a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DgsFederationResolverTest.kt b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DgsFederationResolverTest.kt index aaa6bd119..93af1deff 100644 --- a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DgsFederationResolverTest.kt +++ b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/DgsFederationResolverTest.kt @@ -278,7 +278,8 @@ class DgsFederationResolverTest { dgsSchemaProvider.schema("""type Query {}""") val arguments = mapOf(Pair(_Entity.argumentName, listOf(mapOf(Pair("__typename", "Movie"), Pair("movieId", "1"))))) - val dataFetchingEnvironment = DgsDataFetchingEnvironment(DataFetchingEnvironmentImpl.newDataFetchingEnvironment().arguments(arguments).build()) + val dataFetchingEnvironment = + DgsDataFetchingEnvironment(DataFetchingEnvironmentImpl.newDataFetchingEnvironment().arguments(arguments).build()) val result = (DefaultDgsFederationResolver(dgsSchemaProvider, Optional.of(dgsExceptionHandler)).entitiesFetcher().get(dataFetchingEnvironment) as CompletableFuture>>) assertThat(result).isNotNull diff --git a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/LocalDateTimeScalar.kt b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/LocalDateTimeScalar.kt index 55f2b4e53..2453cfb8b 100644 --- a/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/LocalDateTimeScalar.kt +++ b/graphql-dgs/src/test/kotlin/com/netflix/graphql/dgs/LocalDateTimeScalar.kt @@ -25,11 +25,11 @@ import java.time.format.DateTimeFormatter @DgsScalar(name = "DateTime") class LocalDateTimeScalar : Coercing { - override fun parseValue(input: Any?): LocalDateTime { + override fun parseValue(input: Any): LocalDateTime { return LocalDateTime.parse(input.toString(), DateTimeFormatter.ISO_DATE_TIME) } - override fun parseLiteral(input: Any?): LocalDateTime { + override fun parseLiteral(input: Any): LocalDateTime { if (input is StringValue) { return LocalDateTime.parse(input.value, DateTimeFormatter.ISO_DATE_TIME) } @@ -37,7 +37,7 @@ class LocalDateTimeScalar : Coercing { throw CoercingParseLiteralException("Value is not a valid ISO date time") } - override fun serialize(dataFetcherResult: Any?): String { + override fun serialize(dataFetcherResult: Any): String { if (dataFetcherResult is LocalDateTime) { return dataFetcherResult.format(DateTimeFormatter.ISO_DATE_TIME) } else { diff --git a/graphql-error-types/dependencies.lock b/graphql-error-types/dependencies.lock index f85d841d4..223c02b30 100644 --- a/graphql-error-types/dependencies.lock +++ b/graphql-error-types/dependencies.lock @@ -33,7 +33,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -254,7 +254,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -303,7 +303,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true @@ -338,7 +338,7 @@ "locked": "2.12.3" }, "com.graphql-java:graphql-java": { - "locked": "16.2" + "locked": "17.3" }, "com.netflix.graphql.dgs:graphql-dgs-platform": { "project": true