You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2020/07/03 11:30:16 UTC
[sling-org-apache-sling-graphql-core] branch master updated
(5f6b0c3 -> 9bc163c)
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git.
from 5f6b0c3 Mention SLING-9550
add d27f4bb SLING-9550 - initial scalars support, with hardcoded test scalars for now
new be70e17 Merge branch 'master' of github.com:apache/sling-org-apache-sling-graphql-core
add 1f61560 SLING-9550 - Use SlingScalarConverter services
add 99062b5 SLING-9550 - Fail if no failure
new 9bc163c SLING-9550 - merge branch 'feature/SLING-9550' for basic custom scalars support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...Fetcher.java => ScalarConversionException.java} | 27 +++---
...gDataFetcher.java => SlingScalarConverter.java} | 24 +++--
.../org/apache/sling/graphql/api/package-info.java | 2 +-
.../graphql/core/engine/GraphQLResourceQuery.java | 16 ++--
.../core/engine/SlingGraphQLException.java} | 20 +++--
.../graphql/core/scalars/SlingCoercingWrapper.java | 74 +++++++++++++++
.../graphql/core/scalars/SlingScalarsProvider.java | 100 +++++++++++++++++++++
.../core/scripting/GraphQLScriptEngine.java | 2 +-
.../core/scripting/GraphQLScriptEngineFactory.java | 8 ++
.../sling/graphql/core/servlet/GraphQLServlet.java | 6 +-
.../graphql/core/engine/CustomScalarsTest.java | 40 +++++++--
.../core/engine/GraphQLResourceQueryTest.java | 18 +++-
.../graphql/core/engine/ResourceQueryTestBase.java | 24 ++---
...choDataFetcher.java => AddressDataFetcher.java} | 25 +++---
.../apache/sling/graphql/core/mocks/TestUtil.java | 7 ++
...choDataFetcher.java => URLScalarConverter.java} | 30 ++++---
...aFetcher.java => UppercaseScalarConverter.java} | 25 +++---
.../core/schema/SchemaDescriptionsTest.java | 6 +-
.../{failing-schema.txt => scalars-schema.txt} | 13 +--
19 files changed, 369 insertions(+), 98 deletions(-)
copy src/main/java/org/apache/sling/graphql/api/{SlingDataFetcher.java => ScalarConversionException.java} (64%)
copy src/main/java/org/apache/sling/graphql/api/{SlingDataFetcher.java => SlingScalarConverter.java} (59%)
copy src/{test/resources/initial-content/apps/graphql/fetchers/scripted/example/fetcher.js => main/java/org/apache/sling/graphql/core/engine/SlingGraphQLException.java} (70%)
create mode 100644 src/main/java/org/apache/sling/graphql/core/scalars/SlingCoercingWrapper.java
create mode 100644 src/main/java/org/apache/sling/graphql/core/scalars/SlingScalarsProvider.java
copy src/test/java/org/apache/sling/graphql/core/mocks/{EchoDataFetcher.java => AddressDataFetcher.java} (69%)
copy src/test/java/org/apache/sling/graphql/core/mocks/{EchoDataFetcher.java => URLScalarConverter.java} (52%)
copy src/test/java/org/apache/sling/graphql/core/mocks/{EchoDataFetcher.java => UppercaseScalarConverter.java} (59%)
copy src/test/resources/{failing-schema.txt => scalars-schema.txt} (84%)
[sling-org-apache-sling-graphql-core] 02/02: SLING-9550 - merge
branch 'feature/SLING-9550' for basic custom scalars support
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git
commit 9bc163cd7eab8b7c3a1ab107656253aa9ebb5e2a
Merge: be70e17 99062b5
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jul 3 13:27:00 2020 +0200
SLING-9550 - merge branch 'feature/SLING-9550' for basic custom scalars support
...ge-info.java => ScalarConversionException.java} | 29 ++++--
.../sling/graphql/api/SlingScalarConverter.java | 46 +++++++++
.../org/apache/sling/graphql/api/package-info.java | 2 +-
.../graphql/core/engine/GraphQLResourceQuery.java | 2 +-
.../engine/SlingGraphQLException.java} | 20 ++--
.../graphql/core/scalars/SlingCoercingWrapper.java | 74 ++++++++++++++
.../graphql/core/scalars/SlingScalarsProvider.java | 109 ++++++++-------------
.../graphql/core/engine/CustomScalarsTest.java | 22 +++--
.../core/engine/GraphQLResourceQueryTest.java | 2 +-
.../graphql/core/engine/ResourceQueryTestBase.java | 8 +-
.../apache/sling/graphql/core/mocks/TestUtil.java | 7 ++
.../graphql/core/mocks/URLScalarConverter.java | 44 +++++++++
.../core/mocks/UppercaseScalarConverter.java} | 25 +++--
13 files changed, 290 insertions(+), 100 deletions(-)
[sling-org-apache-sling-graphql-core] 01/02: Merge branch 'master'
of github.com:apache/sling-org-apache-sling-graphql-core
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git
commit be70e17fea430b8f4b1bad0cb93e777ebb79ec4b
Merge: d27f4bb 5f6b0c3
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jul 3 12:22:19 2020 +0200
Merge branch 'master' of github.com:apache/sling-org-apache-sling-graphql-core
README.md | 3 +++
1 file changed, 3 insertions(+)