Extract graphql-java-tools into its own starter

Author: oliemansm

gradle.properties

@@ -17,7 +17,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-version = 5.11.1
+version = 5.12.0-SNAPSHOT
 
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot

graphql-java-tools-spring-boot-autoconfigure/build.gradle

@@ -4,11 +4,10 @@ dependencies {
 
     compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "commons-io:commons-io:$LIB_COMMONS_IO_VER"
 
-    compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
+    compileOnly "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
 
-//    testCompile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
+    testCompile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
     testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"

graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/ClasspathResourceSchemaStringProvider.java

@@ -1,51 +1,54 @@
 package graphql.kickstart.tools.boot;
 
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.core.io.Resource;
+import static java.util.stream.Collectors.joining;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.Resource;
 
 public class ClasspathResourceSchemaStringProvider implements SchemaStringProvider {
 
-    @Autowired
-    private ApplicationContext applicationContext;
-    private String schemaLocationPattern;
-
-    public ClasspathResourceSchemaStringProvider(String schemaLocationPattern) {
-        this.schemaLocationPattern = schemaLocationPattern;
-    }
-
-    @Override
-    public List<String> schemaStrings() throws IOException {
-        Resource[] resources = applicationContext.getResources("classpath*:" + schemaLocationPattern);
-        if (resources.length <= 0) {
-            throw new IllegalStateException(
-                    "No graphql schema files found on classpath with location pattern '"
-                            + schemaLocationPattern
-                            + "'.  Please add a graphql schema to the classpath or add a SchemaParser bean to your application context.");
-        }
-
-        return Arrays.stream(resources)
-                .map(this::readSchema)
-                .collect(Collectors.toList());
+  @Autowired
+  private ApplicationContext applicationContext;
+  private String schemaLocationPattern;
+
+  public ClasspathResourceSchemaStringProvider(String schemaLocationPattern) {
+    this.schemaLocationPattern = schemaLocationPattern;
+  }
+
+  @Override
+  public List<String> schemaStrings() throws IOException {
+    Resource[] resources = applicationContext.getResources("classpath*:" + schemaLocationPattern);
+    if (resources.length <= 0) {
+      throw new IllegalStateException(
+          "No graphql schema files found on classpath with location pattern '"
+              + schemaLocationPattern
+              + "'.  Please add a graphql schema to the classpath or add a SchemaParser bean to your application context.");
     }
 
-    private String readSchema(Resource resource) {
-        StringWriter writer = new StringWriter();
-        try (InputStream inputStream = resource.getInputStream()) {
-            IOUtils.copy(inputStream, writer, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new IllegalStateException("Cannot read graphql schema from resource " + resource, e);
-        }
-        return writer.toString();
+    return Arrays.stream(resources)
+        .map(this::readSchema)
+        .collect(Collectors.toList());
+  }
+
+  private String readSchema(Resource resource) {
+    try (
+        InputStream inputStream = resource.getInputStream();
+        InputStreamReader bufferedInputStream = new InputStreamReader(inputStream, StandardCharsets.UTF_8.name());
+        BufferedReader reader = new BufferedReader(bufferedInputStream)
+    ) {
+      return reader.lines().collect(joining());
+    } catch (IOException e) {
+      throw new IllegalStateException("Cannot read graphql schema from resource " + resource, e);
     }
+  }
 
 }

graphql-spring-boot-autoconfigure/build.gradle

@@ -18,20 +18,17 @@
  */
 
 dependencies {
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
-    compileOnly "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
-
+    compile(project(":graphql-java-tools-spring-boot-starter"))
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
-    compile "org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER"
     compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
-//    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
-//    compile "commons-io:commons-io:$LIB_COMMONS_IO_VER"
-
-    compile(project(":graphql-java-tools-spring-boot-starter"))
 
+    compileOnly "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
+    compileOnly "org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER"
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
 
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    compileOnly "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+
     testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
     testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"

graphql-spring-boot-test-autoconfigure/build.gradle

@@ -22,6 +22,9 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER")
     compile(project(":graphql-spring-boot-test"))
     compile(project(":graphql-spring-boot-starter"))
+    compile(project(":graphql-java-tools-spring-boot-starter"))
+    compile("org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER")
+    compile("org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER")
     compile("com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
 }
 

graphql-spring-boot-test-autoconfigure/src/main/java/com/graphql/spring/boot/test/GraphQLTest.java

@@ -4,11 +4,11 @@
 import com.coxautodev.graphql.tools.SchemaParserDictionary;
 import com.coxautodev.graphql.tools.SchemaParserOptions;
 import com.oembedler.moon.graphql.boot.GraphQLInstrumentationAutoConfiguration;
-import com.oembedler.moon.graphql.boot.GraphQLJavaToolsAutoConfiguration;
 import com.oembedler.moon.graphql.boot.GraphQLWebAutoConfiguration;
 import graphql.execution.ExecutionStrategy;
 import graphql.execution.instrumentation.Instrumentation;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
+import graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.SchemaParser;
@@ -36,13 +36,13 @@
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 import javax.servlet.MultipartConfigElement;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 import static org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE;