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/05/07 14:08:31 UTC
[sling-whiteboard] branch master updated: Rename packages, refactor
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 519a681 Rename packages, refactor
519a681 is described below
commit 519a68175e092c45ee0c04ceefefda6890d4502b
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu May 7 16:08:08 2020 +0200
Rename packages, refactor
---
.../gql => graphql/core}/engine/GraphQLResourceQuery.java | 6 +++---
.../gql => graphql/core}/schema/DataFetcherDefinition.java | 2 +-
.../gql => graphql/core}/schema/DataFetcherSelector.java | 5 +++--
.../gql => graphql/core}/schema/DefaultSchemaProvider.java | 5 +----
.../engine => graphql/core/scripting}/GraphQLScriptEngine.java | 7 +++++--
.../core/scripting}/GraphQLScriptEngineFactory.java | 4 ++--
.../scripting}/GraphQLScriptEngineFactoryConfiguration.java | 2 +-
.../gql => graphql/core}/servlet/GraphQLServlet.java | 8 ++++----
.../{scripting/gql => graphql/core}/servlet/RequestParser.java | 2 +-
.../gql => graphql/core}/engine/GraphQLResourceQueryTest.java | 7 ++++---
.../{scripting/graphql => graphql/core}/it/BasicContentIT.java | 2 +-
.../graphql => graphql/core}/it/GraphQLScriptEngineIT.java | 2 +-
.../core}/it/GraphQLScriptingTestSupport.java | 10 +++++++++-
.../graphql => graphql/core}/it/GraphQLServletIT.java | 2 +-
.../graphql => graphql/core}/it/GraphQLServletNoConfigIT.java | 2 +-
.../graphql => graphql/core}/it/PipeDataFetcherFactory.java | 2 +-
.../schema => graphql/core/mocks}/MockDataFetcherSelector.java | 3 ++-
.../gql/engine => graphql/core/mocks}/MockSchemaProvider.java | 4 ++--
.../gql => graphql/core}/schema/DataFetcherDefinitionTest.java | 2 +-
.../gql => graphql/core}/schema/DataFetcherSelectorTest.java | 3 ++-
20 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQuery.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/engine/GraphQLResourceQuery.java
similarity index 96%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQuery.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/engine/GraphQLResourceQuery.java
index fbada31..521ac5a 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQuery.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/engine/GraphQLResourceQuery.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.engine;
+package org.apache.sling.graphql.core.engine;
import javax.script.ScriptException;
@@ -27,8 +27,8 @@ import graphql.language.FieldDefinition;
import graphql.language.ObjectTypeDefinition;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.graphql.api.SchemaProvider;
-import org.apache.sling.scripting.gql.schema.DataFetcherDefinition;
-import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
+import org.apache.sling.graphql.core.schema.DataFetcherDefinition;
+import org.apache.sling.graphql.core.schema.DataFetcherSelector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinition.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DataFetcherDefinition.java
similarity index 98%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinition.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DataFetcherDefinition.java
index ebae583..3a3d738 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinition.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DataFetcherDefinition.java
@@ -18,7 +18,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.schema;
+package org.apache.sling.graphql.core.schema;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DataFetcherSelector.java
similarity index 93%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DataFetcherSelector.java
index a5cc9be..77af8c8 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DataFetcherSelector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.schema;
+package org.apache.sling.graphql.core.schema;
import graphql.schema.DataFetcher;
import org.apache.sling.api.resource.Resource;
@@ -47,7 +47,8 @@ public class DataFetcherSelector {
// public default constructor required ...
}
- DataFetcherSelector(DataFetcherProvider... testFetchers) {
+ /** Convenience constructor for testing */
+ protected DataFetcherSelector(DataFetcherProvider... testFetchers) {
factories.addAll(Arrays.asList(testFetchers));
}
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/graphql/core/schema/DefaultSchemaProvider.java
similarity index 94%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DefaultSchemaProvider.java
index 72ec43e..bc323ac 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/schema/DefaultSchemaProvider.java
@@ -18,7 +18,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.schema;
+package org.apache.sling.graphql.core.schema;
import java.io.IOException;
@@ -58,9 +58,6 @@ public class DefaultSchemaProvider implements SchemaProvider {
@Override
public String getSchema(Resource r, String [] selectors) throws SchemaProviderException {
final ResourceResolver resourceResolver = r.getResourceResolver();
- if(r == null) {
- throw new SchemaProviderException("Resource.getResourceResolver() is null");
- }
final MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(resourceResolver);
final String path = r.getPath() + SCHEMA_EXTENSION;
request.setPathInfo(path);
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngine.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
similarity index 92%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngine.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
index 20046bf..d8710d3 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngine.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
@@ -18,7 +18,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.engine;
+package org.apache.sling.graphql.core.scripting;
import java.io.PrintWriter;
import java.io.Reader;
@@ -36,6 +36,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.WriterOutputStream;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.scripting.SlingBindings;
+import org.apache.sling.graphql.core.engine.GraphQLResourceQuery;
import graphql.ExecutionResult;
@@ -75,7 +76,9 @@ public class GraphQLScriptEngine extends AbstractScriptEngine {
if (data == null) {
throw new ScriptException("No data");
}
- new JsonWriter(new WriterOutputStream(out)).write(data);
+ try(JsonWriter w = new JsonWriter(new WriterOutputStream(out))) {
+ w.write(data);
+ }
}
@Override
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactory.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngineFactory.java
similarity index 95%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactory.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngineFactory.java
index 1a94974..0c527eb 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactory.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngineFactory.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.engine;
+package org.apache.sling.graphql.core.scripting;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
import org.apache.sling.graphql.api.SchemaProvider;
-import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
+import org.apache.sling.graphql.core.schema.DataFetcherSelector;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactoryConfiguration.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngineFactoryConfiguration.java
similarity index 97%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactoryConfiguration.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngineFactoryConfiguration.java
index 77c5dbc..1f99167 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactoryConfiguration.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngineFactoryConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.gql.engine;
+package org.apache.sling.graphql.core.scripting;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
similarity index 95%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
index 90f1fbc..64cc5f9 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
@@ -18,7 +18,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.servlet;
+package org.apache.sling.graphql.core.servlet;
import java.io.IOException;
@@ -30,9 +30,9 @@ import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.graphql.api.SchemaProvider;
-import org.apache.sling.scripting.gql.engine.GraphQLResourceQuery;
-import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
-import org.apache.sling.scripting.gql.engine.GraphQLScriptEngine;
+import org.apache.sling.graphql.core.engine.GraphQLResourceQuery;
+import org.apache.sling.graphql.core.schema.DataFetcherSelector;
+import org.apache.sling.graphql.core.scripting.GraphQLScriptEngine;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Reference;
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/RequestParser.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/servlet/RequestParser.java
similarity index 98%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/RequestParser.java
rename to graphql-scripting/src/main/java/org/apache/sling/graphql/core/servlet/RequestParser.java
index 37ea587..bf9751d 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/RequestParser.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/core/servlet/RequestParser.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.servlet;
+package org.apache.sling.graphql.core.servlet;
import org.apache.commons.io.input.ReaderInputStream;
import org.apache.sling.api.SlingHttpServletRequest;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQueryTest.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/engine/GraphQLResourceQueryTest.java
similarity index 94%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQueryTest.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/engine/GraphQLResourceQueryTest.java
index ce3e539..a3343af 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQueryTest.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/engine/GraphQLResourceQueryTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.gql.engine;
+package org.apache.sling.graphql.core.engine;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
@@ -30,9 +30,10 @@ import java.util.UUID;
import com.cedarsoftware.util.io.JsonWriter;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
-import org.apache.sling.scripting.gql.schema.MockDataFetcherSelector;
import org.apache.sling.graphql.api.SchemaProvider;
+import org.apache.sling.graphql.core.schema.DataFetcherSelector;
+import org.apache.sling.graphql.core.mocks.MockDataFetcherSelector;
+import org.apache.sling.graphql.core.mocks.MockSchemaProvider;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/BasicContentIT.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/BasicContentIT.java
similarity index 98%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/BasicContentIT.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/BasicContentIT.java
index ea00a31..de1b625 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/BasicContentIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/BasicContentIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.graphql.it;
+package org.apache.sling.graphql.core.it;
import javax.inject.Inject;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptEngineIT.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLScriptEngineIT.java
similarity index 97%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptEngineIT.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLScriptEngineIT.java
index f992b66..8e0574b 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptEngineIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLScriptEngineIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.graphql.it;
+package org.apache.sling.graphql.core.it;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptingTestSupport.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLScriptingTestSupport.java
similarity index 97%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptingTestSupport.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLScriptingTestSupport.java
index 0a35f43..39654a2 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptingTestSupport.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLScriptingTestSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.graphql.it;
+package org.apache.sling.graphql.core.it;
import javax.inject.Inject;
import javax.script.ScriptEngineFactory;
@@ -175,7 +175,11 @@ public abstract class GraphQLScriptingTestSupport extends TestSupport {
protected MockSlingHttpServletResponse executeRequest(final String method,
final String path, Map<String, Object> params, final int expectedStatus) throws Exception {
+
+ // Admin resolver is fine for testing
+ @SuppressWarnings("deprecation")
final ResourceResolver resourceResolver = resourceResolverFactory.getAdministrativeResourceResolver(null);
+
assertNotNull("Expecting ResourceResolver", resourceResolver);
final MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(resourceResolver) {
@Override
@@ -203,7 +207,11 @@ public abstract class GraphQLScriptingTestSupport extends TestSupport {
protected MockSlingHttpServletResponse executePostRequest(final String path,
final String body, final String contentType, final int expectedStatus) throws Exception {
+
+ // Admin resolver is fine for testing
+ @SuppressWarnings("deprecation")
final ResourceResolver resourceResolver = resourceResolverFactory.getAdministrativeResourceResolver(null);
+
assertNotNull("Expecting ResourceResolver", resourceResolver);
final MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(resourceResolver) {
@Override
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletIT.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java
similarity index 99%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletIT.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java
index 62fa9e4..a6ea260 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.graphql.it;
+package org.apache.sling.graphql.core.it;
import javax.inject.Inject;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletNoConfigIT.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java
similarity index 97%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletNoConfigIT.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java
index 8367fa8..8fa318f 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletNoConfigIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.graphql.it;
+package org.apache.sling.graphql.core.it;
import javax.inject.Inject;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/PipeDataFetcherFactory.java
similarity index 97%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/PipeDataFetcherFactory.java
index e9fe618..2ec6f45 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/it/PipeDataFetcherFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.scripting.graphql.it;
+package org.apache.sling.graphql.core.it;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/mocks/MockDataFetcherSelector.java
similarity index 97%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/mocks/MockDataFetcherSelector.java
index 9a7c7c0..1fbe172 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/mocks/MockDataFetcherSelector.java
@@ -17,13 +17,14 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.schema;
+package org.apache.sling.graphql.core.mocks;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.graphql.api.graphqljava.DataFetcherProvider;
+import org.apache.sling.graphql.core.schema.DataFetcherSelector;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
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/graphql/core/mocks/MockSchemaProvider.java
similarity index 94%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/MockSchemaProvider.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/mocks/MockSchemaProvider.java
index 5476507..009902a 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/MockSchemaProvider.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/mocks/MockSchemaProvider.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.gql.engine;
+package org.apache.sling.graphql.core.mocks;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.graphql.api.SchemaProvider;
-class MockSchemaProvider implements SchemaProvider {
+public class MockSchemaProvider implements SchemaProvider {
private static final String MOCK_SCHEMA =
"type Query {\n"
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionTest.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/schema/DataFetcherDefinitionTest.java
similarity index 98%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionTest.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/schema/DataFetcherDefinitionTest.java
index 07eb31a..3348d1d 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionTest.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/schema/DataFetcherDefinitionTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.scripting.gql.schema;
+package org.apache.sling.graphql.core.schema;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/schema/DataFetcherSelectorTest.java
similarity index 97%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java
rename to graphql-scripting/src/test/java/org/apache/sling/graphql/core/schema/DataFetcherSelectorTest.java
index 50f5178..fdabf88 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/graphql/core/schema/DataFetcherSelectorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sling.scripting.gql.schema;
+package org.apache.sling.graphql.core.schema;
import graphql.schema.DataFetcher;
import org.apache.sling.graphql.api.graphqljava.DataFetcherProvider;
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertNull;
public class DataFetcherSelectorTest {
@Test
+ @SuppressWarnings("unchecked")
public void testGetDataFetcher() {
DataFetcher<Object> gqlFetcher1 = (DataFetcher<Object>) Mockito.mock(DataFetcher.class);
DataFetcher<Object> gqlFetcher2 = (DataFetcher<Object>) Mockito.mock(DataFetcher.class);