Rename fetchers
diff --git a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesBySectionFetcher.java b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesBySectionFetcher.java
index 369afec..ddbeeb3 100644
--- a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesBySectionFetcher.java
+++ b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesBySectionFetcher.java
@@ -31,7 +31,7 @@
import org.osgi.service.component.annotations.Component;
/** Find articles that belong to a given section (business, news etc) */
-@Component(service = SlingDataFetcher.class, property = {"name=samples/articlesBySection"})
+@Component(service = SlingDataFetcher.class, property = {"name=website/articlesBySection"})
public class ArticlesBySectionFetcher implements SlingDataFetcher<Object> {
@Override
diff --git a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesWithTextFetcher.java b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesWithTextFetcher.java
index a3b01d1..3fabe9b 100644
--- a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesWithTextFetcher.java
+++ b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/ArticlesWithTextFetcher.java
@@ -31,7 +31,7 @@
import org.osgi.service.component.annotations.Component;
/** Find articles which contain specific text */
-@Component(service = SlingDataFetcher.class, property = {"name=samples/articlesWithText"})
+@Component(service = SlingDataFetcher.class, property = {"name=website/articlesWithText"})
public class ArticlesWithTextFetcher implements SlingDataFetcher<Object> {
public static final String P_WITH_TEXT = "withText";
diff --git a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/CurrentResourceFetcher.java b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/CurrentResourceFetcher.java
index c25e54b..1401fb9 100644
--- a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/CurrentResourceFetcher.java
+++ b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/CurrentResourceFetcher.java
@@ -25,7 +25,7 @@
import org.osgi.service.component.annotations.Component;
/** Convert the current SlingResource to a GraphQL-friendly Map */
-@Component(service = SlingDataFetcher.class, property = {"name=samples/currentResource"})
+@Component(service = SlingDataFetcher.class, property = {"name=website/currentResource"})
public class CurrentResourceFetcher implements SlingDataFetcher<Object> {
@Override
public Object get(SlingDataFetcherEnvironment env) throws Exception {
diff --git a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/NavigationDataFetcher.java b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/NavigationDataFetcher.java
index 5e7ac3f..83891b7 100644
--- a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/NavigationDataFetcher.java
+++ b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/NavigationDataFetcher.java
@@ -36,7 +36,7 @@
/**
* Retrieve navigation information for our website: sections, content root etc.
*/
-@Component(service = SlingDataFetcher.class, property = {"name=samples/navigation"})
+@Component(service = SlingDataFetcher.class, property = {"name=website/navigation"})
public class NavigationDataFetcher implements SlingDataFetcher<Object> {
private Object[] getSections(Resource r) {
diff --git a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/SeeAlsoDataFetcher.java b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/SeeAlsoDataFetcher.java
index 8ac6a59..21f73e6 100644
--- a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/SeeAlsoDataFetcher.java
+++ b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/SeeAlsoDataFetcher.java
@@ -32,7 +32,7 @@
import org.osgi.service.component.annotations.Component;
/** Retrieve additional information for our articles 'seeAlso' field */
-@Component(service = SlingDataFetcher.class, property = {"name=samples/seeAlso"})
+@Component(service = SlingDataFetcher.class, property = {"name=website/seeAlso"})
public class SeeAlsoDataFetcher implements SlingDataFetcher<Object> {
/**
diff --git a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/TagQueryDataFetcher.java b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/TagQueryDataFetcher.java
index a0ec3b4..e7e19f8 100644
--- a/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/TagQueryDataFetcher.java
+++ b/org.apache.sling.graphql.samples.website/src/main/java/org/apache/sling/graphql/samples/website/datafetchers/TagQueryDataFetcher.java
@@ -33,7 +33,7 @@
import org.osgi.service.component.annotations.Component;
/** Retrieve articles which have a given tag or set of tags */
-@Component(service = SlingDataFetcher.class, property = {"name=samples/tagQuery"})
+@Component(service = SlingDataFetcher.class, property = {"name=website/tagQuery"})
public class TagQueryDataFetcher implements SlingDataFetcher<Object> {
static String jcrQuery(String... tags) {
diff --git a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/article/GQLschema.jsp b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/article/GQLschema.jsp
index 446d209..d89816c 100644
--- a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/article/GQLschema.jsp
+++ b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/article/GQLschema.jsp
@@ -21,7 +21,7 @@
type Query {
# The current Article
- article : Article @fetcher(name:"samples/currentResource")
+ article : Article @fetcher(name:"website/currentResource")
<%@include file="../common/common-query-parts.jsp" %>
}
diff --git a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/GQLschema.jsp b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/GQLschema.jsp
index f3b6758..dc232b1 100644
--- a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/GQLschema.jsp
+++ b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/GQLschema.jsp
@@ -44,7 +44,7 @@
path: String
# List of articles in this section
- articles: [Article] @fetcher(name:"samples/articlesBySection")
+ articles: [Article] @fetcher(name:"website/articlesBySection")
}
# Articles are the core content of our website
@@ -57,7 +57,7 @@
section: String
# List of "See Also" articles
- seeAlso: [Article] @fetcher(name:"samples/seeAlso")
+ seeAlso: [Article] @fetcher(name:"website/seeAlso")
}
# A query for articles which have specific tags
diff --git a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/common-query-parts.jsp b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/common-query-parts.jsp
index d050048..90f2dcf 100644
--- a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/common-query-parts.jsp
+++ b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/common/common-query-parts.jsp
@@ -17,4 +17,4 @@
* under the License.
--%>
-navigation: Navigation @fetcher(name:"samples/navigation")
+navigation: Navigation @fetcher(name:"website/navigation")
diff --git a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/section/GQLschema.jsp b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/section/GQLschema.jsp
index 17331b7..e539b82 100644
--- a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/section/GQLschema.jsp
+++ b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/section/GQLschema.jsp
@@ -21,7 +21,7 @@
type Query {
# The current content section
- section: Section @fetcher(name:"samples/currentResource")
+ section: Section @fetcher(name:"website/currentResource")
<%@include file="../common/common-query-parts.jsp" %>
}
diff --git a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/servlet/GQLschema.jsp b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/servlet/GQLschema.jsp
index 8c688da..a085489 100644
--- a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/servlet/GQLschema.jsp
+++ b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/servlet/GQLschema.jsp
@@ -23,7 +23,7 @@
<%@include file="../common/common-query-parts.jsp" %>
# List of Articles which contain the supplied text
- article (withText : String) : [Article] @fetcher(name:"samples/articlesWithText")
+ article (withText : String) : [Article] @fetcher(name:"website/articlesWithText")
}
<%@include file="/apps/samples/common/GQLschema.jsp" %>
\ No newline at end of file
diff --git a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/tag/GQLschema.jsp b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/tag/GQLschema.jsp
index 519afef..f5622b9 100644
--- a/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/tag/GQLschema.jsp
+++ b/org.apache.sling.graphql.samples.website/src/main/resources/SLING-INF/initial-content/apps/samples/tag/GQLschema.jsp
@@ -22,7 +22,7 @@
type Query {
# Find articles which have the current
# set of tags
- tagQuery: TagQuery @fetcher(name:"samples/tagQuery")
+ tagQuery: TagQuery @fetcher(name:"website/tagQuery")
<%@include file="../common/common-query-parts.jsp" %>
}
