Extract graphql-java-tools into its own starter

Author: oliemansm

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

@@ -0,0 +1,18 @@
+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 "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"
+
+//    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"
+    testCompile(project(":graphql-spring-boot-test"))
+}
+
+compileJava.dependsOn(processResources)

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/ClasspathResourceSchemaStringProvider.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/ClasspathResourceSchemaStringProvider.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLJavaToolsAutoConfiguration.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/GraphQLJavaToolsAutoConfiguration.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import com.coxautodev.graphql.tools.GraphQLResolver;
 import com.coxautodev.graphql.tools.PerFieldObjectMapperProvider;

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLToolsProperties.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/GraphQLToolsProperties.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/ListSchemaStringProvider.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/ListSchemaStringProvider.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import java.io.IOException;
 import java.util.ArrayList;

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/SchemaDirective.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/SchemaDirective.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import graphql.schema.idl.SchemaDirectiveWiring;
 

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/SchemaStringProvider.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/main/java/graphql/kickstart/tools/boot/SchemaStringProvider.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import java.io.IOException;
 import java.util.List;

graphql-java-tools-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+graphql.kickstart.tools.boot.GraphQLJavaToolsAutoConfiguration

graphql-java-tools-spring-boot-autoconfigure/src/test/java/graphql/kickstart/tools/boot/AbstractAutoConfigurationTest.java

@@ -0,0 +1,80 @@
+package graphql.kickstart.tools.boot;
+
+import static org.mockito.Mockito.mock;
+
+import javax.servlet.ServletContext;
+import javax.websocket.server.ServerContainer;
+import org.junit.After;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigRegistry;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+
+/**
+ * @author Andrew Potter
+ */
+public abstract class AbstractAutoConfigurationTest {
+
+  private final Class<? extends AbstractApplicationContext> contextClass;
+  private final Class<?> autoConfiguration;
+
+  private AbstractApplicationContext context;
+
+  protected AbstractAutoConfigurationTest(Class<?> autoConfiguration) {
+    this(AnnotationConfigApplicationContext.class, autoConfiguration);
+  }
+
+  protected AbstractAutoConfigurationTest(Class<? extends AbstractApplicationContext> contextClass,
+      Class<?> autoConfiguration) {
+    assert AnnotationConfigRegistry.class.isAssignableFrom(contextClass);
+    this.contextClass = contextClass;
+    this.autoConfiguration = autoConfiguration;
+  }
+
+  @After
+  public void tearDown() {
+    if (this.context != null) {
+      this.context.close();
+      this.context = null;
+    }
+  }
+
+  protected void load(Class<?> config, String... environment) {
+    try {
+      this.context = contextClass.newInstance();
+    } catch (InstantiationException | IllegalAccessException e) {
+      throw new RuntimeException("Failed to instantiate testing context", e);
+    }
+
+    if (environment != null && environment.length > 0) {
+      TestPropertyValues.of(environment).applyTo(context);
+    }
+
+    getRegistry().register(config);
+    getRegistry().register(autoConfiguration);
+    getRegistry().register(JacksonAutoConfiguration.class);
+
+    loadServletContext();
+    getContext().refresh();
+  }
+
+  private void loadServletContext() {
+    if (context instanceof AnnotationConfigWebApplicationContext) {
+      ServerContainer serverContainer = mock(ServerContainer.class);
+      ServletContext servletContext = new MockServletContext();
+      servletContext.setAttribute("javax.websocket.server.ServerContainer", serverContainer);
+      ((AnnotationConfigWebApplicationContext) context).setServletContext(servletContext);
+    }
+  }
+
+  public AnnotationConfigRegistry getRegistry() {
+    return (AnnotationConfigRegistry) context;
+  }
+
+  public AbstractApplicationContext getContext() {
+    return context;
+  }
+}

graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/ClasspathResourceSchemaStringProviderTest.java renamed to graphql-java-tools-spring-boot-autoconfigure/src/test/java/graphql/kickstart/tools/boot/ClasspathResourceSchemaStringProviderTest.java

@@ -1,12 +1,13 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.tools.boot;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.coxautodev.graphql.tools.GraphQLQueryResolver;
-import com.oembedler.moon.graphql.boot.test.AbstractAutoConfigurationTest;
 import java.io.IOException;
 import java.util.List;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,9 +19,18 @@ public ClasspathResourceSchemaStringProviderTest() {
     super(GraphQLJavaToolsAutoConfiguration.class);
   }
 
+  @Before
+  public void setup() {
+    System.setProperty("graphql.tools.schemaLocationPattern", "graphql/*.gqls");
+  }
+
+  @After
+  public void clear() {
+    System.clearProperty("graphql.tools.schemaLocationPattern");
+  }
+
   @Test
   public void schemaStrings() throws IOException {
-    System.setProperty("graphql.tools.schemaLocationPattern", "graphql/*.gqls");
     load(BaseConfiguration.class);
     schemaStringProvider = getContext().getBean(ClasspathResourceSchemaStringProvider.class);
 
@@ -33,6 +43,7 @@ public void schemaStrings() throws IOException {
   static class BaseConfiguration {
 
     public class Query implements GraphQLQueryResolver {
+
       String schemaLocationTest(String id) {
         return id;
       }