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:18 UTC
[sling-org-apache-sling-graphql-core] 02/02: SLING-9550 - merge
branch 'feature/SLING-9550' for basic custom scalars support
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(-)