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 10:43:57 UTC
[sling-whiteboard] branch master updated (2ed2ed2 -> 0e63704)
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-whiteboard.git.
from 2ed2ed2 Merge pull request #53 from stefangrimm/graphql-datafetchers
new 3fa2ffe Unused imports
new 0e63704 Bunch of renames
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:
...herDefinition.java => DataFetcherDefinition.java} | 2 +-
...aFetcherFactory.java => DataFetcherProvider.java} | 4 ++--
.../scripting/gql/engine/GraphQLResourceQuery.java | 14 +++++++-------
.../gql/engine/GraphQLScriptEngineFactory.java | 6 +++---
...itionImpl.java => DataFetcherDefinitionImpl.java} | 6 +++---
...{FetcherManager.java => DataFetcherSelector.java} | 18 +++++++++---------
.../sling/scripting/gql/servlet/GraphQLServlet.java | 4 ++--
.../gql/engine/GraphQLResourceQueryTest.java | 6 +++---
...itionTest.java => DataFetcherDefinitionTest.java} | 10 +++++-----
...ManagerTest.java => DataFetcherSelectorTest.java} | 20 ++++++++++----------
...cherManager.java => MockDataFetcherSelector.java} | 16 ++++++++--------
.../sling/scripting/graphql/it/BasicContentIT.java | 3 ---
.../graphql/it/GraphQLScriptingTestSupport.java | 6 +++---
.../sling/scripting/graphql/it/GraphQLServletIT.java | 5 -----
.../graphql/it/GraphQLServletNoConfigIT.java | 2 --
.../scripting/graphql/it/PipeDataFetcherFactory.java | 13 ++++++-------
16 files changed, 62 insertions(+), 73 deletions(-)
rename graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/{FetcherDefinition.java => DataFetcherDefinition.java} (96%)
rename graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/{DataFetcherFactory.java => DataFetcherProvider.java} (89%)
rename graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/{FetcherDefinitionImpl.java => DataFetcherDefinitionImpl.java} (92%)
rename graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/{FetcherManager.java => DataFetcherSelector.java} (77%)
rename graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/{FetcherDefinitionTest.java => DataFetcherDefinitionTest.java} (89%)
rename graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/{FetcherManagerTest.java => DataFetcherSelectorTest.java} (72%)
rename graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/{MockFetcherManager.java => MockDataFetcherSelector.java} (82%)
[sling-whiteboard] 02/02: Bunch of renames
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-whiteboard.git
commit 0e63704308655e2e5df74be4a32e3c75caf0ff48
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Apr 22 12:43:45 2020 +0200
Bunch of renames
---
...herDefinition.java => DataFetcherDefinition.java} | 2 +-
...aFetcherFactory.java => DataFetcherProvider.java} | 4 ++--
.../scripting/gql/engine/GraphQLResourceQuery.java | 14 +++++++-------
.../gql/engine/GraphQLScriptEngineFactory.java | 6 +++---
...itionImpl.java => DataFetcherDefinitionImpl.java} | 6 +++---
...{FetcherManager.java => DataFetcherSelector.java} | 18 +++++++++---------
.../sling/scripting/gql/servlet/GraphQLServlet.java | 4 ++--
.../gql/engine/GraphQLResourceQueryTest.java | 6 +++---
...itionTest.java => DataFetcherDefinitionTest.java} | 10 +++++-----
...ManagerTest.java => DataFetcherSelectorTest.java} | 20 ++++++++++----------
...cherManager.java => MockDataFetcherSelector.java} | 16 ++++++++--------
.../graphql/it/GraphQLScriptingTestSupport.java | 6 +++---
.../scripting/graphql/it/PipeDataFetcherFactory.java | 12 ++++++------
13 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/FetcherDefinition.java b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherDefinition.java
similarity index 96%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/FetcherDefinition.java
rename to graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherDefinition.java
index 9c4f134..1a8f09e 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/FetcherDefinition.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherDefinition.java
@@ -22,7 +22,7 @@ package org.apache.sling.scripting.gql.api;
import aQute.bnd.annotation.ProviderType;
@ProviderType
-public interface FetcherDefinition {
+public interface DataFetcherDefinition {
String getFetcherNamespace();
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherFactory.java b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherProvider.java
similarity index 89%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherFactory.java
rename to graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherProvider.java
index 644e173..e0b6bc1 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherFactory.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherProvider.java
@@ -24,12 +24,12 @@ import graphql.schema.DataFetcher;
import org.apache.sling.api.resource.Resource;
@ConsumerType
-public interface DataFetcherFactory {
+public interface DataFetcherProvider {
String getNamespace();
String getName();
- DataFetcher<Object> createDataFetcher(FetcherDefinition fetcherDef, Resource r);
+ DataFetcher<Object> createDataFetcher(DataFetcherDefinition fetcherDef, Resource r);
}
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/scripting/gql/engine/GraphQLResourceQuery.java
index b271d29..1810391 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQuery.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQuery.java
@@ -25,8 +25,8 @@ import graphql.language.Comment;
import graphql.language.FieldDefinition;
import graphql.language.ObjectTypeDefinition;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.scripting.gql.schema.FetcherDefinitionImpl;
-import org.apache.sling.scripting.gql.schema.FetcherManager;
+import org.apache.sling.scripting.gql.schema.DataFetcherDefinitionImpl;
+import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
import org.apache.sling.scripting.gql.schema.GraphQLSchemaProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ public class GraphQLResourceQuery {
private final Logger log = LoggerFactory.getLogger(getClass());
- public ExecutionResult executeQuery(GraphQLSchemaProvider schemaProvider, FetcherManager fetchers,
+ public ExecutionResult executeQuery(GraphQLSchemaProvider schemaProvider, DataFetcherSelector fetchers,
Resource r, String query) throws ScriptException {
if(r == null) {
throw new ScriptException("Resource is null");
@@ -81,14 +81,14 @@ public class GraphQLResourceQuery {
}
}
- private GraphQLSchema buildSchema(String sdl, FetcherManager fetchers, Resource r) {
+ private GraphQLSchema buildSchema(String sdl, DataFetcherSelector fetchers, Resource r) {
TypeDefinitionRegistry typeRegistry = new SchemaParser().parse(sdl);
RuntimeWiring runtimeWiring = buildWiring(typeRegistry, fetchers, r);
SchemaGenerator schemaGenerator = new SchemaGenerator();
return schemaGenerator.makeExecutableSchema(typeRegistry, runtimeWiring);
}
- private RuntimeWiring buildWiring(TypeDefinitionRegistry typeRegistry, FetcherManager fetchers, Resource r) {
+ private RuntimeWiring buildWiring(TypeDefinitionRegistry typeRegistry, DataFetcherSelector fetchers, Resource r) {
List<ObjectTypeDefinition> types = typeRegistry.getTypes(ObjectTypeDefinition.class);
RuntimeWiring.Builder builder = RuntimeWiring.newRuntimeWiring();
for (ObjectTypeDefinition type : types) {
@@ -107,7 +107,7 @@ public class GraphQLResourceQuery {
return builder.build();
}
- private DataFetcher<Object> getDataFetcher(FieldDefinition field, FetcherManager fetchers,
+ private DataFetcher<Object> getDataFetcher(FieldDefinition field, DataFetcherSelector fetchers,
Resource r) {
List<Comment> comments = field.getComments();
for (Comment comment : comments) {
@@ -117,7 +117,7 @@ public class GraphQLResourceQuery {
commentStr = commentStr.substring(1).trim();
try {
- FetcherDefinitionImpl def = new FetcherDefinitionImpl(commentStr);
+ DataFetcherDefinitionImpl def = new DataFetcherDefinitionImpl(commentStr);
DataFetcher<Object> fetcher = fetchers.getDataFetcherForType(def, r);
if (fetcher != null) {
return fetcher;
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/scripting/gql/engine/GraphQLScriptEngineFactory.java
index 67a1208..6716b07 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactory.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/engine/GraphQLScriptEngineFactory.java
@@ -23,7 +23,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import org.apache.sling.scripting.api.AbstractScriptEngineFactory;
-import org.apache.sling.scripting.gql.schema.FetcherManager;
+import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
import org.apache.sling.scripting.gql.schema.GraphQLSchemaProvider;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
@@ -53,7 +53,7 @@ public class GraphQLScriptEngineFactory extends AbstractScriptEngineFactory {
private GraphQLSchemaProvider schemaProvider;
@Reference
- private FetcherManager fetcherManager;
+ private DataFetcherSelector fetcherManager;
@Activate
private void activate(final GraphQLScriptEngineFactoryConfiguration config) {
@@ -81,7 +81,7 @@ public class GraphQLScriptEngineFactory extends AbstractScriptEngineFactory {
return schemaProvider;
}
- FetcherManager getFetcherManager() {
+ DataFetcherSelector getFetcherManager() {
return fetcherManager;
}
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/FetcherDefinitionImpl.java b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java
similarity index 92%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/FetcherDefinitionImpl.java
rename to graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java
index 61fdb37..e9c923b 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/FetcherDefinitionImpl.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java
@@ -20,12 +20,12 @@
package org.apache.sling.scripting.gql.schema;
-import org.apache.sling.scripting.gql.api.FetcherDefinition;
+import org.apache.sling.scripting.gql.api.DataFetcherDefinition;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class FetcherDefinitionImpl implements FetcherDefinition {
+public class DataFetcherDefinitionImpl implements DataFetcherDefinition {
public final String fetcherNamespace;
public final String fetcherName;
public final String fetcherOptions;
@@ -39,7 +39,7 @@ public class FetcherDefinitionImpl implements FetcherDefinition {
/** Creates a definition from a formatted String like
*
*/
- public FetcherDefinitionImpl(String fetcherDef) {
+ public DataFetcherDefinitionImpl(String fetcherDef) {
if(fetcherDef == null) {
throw new IllegalArgumentException("Invalid input: " + fetcherDef);
}
diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/FetcherManager.java b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.java
similarity index 77%
rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/FetcherManager.java
rename to graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.java
index d8181ca..0f83aac 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/FetcherManager.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.java
@@ -21,8 +21,8 @@ package org.apache.sling.scripting.gql.schema;
import graphql.schema.DataFetcher;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
-import org.apache.sling.scripting.gql.api.FetcherDefinition;
+import org.apache.sling.scripting.gql.api.DataFetcherProvider;
+import org.apache.sling.scripting.gql.api.DataFetcherDefinition;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,30 +33,30 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-@Component(service = FetcherManager.class, immediate = true, property = {
+@Component(service = DataFetcherSelector.class, immediate = true, property = {
Constants.SERVICE_DESCRIPTION + "=Apache Sling Scripting GraphQL FetcherManager",
Constants.SERVICE_VENDOR + "=The Apache Software Foundation" })
-public class FetcherManager {
+public class DataFetcherSelector {
@Reference(
name = "slingFetchers",
cardinality = ReferenceCardinality.MULTIPLE,
policy = ReferencePolicy.DYNAMIC)
- private final List<DataFetcherFactory> factories = new CopyOnWriteArrayList<>();
+ private final List<DataFetcherProvider> factories = new CopyOnWriteArrayList<>();
- public FetcherManager() {
+ public DataFetcherSelector() {
// public default constructor required ...
}
- FetcherManager(DataFetcherFactory... testFetchers) {
+ DataFetcherSelector(DataFetcherProvider... testFetchers) {
factories.addAll(Arrays.asList(testFetchers));
}
- public DataFetcher<Object> getDataFetcherForType(FetcherDefinition def, Resource r) {
+ public DataFetcher<Object> getDataFetcherForType(DataFetcherDefinition def, Resource r) {
String ns = def.getFetcherNamespace();
String name = def.getFetcherName();
- for (DataFetcherFactory factory : factories) {
+ for (DataFetcherProvider factory : factories) {
if (factory.getNamespace().equals(ns) && factory.getName().equals(name)) {
return factory.createDataFetcher(def, r);
}
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/scripting/gql/servlet/GraphQLServlet.java
index a6ec623..ea4bb38 100644
--- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java
+++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java
@@ -32,7 +32,7 @@ import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.scripting.gql.engine.GraphQLResourceQuery;
-import org.apache.sling.scripting.gql.schema.FetcherManager;
+import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
import org.apache.sling.scripting.gql.schema.GraphQLSchemaProvider;
import org.apache.sling.scripting.gql.engine.GraphQLScriptEngine;
import org.osgi.service.component.annotations.Component;
@@ -101,7 +101,7 @@ public class GraphQLServlet extends SlingAllMethodsServlet {
private GraphQLSchemaProvider schemaProvider;
@Reference
- private FetcherManager fetchers;
+ private DataFetcherSelector fetchers;
@Override
public void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
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/scripting/gql/engine/GraphQLResourceQueryTest.java
index 0328793..2c839ba 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQueryTest.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/engine/GraphQLResourceQueryTest.java
@@ -31,9 +31,9 @@ import java.util.UUID;
import com.google.gson.Gson;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.scripting.gql.schema.FetcherManager;
+import org.apache.sling.scripting.gql.schema.DataFetcherSelector;
import org.apache.sling.scripting.gql.schema.GraphQLSchemaProvider;
-import org.apache.sling.scripting.gql.schema.MockFetcherManager;
+import org.apache.sling.scripting.gql.schema.MockDataFetcherSelector;
import org.junit.Test;
import org.mockito.Mockito;
@@ -41,7 +41,7 @@ import graphql.ExecutionResult;
public class GraphQLResourceQueryTest {
private final GraphQLSchemaProvider schemaProvider = new MockSchemaProvider();
- private final FetcherManager fetchers = new MockFetcherManager();
+ private final DataFetcherSelector fetchers = new MockDataFetcherSelector();
@Test
public void basicTest() throws Exception {
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/FetcherDefinitionTest.java b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionTest.java
similarity index 89%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/FetcherDefinitionTest.java
rename to graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionTest.java
index 19d9e79..da0b483 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/FetcherDefinitionTest.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionTest.java
@@ -31,7 +31,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class FetcherDefinitionTest {
+public class DataFetcherDefinitionTest {
private final String input;
private final String expected;
@@ -53,7 +53,7 @@ public class FetcherDefinitionTest {
return result;
}
- public FetcherDefinitionTest(String input, Object expected) {
+ public DataFetcherDefinitionTest(String input, Object expected) {
this.input = input;
if(expected instanceof String) {
this.expected = (String)expected;
@@ -67,11 +67,11 @@ public class FetcherDefinitionTest {
@Test
public void testMatch() throws Exception {
if(failureClass == null) {
- final FetcherDefinitionImpl d = new FetcherDefinitionImpl(input);
- assertEquals("FetcherDefinitionImpl#" + expected, d.toString());
+ final DataFetcherDefinitionImpl d = new DataFetcherDefinitionImpl(input);
+ assertEquals("DataFetcherDefinitionImpl#" + expected, d.toString());
} else {
try {
- new FetcherDefinitionImpl(input);
+ new DataFetcherDefinitionImpl(input);
fail("Expecting a " + failureClass.getName());
} catch(Throwable t) {
assertEquals("Expecting a " + failureClass.getName(), failureClass, t.getClass());
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/FetcherManagerTest.java b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java
similarity index 72%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/FetcherManagerTest.java
rename to graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java
index 402025d..ae19ae2 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/FetcherManagerTest.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java
@@ -20,48 +20,48 @@
package org.apache.sling.scripting.gql.schema;
import graphql.schema.DataFetcher;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
+import org.apache.sling.scripting.gql.api.DataFetcherProvider;
import org.junit.Test;
import org.mockito.Mockito;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-public class FetcherManagerTest {
+public class DataFetcherSelectorTest {
@Test
public void testGetDataFetcher() {
DataFetcher<Object> gqlFetcher1 = (DataFetcher<Object>) Mockito.mock(DataFetcher.class);
DataFetcher<Object> gqlFetcher2 = (DataFetcher<Object>) Mockito.mock(DataFetcher.class);
DataFetcher<Object> gqlFetcher3 = (DataFetcher<Object>) Mockito.mock(DataFetcher.class);
- DataFetcherFactory fetcher1 = Mockito.mock(DataFetcherFactory.class);
+ DataFetcherProvider fetcher1 = Mockito.mock(DataFetcherProvider.class);
Mockito.when(fetcher1.getNamespace()).thenReturn("ns1");
Mockito.when(fetcher1.getName()).thenReturn("name1");
Mockito.when(fetcher1.createDataFetcher(Mockito.any(), Mockito.any()))
.thenReturn(gqlFetcher1);
- DataFetcherFactory fetcher2 = Mockito.mock(DataFetcherFactory.class);
+ DataFetcherProvider fetcher2 = Mockito.mock(DataFetcherProvider.class);
Mockito.when(fetcher2.getNamespace()).thenReturn("ns2");
Mockito.when(fetcher2.getName()).thenReturn("name2");
Mockito.when(fetcher2.createDataFetcher(Mockito.any(), Mockito.any()))
.thenReturn(gqlFetcher2);
- DataFetcherFactory fetcher3 = Mockito.mock(DataFetcherFactory.class);
+ DataFetcherProvider fetcher3 = Mockito.mock(DataFetcherProvider.class);
Mockito.when(fetcher3.getNamespace()).thenReturn("ns1");
Mockito.when(fetcher3.getName()).thenReturn("name2");
Mockito.when(fetcher3.createDataFetcher(Mockito.any(), Mockito.any()))
.thenReturn(gqlFetcher3);
- FetcherManager fetchers = new FetcherManager(fetcher1, fetcher2, fetcher3);
+ DataFetcherSelector fetchers = new DataFetcherSelector(fetcher1, fetcher2, fetcher3);
assertEquals(
gqlFetcher1,
- fetchers.getDataFetcherForType(new FetcherDefinitionImpl("fetch:ns1/name1"), null));
+ fetchers.getDataFetcherForType(new DataFetcherDefinitionImpl("fetch:ns1/name1"), null));
assertEquals(
gqlFetcher2,
- fetchers.getDataFetcherForType(new FetcherDefinitionImpl("fetch:ns2/name2"), null));
+ fetchers.getDataFetcherForType(new DataFetcherDefinitionImpl("fetch:ns2/name2"), null));
assertEquals(
gqlFetcher3,
- fetchers.getDataFetcherForType(new FetcherDefinitionImpl("fetch:ns1/name2"), null));
+ fetchers.getDataFetcherForType(new DataFetcherDefinitionImpl("fetch:ns1/name2"), null));
assertNull(
- fetchers.getDataFetcherForType(new FetcherDefinitionImpl("fetch:ns2/name1"), null));
+ fetchers.getDataFetcherForType(new DataFetcherDefinitionImpl("fetch:ns2/name1"), null));
}
}
diff --git a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockFetcherManager.java b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java
similarity index 82%
rename from graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockFetcherManager.java
rename to graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java
index dfc5c4c..fe501e9 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockFetcherManager.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java
@@ -22,13 +22,13 @@ package org.apache.sling.scripting.gql.schema;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
-import org.apache.sling.scripting.gql.api.FetcherDefinition;
+import org.apache.sling.scripting.gql.api.DataFetcherProvider;
+import org.apache.sling.scripting.gql.api.DataFetcherDefinition;
import java.util.LinkedHashMap;
import java.util.Map;
-public class MockFetcherManager extends FetcherManager {
+public class MockDataFetcherSelector extends DataFetcherSelector {
static class EchoDataFetcher implements DataFetcher<Object> {
@@ -45,7 +45,7 @@ public class MockFetcherManager extends FetcherManager {
}
- static class EchoDataFetcherFactory implements DataFetcherFactory {
+ static class EchoDataFetcherFactory implements DataFetcherProvider {
@Override
public String getNamespace() {
@@ -58,7 +58,7 @@ public class MockFetcherManager extends FetcherManager {
}
@Override
- public DataFetcher<Object> createDataFetcher(FetcherDefinition fetcherDef, Resource r) {
+ public DataFetcher<Object> createDataFetcher(DataFetcherDefinition fetcherDef, Resource r) {
return new EchoDataFetcher(r);
}
}
@@ -78,7 +78,7 @@ public class MockFetcherManager extends FetcherManager {
}
- static class StaticDataFetcherFactory implements DataFetcherFactory {
+ static class StaticDataFetcherFactory implements DataFetcherProvider {
@Override
public String getNamespace() {
@@ -91,14 +91,14 @@ public class MockFetcherManager extends FetcherManager {
}
@Override
- public DataFetcher<Object> createDataFetcher(FetcherDefinition fetcherDef, Resource r) {
+ public DataFetcher<Object> createDataFetcher(DataFetcherDefinition fetcherDef, Resource r) {
Map<String, Object> data = new LinkedHashMap<>(4);
data.put("test", true);
return new StaticDataFetcher(data);
}
}
- public MockFetcherManager() {
+ public MockDataFetcherSelector() {
super(new EchoDataFetcherFactory(), new StaticDataFetcherFactory());
}
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/scripting/graphql/it/GraphQLScriptingTestSupport.java
index 6863bdc..14c7d0b 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptingTestSupport.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLScriptingTestSupport.java
@@ -23,7 +23,7 @@ import javax.script.ScriptEngineFactory;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
+import org.apache.sling.scripting.gql.api.DataFetcherProvider;
import org.apache.sling.servlethelpers.MockSlingHttpServletRequest;
import org.apache.sling.servlethelpers.MockSlingHttpServletResponse;
import org.apache.sling.testing.paxexam.TestSupport;
@@ -74,7 +74,7 @@ public abstract class GraphQLScriptingTestSupport extends TestSupport {
@Inject
protected SlingRequestProcessor requestProcessor;
- protected ServiceRegistration<DataFetcherFactory> dataFetcherFactoryRegistration;
+ protected ServiceRegistration<DataFetcherProvider> dataFetcherFactoryRegistration;
@Inject
private BundleContext bundleContext;
@@ -83,7 +83,7 @@ public abstract class GraphQLScriptingTestSupport extends TestSupport {
public void registerFetchers() {
PipeDataFetcherFactory pipeDataFetcherFactory = new PipeDataFetcherFactory();
dataFetcherFactoryRegistration =
- bundleContext.registerService(DataFetcherFactory.class, pipeDataFetcherFactory, null);
+ bundleContext.registerService(DataFetcherProvider.class, pipeDataFetcherFactory, null);
}
@After
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/scripting/graphql/it/PipeDataFetcherFactory.java
index e68ae29..1a2687f 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java
@@ -22,18 +22,18 @@ package org.apache.sling.scripting.graphql.it;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.scripting.gql.api.FetcherDefinition;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
+import org.apache.sling.scripting.gql.api.DataFetcherDefinition;
+import org.apache.sling.scripting.gql.api.DataFetcherProvider;
-public class PipeDataFetcherFactory implements DataFetcherFactory {
+public class PipeDataFetcherFactory implements DataFetcherProvider {
static class PipeDataFetcher implements DataFetcher<Object> {
- private final FetcherDefinition fetcherDef;
+ private final DataFetcherDefinition fetcherDef;
private final Resource r;
- PipeDataFetcher(FetcherDefinition fetcherDef, Resource r) {
+ PipeDataFetcher(DataFetcherDefinition fetcherDef, Resource r) {
this.fetcherDef = fetcherDef;
this.r = r;
}
@@ -61,7 +61,7 @@ public class PipeDataFetcherFactory implements DataFetcherFactory {
}
@Override
- public DataFetcher<Object> createDataFetcher(FetcherDefinition fetcherDef, Resource r) {
+ public DataFetcher<Object> createDataFetcher(DataFetcherDefinition fetcherDef, Resource r) {
return new PipeDataFetcher(fetcherDef, r);
}
}
[sling-whiteboard] 01/02: Unused imports
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-whiteboard.git
commit 3fa2ffea841cf286efbe79bb439b256f75c16315
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Apr 22 12:29:37 2020 +0200
Unused imports
---
.../java/org/apache/sling/scripting/graphql/it/BasicContentIT.java | 3 ---
.../java/org/apache/sling/scripting/graphql/it/GraphQLServletIT.java | 5 -----
.../apache/sling/scripting/graphql/it/GraphQLServletNoConfigIT.java | 2 --
.../apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java | 1 -
4 files changed, 11 deletions(-)
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/scripting/graphql/it/BasicContentIT.java
index 3deb852..a652340 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/BasicContentIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/BasicContentIT.java
@@ -23,7 +23,6 @@ import javax.inject.Inject;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
import org.apache.sling.resource.presence.ResourcePresence;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -32,8 +31,6 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.exam.util.Filter;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
import static org.junit.Assert.assertThat;
import static org.hamcrest.Matchers.equalTo;
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/scripting/graphql/it/GraphQLServletIT.java
index 9dd7d84..865782f 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletIT.java
@@ -24,9 +24,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath;
import org.apache.sling.resource.presence.ResourcePresence;
-import org.apache.sling.scripting.gql.api.DataFetcherFactory;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -35,8 +32,6 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.exam.util.Filter;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
import static org.junit.Assert.assertThat;
import static org.hamcrest.Matchers.equalTo;
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/scripting/graphql/it/GraphQLServletNoConfigIT.java
index 227ada9..8367fa8 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletNoConfigIT.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/GraphQLServletNoConfigIT.java
@@ -20,8 +20,6 @@ package org.apache.sling.scripting.graphql.it;
import javax.inject.Inject;
-import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
-
import org.apache.sling.resource.presence.ResourcePresence;
import org.junit.Test;
import org.junit.runner.RunWith;
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/scripting/graphql/it/PipeDataFetcherFactory.java
index f5269f1..e68ae29 100644
--- a/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java
+++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java
@@ -23,7 +23,6 @@ import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.scripting.gql.api.FetcherDefinition;
-import org.apache.sling.scripting.gql.schema.FetcherDefinitionImpl;
import org.apache.sling.scripting.gql.api.DataFetcherFactory;
public class PipeDataFetcherFactory implements DataFetcherFactory {