From d3e0ce9ea5b0f031ca75542c7bb799d3fdf386acb9b8f2f7a736f7765894e7f8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Oct 2023 05:34:54 +0000 Subject: [PATCH] Accepting request 1120928 from home:urbic:branches:Java:packages - Update to v21.3 * A small bugfix release on top of 21.2, which includes correct unwrapping of non-null input types for @oneOf. * What's Changed @OneOf handles non-null inputs by @felipe-gdr in #3353 - Update to v21.2 * This is a release with new features and bugfixes. There are no breaking changes. * What's Changed + Add max depth option to ExecutableNormalizedOperationFactory by @gnawf in #3268 + Handle repeated query directives by @gnawf in #3270 + Update readme by @dondonz in #3273 + Wrap NumberFormatException by @arthurscchan in #3282 + Bump org.openjdk.jmh:jmh-core from 1.36 to 1.37 by @dependabot in #3289 + Bump com.google.guava:guava from 32.1.1-jre to 32.1.2-jre by @dependabot in #3284 + Bump org.openjdk.jmh:jmh-generator-annprocess from 1.36 to 1.37 by @dependabot in #3290 + deprecated default value method produces bad results by @bbakerman in #3286 + write query directives from ENF to AST by @russellyou in #3295 + Add SchemaPrinter AST comments support by @vadimofd in #3287 + Bug 3276 - default values not being used correctly during validation by @bbakerman in #3278 + Experimental - oneOf directive support by @bbakerman in #3275 + add directiveName as property to AppliedDirectiveLocationDetail by @faizan-siddiqui in #3297 + Schema Printer - add deprecation reason printing and fix missing deprecated directive on argument by @vadimofd in #3298 + Added support for async create state in instrumentmentations by @bbakerman in #3302 + The last Java unit test by @bbakerman in #3305 + Permit parent restricted nodes to map to isolated nodes by @gnawf in #3304 + Bump org.codehaus.groovy:groovy from 3.0.18 to 3.0.19 by @dependabot in #3307 + Use the non deprecated method in InstrumentationExamples.java by @appreciated in #3265 + Update security policy by @dondonz in #3316 + guava version fix for master by @bbakerman in #3321 + Bump actions/checkout from 3 to 4 by @dependabot in #3325 + ES errors test to lock in current behavior by @bbakerman in #3327 + Fix OSGi bundle manifest by @geichelberger in #3313 + Allow schema diff to use SDL document to enforce directives by @ndejaco2 in #3344 + The ability to get the source location of a schema element by @bbakerman in #3340 + Bump com.fasterxml.jackson.core:jackson-databind from 2.15.2 to 2.15.3 by @dependabot in #3350 + Build cache fixes by @Duhemm in #3335 + Issue 3332 - overlapping aliases should be prevented by @bbakerman in #3334 + #3267 clear directives schema usage bug fix by @bbakerman in #3272 + removed synchronised from code base as much as possible for VT by @bbakerman in #3317 + Update DataLoader to 3.2.1 by @dondonz in #3351 - Modify patch: * java8.patch + supplemented OBS-URL: https://build.opensuse.org/request/show/1120928 OBS-URL: https://build.opensuse.org/package/show/Java:packages/graphql-java?expand=0&rev=6 --- graphql-java-21.1.tar.gz | 3 - ...hql-java-21.1.pom => graphql-java-21.3.pom | 4 +- graphql-java-21.3.tar.gz | 3 + graphql-java.changes | 69 +++++++++++++++++++ graphql-java.spec | 2 +- java8.patch | 24 +++++++ 6 files changed, 99 insertions(+), 6 deletions(-) delete mode 100644 graphql-java-21.1.tar.gz rename graphql-java-21.1.pom => graphql-java-21.3.pom (96%) create mode 100644 graphql-java-21.3.tar.gz diff --git a/graphql-java-21.1.tar.gz b/graphql-java-21.1.tar.gz deleted file mode 100644 index 2733e8e..0000000 --- a/graphql-java-21.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:124fffa31fcc8ee56cdf139ac752a8a61f7fba3a83441265f6bf980e46e49cbd -size 2111871 diff --git a/graphql-java-21.1.pom b/graphql-java-21.3.pom similarity index 96% rename from graphql-java-21.1.pom rename to graphql-java-21.3.pom index 470b3c9..e60dbb2 100644 --- a/graphql-java-21.1.pom +++ b/graphql-java-21.3.pom @@ -3,12 +3,12 @@ 4.0.0 com.graphql-java graphql-java - 21.1 + 21.3 com.graphql-java java-dataloader - 3.2.0 + 3.2.1 compile diff --git a/graphql-java-21.3.tar.gz b/graphql-java-21.3.tar.gz new file mode 100644 index 0000000..d12e6f9 --- /dev/null +++ b/graphql-java-21.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e8c74ecabbc211d968ef5a0fb86cecfbbd327d71bb2064908bd6973ad90341f +size 2127921 diff --git a/graphql-java.changes b/graphql-java.changes index 49580e5..e8afd95 100644 --- a/graphql-java.changes +++ b/graphql-java.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Sat Oct 28 23:32:31 UTC 2023 - Anton Shvetz + +- Update to v21.3 + * A small bugfix release on top of 21.2, which includes correct + unwrapping of non-null input types for @oneOf. + * What's Changed + @OneOf handles non-null inputs by @felipe-gdr in #3353 +- Update to v21.2 + * This is a release with new features and bugfixes. There are no + breaking changes. + * What's Changed + + Add max depth option to ExecutableNormalizedOperationFactory + by @gnawf in #3268 + + Handle repeated query directives by @gnawf in #3270 + + Update readme by @dondonz in #3273 + + Wrap NumberFormatException by @arthurscchan in #3282 + + Bump org.openjdk.jmh:jmh-core from 1.36 to 1.37 by + @dependabot in #3289 + + Bump com.google.guava:guava from 32.1.1-jre to 32.1.2-jre by + @dependabot in #3284 + + Bump org.openjdk.jmh:jmh-generator-annprocess from 1.36 to + 1.37 by @dependabot in #3290 + + deprecated default value method produces bad results by + @bbakerman in #3286 + + write query directives from ENF to AST by @russellyou in + #3295 + + Add SchemaPrinter AST comments support by @vadimofd in #3287 + + Bug 3276 - default values not being used correctly during + validation by @bbakerman in #3278 + + Experimental - oneOf directive support by @bbakerman in #3275 + + add directiveName as property to + AppliedDirectiveLocationDetail by @faizan-siddiqui in #3297 + + Schema Printer - add deprecation reason printing and fix + missing deprecated directive on argument by @vadimofd in + #3298 + + Added support for async create state in instrumentmentations + by @bbakerman in #3302 + + The last Java unit test by @bbakerman in #3305 + + Permit parent restricted nodes to map to isolated nodes by + @gnawf in #3304 + + Bump org.codehaus.groovy:groovy from 3.0.18 to 3.0.19 by + @dependabot in #3307 + + Use the non deprecated method in InstrumentationExamples.java + by @appreciated in #3265 + + Update security policy by @dondonz in #3316 + + guava version fix for master by @bbakerman in #3321 + + Bump actions/checkout from 3 to 4 by @dependabot in #3325 + + ES errors test to lock in current behavior by @bbakerman in + #3327 + + Fix OSGi bundle manifest by @geichelberger in #3313 + + Allow schema diff to use SDL document to enforce directives + by @ndejaco2 in #3344 + + The ability to get the source location of a schema element by + @bbakerman in #3340 + + Bump com.fasterxml.jackson.core:jackson-databind from 2.15.2 + to 2.15.3 by @dependabot in #3350 + + Build cache fixes by @Duhemm in #3335 + + Issue 3332 - overlapping aliases should be prevented by + @bbakerman in #3334 + + #3267 clear directives schema usage bug fix by @bbakerman in + #3272 + + removed synchronised from code base as much as possible for + VT by @bbakerman in #3317 + + Update DataLoader to 3.2.1 by @dondonz in #3351 +- Modify patch: + * java8.patch + + supplemented + ------------------------------------------------------------------- Tue Sep 12 02:29:05 UTC 2023 - Anton Shvetz diff --git a/graphql-java.spec b/graphql-java.spec index e81e6b3..3715c64 100644 --- a/graphql-java.spec +++ b/graphql-java.spec @@ -17,7 +17,7 @@ Name: graphql-java -Version: 21.1 +Version: 21.3 Release: 0 Summary: GraphQL Java implementation License: MIT diff --git a/java8.patch b/java8.patch index bfd3f1c..9bc360d 100644 --- a/java8.patch +++ b/java8.patch @@ -107,3 +107,27 @@ diff -urEbwB graphql-java-21.0.orig/src/main/java/graphql/schema/SchemaTransform @Override public TraversalControl enter(TraverserContext context) { GraphQLSchemaElement currentSchemaElement = context.thisNode(); +diff -up graphql-java-21.3/src/main/java/graphql/execution/instrumentation/dataloader/FieldLevelTrackingApproach.java.p00 graphql-java-21.3/src/main/java/graphql/execution/instrumentation/dataloader/FieldLevelTrackingApproach.java +--- graphql-java-21.3/src/main/java/graphql/execution/instrumentation/dataloader/FieldLevelTrackingApproach.java.p00 2023-10-29 02:23:28.507854072 +0300 ++++ graphql-java-21.3/src/main/java/graphql/execution/instrumentation/dataloader/FieldLevelTrackingApproach.java 2023-10-29 02:23:42.416023206 +0300 +@@ -189,7 +189,7 @@ public class FieldLevelTrackingApproach + CallStack callStack = (CallStack) rawState; + ResultPath path = parameters.getEnvironment().getExecutionStepInfo().getPath(); + int level = path.getLevel(); +- return new InstrumentationContext<>() { ++ return new InstrumentationContext() { + + @Override + public void onDispatched(CompletableFuture result) { +diff -up graphql-java-21.3/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java.p01 graphql-java-21.3/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java +--- graphql-java-21.3/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java.p01 2023-10-29 02:25:32.453361342 +0300 ++++ graphql-java-21.3/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java 2023-10-29 02:30:00.084615900 +0300 +@@ -99,7 +99,7 @@ public class ExecutableNormalizedOperati + @Nullable String operationName, + @NotNull List topLevelFields, + @Nullable VariablePredicate variablePredicate) { +- return compileToDocument(schema,operationKind,operationName,topLevelFields,Map.of(),variablePredicate); ++ return compileToDocument(schema,operationKind,operationName,topLevelFields,java.util.Collections.emptyMap(),variablePredicate); + } + + /**