feat: reorganize tools starter

oliemansm · oliemansm · commit 58e02d1e5413 · 2021-05-11T15:44:39.000+02:00
diff --git a/graphql-kickstart-spring-boot-autoconfigure-tools/build.gradle b/graphql-kickstart-spring-boot-autoconfigure-tools/build.gradle
diff --git a/graphql-kickstart-spring-boot-autoconfigure-tools/src/main/resources/META-INF/spring.factories b/graphql-kickstart-spring-boot-autoconfigure-tools/src/main/resources/META-INF/spring.factories
diff --git a/graphql-kickstart-spring-boot-starter-tools/build.gradle b/graphql-kickstart-spring-boot-starter-tools/build.gradle
diff --git a/graphql-spring-boot-autoconfigure/build.gradle b/graphql-spring-boot-autoconfigure/build.gradle
@@ -18,7 +18,7 @@
  */
 
 dependencies {
-    api(project(":graphql-kickstart-spring-boot-starter-tools"))
+    api "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
     api(project(":graphql-kickstart-spring-support"))
     api(project(':graphql-kickstart-spring-webflux'))
     implementation "org.springframework.boot:spring-boot-autoconfigure"
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProvider.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProvider.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import static java.util.stream.Collectors.joining;
 
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfiguration.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import static java.util.Objects.nonNull;
 
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLToolsProperties.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/GraphQLToolsProperties.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ListSchemaStringProvider.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/ListSchemaStringProvider.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/SchemaDirective.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/SchemaDirective.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import graphql.schema.idl.SchemaDirectiveWiring;
 
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/SchemaStringProvider.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/tools/SchemaStringProvider.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/GraphQLSpringWebfluxAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/GraphQLSpringWebfluxAutoConfiguration.java
@@ -25,7 +25,7 @@
 import graphql.kickstart.spring.webflux.ReactiveSubscriptionsProtocolFactory;
 import graphql.kickstart.spring.webflux.ReactiveWebSocketSubscriptionsHandler;
 import graphql.kickstart.spring.webflux.apollo.ReactiveApolloSubscriptionProtocolFactory;
-import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
 import graphql.schema.GraphQLSchema;
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/MonoAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/MonoAutoConfiguration.java
@@ -4,7 +4,7 @@
 
 import graphql.kickstart.tools.SchemaParser;
 import graphql.kickstart.tools.SchemaParserOptions.GenericWrapper;
-import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebAutoConfiguration.java
@@ -54,7 +54,7 @@
 import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
 import graphql.kickstart.spring.error.ErrorHandlerSupplier;
 import graphql.kickstart.spring.error.GraphQLErrorStartupListener;
-import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
 import graphql.schema.GraphQLSchema;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
diff --git a/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebsocketAutoConfiguration.java b/graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLWebsocketAutoConfiguration.java
@@ -6,7 +6,7 @@
 import graphql.kickstart.execution.subscriptions.SubscriptionConnectionListener;
 import graphql.kickstart.execution.subscriptions.apollo.KeepAliveSubscriptionConnectionListener;
 import graphql.kickstart.servlet.GraphQLWebsocketServlet;
-import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/graphql-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/graphql-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -5,5 +5,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     graphql.kickstart.autoconfigure.web.servlet.GraphQLWebsocketAutoConfiguration,\
     graphql.kickstart.autoconfigure.web.servlet.GraphQLInstrumentationAutoConfiguration,\
     graphql.kickstart.autoconfigure.web.reactive.GraphQLSpringWebfluxAutoConfiguration,\
-    graphql.kickstart.autoconfigure.web.reactive.MonoAutoConfiguration
+    graphql.kickstart.autoconfigure.web.reactive.MonoAutoConfiguration,\
+    graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration
 
diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/AbstractAutoConfigurationTest.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/AbstractAutoConfigurationTest.java
@@ -1,9 +1,10 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import static org.mockito.Mockito.mock;
 
 import javax.servlet.ServletContext;
 import javax.websocket.server.ServerContainer;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
@@ -40,9 +41,10 @@ public void tearDown() {
     }
   }
 
