[sling-whiteboard] branch master updated: Use 'final' servlet component name

[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


The following commit(s) were added to refs/heads/master by this push:
     new 8fad128  Use 'final' servlet component name
8fad128 is described below

commit 8fad1285c517f467d882b175b410566b4d8c0c2e
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Apr 22 11:22:17 2020 +0200

    Use 'final' servlet component name
---
 .../java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java | 1 +
 .../org/apache/sling/scripting/graphql/it/GraphQLServletIT.java     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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 44466f8..7c17213 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
@@ -57,6 +57,7 @@ import graphql.ExecutionResult;
 
 @Component(
     service = Servlet.class,
+    name = "org.apache.sling.graphql.core.GraphQLServlet",
     immediate = true,
     configurationPolicy=ConfigurationPolicy.REQUIRE,
     property = {
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 4ac771e..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
@@ -45,6 +45,8 @@ public class GraphQLServletIT extends GraphQLScriptingTestSupport {
     @Filter(value = "(path=/content/graphql/two)")
     private ResourcePresence resourcePresence;
 
+    private static final String GRAPHQL_SERVLET_CONFIG_PID = "org.apache.sling.graphql.core.GraphQLServlet";
+
     @Configuration
     public Option[] configuration() {
         return new Option[]{
@@ -54,11 +56,11 @@ public class GraphQLServletIT extends GraphQLScriptingTestSupport {
                 .asOption(),
 
             // The GraphQL servlet is disabled by default, try setting up two of them
-            factoryConfiguration("org.apache.sling.scripting.gql.servlet.GraphQLServlet")
+            factoryConfiguration(GRAPHQL_SERVLET_CONFIG_PID)
                 .put("sling.servlet.resourceTypes", "sling/servlet/default")
                 .put("sling.servlet.extensions", "gql")
                 .asOption(),
-            factoryConfiguration("org.apache.sling.scripting.gql.servlet.GraphQLServlet")
+            factoryConfiguration(GRAPHQL_SERVLET_CONFIG_PID)
                 .put("sling.servlet.resourceTypes", "graphql/test/two")
                 .put("sling.servlet.selectors", "testing")
                 .put("sling.servlet.extensions", "otherExt")