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/04/22 13:11:14 UTC
[sling-whiteboard] branch master updated: Simplify API
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-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 5fb7d16 Simplify API
5fb7d16 is described below
commit 5fb7d166c8c1fb393b9eb90257852ddb325b80a7
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Apr 22 15:10:56 2020 +0200
Simplify API
---
.../java/org/apache/sling/graphql/api/SchemaProvider.java | 14 +-------------
.../sling/scripting/gql/schema/DefaultSchemaProvider.java | 14 ++++++++++++--
.../sling/scripting/gql/engine/MockSchemaProvider.java | 2 +-
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java
index d876ac1..4792b4b 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java
@@ -28,18 +28,6 @@ import aQute.bnd.annotation.ProviderType;
@ProviderType
public interface SchemaProvider {
- public static class SchemaProviderException extends IOException {
- private static final long serialVersionUID = 1L;
-
- public SchemaProviderException(String reason) {
- super(reason);
- }
-
- public SchemaProviderException(String reason, Throwable cause) {
- super(reason, cause);
- }
- }
-
/** Get a GraphQL Schema definition for the given resource and optional selectors */
- String getSchema(Resource r, String [] selectors) throws SchemaProviderException;
+ String getSchema(Resource r, String [] selectors) throws IOException;
}
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java
index 7afbb09..72ec43e 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java
@@ -22,8 +22,6 @@ package org.apache.sling.scripting.gql.schema;
import java.io.IOException;
-import javax.servlet.ServletException;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.engine.SlingRequestProcessor;
@@ -42,6 +40,18 @@ public class DefaultSchemaProvider implements SchemaProvider {
public static final String SCHEMA_EXTENSION = ".GQLschema";
+ public static class SchemaProviderException extends IOException {
+ private static final long serialVersionUID = 1L;
+
+ public SchemaProviderException(String reason) {
+ super(reason);
+ }
+
+ public SchemaProviderException(String reason, Throwable cause) {
+ super(reason, cause);
+ }
+ }
+
@Reference
protected SlingRequestProcessor requestProcessor;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/MockSchemaProvider.java b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/MockSchemaProvider.java
index 583d42b..6f8bc3b 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/MockSchemaProvider.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/MockSchemaProvider.java
@@ -34,7 +34,7 @@ class MockSchemaProvider implements SchemaProvider {
+ "type Test { test: Boolean }";
@Override
- public String getSchema(Resource r, String[] selectors) throws SchemaProviderException {
+ public String getSchema(Resource r, String[] selectors) {
return MOCK_SCHEMA;
}