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 6e4d978acd663eff7c3644ec95711c286fa0f9d4 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Wed Apr 22 13:09:36 2020 +0200 Rename API package --- .../sling/{scripting/gql => graphql}/api/DataFetcherDefinition.java | 2 +- .../sling/{scripting/gql => graphql}/api/DataFetcherProvider.java | 2 +- .../apache/sling/{scripting/gql => graphql}/api/SchemaProvider.java | 2 +- .../org/apache/sling/{scripting/gql => graphql}/api/package-info.java | 2 +- .../org/apache/sling/scripting/gql/engine/GraphQLResourceQuery.java | 2 +- .../apache/sling/scripting/gql/engine/GraphQLScriptEngineFactory.java | 2 +- .../apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java | 2 +- .../org/apache/sling/scripting/gql/schema/DataFetcherSelector.java | 4 ++-- .../org/apache/sling/scripting/gql/schema/DefaultSchemaProvider.java | 2 +- .../java/org/apache/sling/scripting/gql/servlet/GraphQLServlet.java | 2 +- .../apache/sling/scripting/gql/engine/GraphQLResourceQueryTest.java | 2 +- .../org/apache/sling/scripting/gql/engine/MockSchemaProvider.java | 2 +- .../apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java | 2 +- .../apache/sling/scripting/gql/schema/MockDataFetcherSelector.java | 4 ++-- .../sling/scripting/graphql/it/GraphQLScriptingTestSupport.java | 2 +- .../org/apache/sling/scripting/graphql/it/PipeDataFetcherFactory.java | 4 ++-- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherDefinition.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/DataFetcherDefinition.java similarity index 95% rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherDefinition.java rename to graphql-scripting/src/main/java/org/apache/sling/graphql/api/DataFetcherDefinition.java index 1a8f09e..bfe5c31 100644 --- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherDefinition.java +++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/DataFetcherDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.scripting.gql.api; +package org.apache.sling.graphql.api; import aQute.bnd.annotation.ProviderType; diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherProvider.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/DataFetcherProvider.java similarity index 96% rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherProvider.java rename to graphql-scripting/src/main/java/org/apache/sling/graphql/api/DataFetcherProvider.java index e0b6bc1..8c37d79 100644 --- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/DataFetcherProvider.java +++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/DataFetcherProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.scripting.gql.api; +package org.apache.sling.graphql.api; import aQute.bnd.annotation.ConsumerType; import graphql.schema.DataFetcher; diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/SchemaProvider.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java similarity index 97% rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/SchemaProvider.java rename to graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java index eeef129..d876ac1 100644 --- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/SchemaProvider.java +++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/SchemaProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sling.scripting.gql.api; +package org.apache.sling.graphql.api; import java.io.IOException; diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/package-info.java b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/package-info.java similarity index 90% rename from graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/package-info.java rename to graphql-scripting/src/main/java/org/apache/sling/graphql/api/package-info.java index d89c510..dc831ff 100644 --- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/api/package-info.java +++ b/graphql-scripting/src/main/java/org/apache/sling/graphql/api/package-info.java @@ -18,6 +18,6 @@ */ @Version("1.0.0") -package org.apache.sling.scripting.gql.api; +package org.apache.sling.graphql.api; import org.osgi.annotation.versioning.Version; \ No newline at end of file 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 c015f15..28dd5d9 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,7 +25,7 @@ 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.api.SchemaProvider; +import org.apache.sling.graphql.api.SchemaProvider; import org.apache.sling.scripting.gql.schema.DataFetcherDefinitionImpl; import org.apache.sling.scripting.gql.schema.DataFetcherSelector; import org.slf4j.Logger; 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 50ee0c6..1a94974 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.api.SchemaProvider; +import org.apache.sling.graphql.api.SchemaProvider; import org.apache.sling.scripting.gql.schema.DataFetcherSelector; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Activate; diff --git a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java index e9c923b..23d2404 100644 --- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java +++ b/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherDefinitionImpl.java @@ -20,7 +20,7 @@ package org.apache.sling.scripting.gql.schema; -import org.apache.sling.scripting.gql.api.DataFetcherDefinition; +import org.apache.sling.graphql.api.DataFetcherDefinition; 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/scripting/gql/schema/DataFetcherSelector.java index 0f83aac..4caa635 100644 --- a/graphql-scripting/src/main/java/org/apache/sling/scripting/gql/schema/DataFetcherSelector.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.DataFetcherProvider; -import org.apache.sling.scripting.gql.api.DataFetcherDefinition; +import org.apache.sling.graphql.api.DataFetcherProvider; +import org.apache.sling.graphql.api.DataFetcherDefinition; import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; 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 1899b31..7afbb09 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 @@ -27,7 +27,7 @@ import javax.servlet.ServletException; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.engine.SlingRequestProcessor; -import org.apache.sling.scripting.gql.api.SchemaProvider; +import org.apache.sling.graphql.api.SchemaProvider; import org.apache.sling.servlethelpers.MockSlingHttpServletRequest; import org.apache.sling.servlethelpers.MockSlingHttpServletResponse; import org.osgi.framework.Constants; 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 939590d..c7d3aa5 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 @@ -31,7 +31,7 @@ import org.apache.sling.api.SlingHttpServletRequest; 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.api.SchemaProvider; +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; 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 0d4e3fe..af74124 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 @@ -33,7 +33,7 @@ import com.google.gson.Gson; 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.scripting.gql.api.SchemaProvider; +import org.apache.sling.graphql.api.SchemaProvider; import org.junit.Test; import org.mockito.Mockito; 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 1eadc78..583d42b 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 @@ -19,7 +19,7 @@ package org.apache.sling.scripting.gql.engine; import org.apache.sling.api.resource.Resource; -import org.apache.sling.scripting.gql.api.SchemaProvider; +import org.apache.sling.graphql.api.SchemaProvider; class MockSchemaProvider implements SchemaProvider { 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/scripting/gql/schema/DataFetcherSelectorTest.java index ae19ae2..cdcd814 100644 --- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java +++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/DataFetcherSelectorTest.java @@ -20,7 +20,7 @@ package org.apache.sling.scripting.gql.schema; import graphql.schema.DataFetcher; -import org.apache.sling.scripting.gql.api.DataFetcherProvider; +import org.apache.sling.graphql.api.DataFetcherProvider; import org.junit.Test; import org.mockito.Mockito; 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/scripting/gql/schema/MockDataFetcherSelector.java index fe501e9..5a75a07 100644 --- a/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java +++ b/graphql-scripting/src/test/java/org/apache/sling/scripting/gql/schema/MockDataFetcherSelector.java @@ -22,8 +22,8 @@ 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.DataFetcherProvider; -import org.apache.sling.scripting.gql.api.DataFetcherDefinition; +import org.apache.sling.graphql.api.DataFetcherProvider; +import org.apache.sling.graphql.api.DataFetcherDefinition; import java.util.LinkedHashMap; import java.util.Map; 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 14c7d0b..be63cc8 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.DataFetcherProvider; +import org.apache.sling.graphql.api.DataFetcherProvider; import org.apache.sling.servlethelpers.MockSlingHttpServletRequest; import org.apache.sling.servlethelpers.MockSlingHttpServletResponse; import org.apache.sling.testing.paxexam.TestSupport; 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 1a2687f..0c1120a 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,8 +22,8 @@ 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.DataFetcherDefinition; -import org.apache.sling.scripting.gql.api.DataFetcherProvider; +import org.apache.sling.graphql.api.DataFetcherDefinition; +import org.apache.sling.graphql.api.DataFetcherProvider; public class PipeDataFetcherFactory implements DataFetcherProvider {