+  @SneakyThrows
   protected void load(Class<?> config, String... environment) {
     try {
-      this.context = contextClass.newInstance();
+      this.context = contextClass.getDeclaredConstructor().newInstance();
     } catch (InstantiationException | IllegalAccessException e) {
       throw new RuntimeException("Failed to instantiate testing context", e);
     }
diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProviderTest.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/ClasspathResourceSchemaStringProviderTest.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfigurationTest.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/GraphQLJavaToolsAutoConfigurationTest.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -9,7 +9,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-/** @author <a href="mailto:java.lang.RuntimeException@gmail.com">oEmbedler Inc.</a> */
 class GraphQLJavaToolsAutoConfigurationTest extends AbstractAutoConfigurationTest {
 
   public GraphQLJavaToolsAutoConfigurationTest() {
@@ -18,6 +17,7 @@ public GraphQLJavaToolsAutoConfigurationTest() {
 
   @Test
   void appContextLoads() {
+    System.setProperty("graphql.tools.schemaLocationPattern", "graphql-tools-schema.graphql");
     load(BaseConfiguration.class);
 
     assertThat(this.getContext().getBean(GraphQLSchema.class)).isNotNull();
@@ -73,7 +73,7 @@ interface Interface {
       String method();
     }
 
-    class Query implements GraphQLQueryResolver {
+    static class Query implements GraphQLQueryResolver {
 
       Interface theInterface() {
         return new Implementation();
@@ -84,7 +84,7 @@ Implementation theImplementation() {
       }
     }
 
-    class Implementation implements Interface {
+    static class Implementation implements Interface {
 
       public String method() {
         return "method";
diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/GraphQLToolsDirectiveTest.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/GraphQLToolsDirectiveTest.java
@@ -1,4 +1,4 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/Query.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/tools/Query.java
@@ -1,10 +1,8 @@
-package graphql.kickstart.tools.boot;
+package graphql.kickstart.autoconfigure.tools;
 
 import graphql.kickstart.tools.GraphQLQueryResolver;
-import org.springframework.stereotype.Component;
 
 /** @author Andrew Potter */
-@Component
 public class Query implements GraphQLQueryResolver {
 
   public String echo(String string) {
diff --git a/graphql-spring-boot-autoconfigure/src/test/resources/graphql-tools-schema.graphql b/graphql-spring-boot-autoconfigure/src/test/resources/graphql-tools-schema.graphql
diff --git a/graphql-spring-boot-autoconfigure/src/test/resources/graphql/schema-directive-test.graphql b/graphql-spring-boot-autoconfigure/src/test/resources/graphql/schema-directive-test.graphql
diff --git a/graphql-spring-boot-autoconfigure/src/test/resources/graphql/schemaLocationPatternTest.gqls b/graphql-spring-boot-autoconfigure/src/test/resources/graphql/schemaLocationPatternTest.gqls
diff --git a/graphql-spring-boot-dependencies/build.gradle b/graphql-spring-boot-dependencies/build.gradle
@@ -14,7 +14,6 @@ dependencies {
         runtime project(":voyager-spring-boot-starter")
         runtime project(":playground-spring-boot-starter")
         api project(":graphql-spring-boot-starter-test")
-        api project(":graphql-kickstart-spring-boot-starter-tools")
         api project(":graphql-kickstart-spring-boot-starter-graphql-annotations")
     }
 }
diff --git a/graphql-spring-boot-test-autoconfigure/build.gradle b/graphql-spring-boot-test-autoconfigure/build.gradle
@@ -22,7 +22,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-test")
     api(project(":graphql-spring-boot-test"))
     implementation(project(":graphql-spring-boot-starter"))
-    implementation(project(":graphql-kickstart-spring-boot-starter-tools"))
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-websocket")
     implementation("com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
diff --git a/graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java b/graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java
@@ -23,7 +23,7 @@
 import graphql.kickstart.tools.GraphQLResolver;
 import graphql.kickstart.tools.SchemaParserDictionary;
 import graphql.kickstart.tools.SchemaParserOptions;
-import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
+import graphql.kickstart.autoconfigure.tools.GraphQLJavaToolsAutoConfiguration;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.SchemaParser;
diff --git a/settings.gradle b/settings.gradle
@@ -42,12 +42,8 @@ include ':graphql-spring-boot-dependencies'
 
 include ':graphql-kickstart-spring-boot-autoconfigure-graphql-annotations'
 include ':graphql-kickstart-spring-boot-starter-graphql-annotations'
-include ':graphql-kickstart-spring-boot-autoconfigure-tools'
-include ':graphql-kickstart-spring-boot-starter-tools'
 include ':graphql-kickstart-spring-support'
 include ':graphql-kickstart-spring-webflux'
-//include ':graphql-kickstart-spring-boot-autoconfigure-webflux'
-//include ':graphql-kickstart-spring-boot-starter-webflux'
 
 include ":graphql-spring-boot-starter-test"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package graphql.kickstart.tools.boot;`
	`1`	`+package graphql.kickstart.autoconfigure.tools;`
`2`	`2`
`3`	`3`	`import static java.util.stream.Collectors.joining;`
`4`	`4`