feat: move graphiql starter into main starter

Author: oliemansm

example-graphql-subscription/build.gradle

@@ -2,9 +2,6 @@ apply plugin: "org.springframework.boot"
 
 dependencies {
     implementation(project(":graphql-spring-boot-starter"))
-    implementation(project(":graphiql-spring-boot-starter"))
-    implementation(project(":playground-spring-boot-starter"))
-    implementation "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     implementation "io.reactivex.rxjava2:rxjava"
     implementation "io.projectreactor:reactor-core"

example-graphql-tools/build.gradle

@@ -21,8 +21,6 @@ apply plugin: "org.springframework.boot"
 
 dependencies {
     implementation(project(":graphql-spring-boot-starter"))
-    implementation(project(":graphiql-spring-boot-starter"))
-    implementation(project(":voyager-spring-boot-starter"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
 

example-request-scoped-dataloader/build.gradle

@@ -3,9 +3,6 @@ apply plugin: "org.springframework.boot"
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation(project(":graphql-spring-boot-starter"))
-    implementation(project(":graphiql-spring-boot-starter"))
-
-    implementation "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation(project(":graphql-spring-boot-starter-test"))

example-spring-common/build.gradle

@@ -21,7 +21,6 @@ apply plugin: 'org.springframework.boot'
 
 dependencies {
     implementation(project(":graphql-spring-boot-starter"))
-    implementation(project(":graphiql-spring-boot-starter"))
 
     implementation "com.embedler.moon.graphql:spring-graphql-common:2.1.0-2016-05-22T16-50-32"
     implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4'

example/build.gradle

@@ -20,11 +20,7 @@
 apply plugin: "org.springframework.boot"
 
 dependencies {
-    implementation(project(":altair-spring-boot-starter"))
     implementation(project(":graphql-spring-boot-starter"))
-    implementation(project(":graphiql-spring-boot-starter"))
-    implementation(project(":voyager-spring-boot-starter"))
-    implementation(project(":playground-spring-boot-starter"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

…sample/ApplicationBootConfiguration.java …kstart/ApplicationBootConfiguration.javaexample/src/main/java/graphql/kickstart/autoconfigure/web/servlet/sample/ApplicationBootConfiguration.java renamed to example/src/main/java/graphql/kickstart/ApplicationBootConfiguration.java example/src/main/java/graphql/kickstart/autoconfigure/web/servlet/sample/ApplicationBootConfiguration.java renamed to example/src/main/java/graphql/kickstart/ApplicationBootConfiguration.java

@@ -17,7 +17,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package graphql.kickstart.autoconfigure.web.servlet.sample;
+package graphql.kickstart;
 
 import graphql.Scalars;
 import graphql.schema.DataFetcher;

example/src/main/resources/application.yml

@@ -5,6 +5,8 @@ spring:
     multipart:
       enabled: true
       location: /tmp
+  main:
+    allow-bean-definition-overriding: true
 server:
   port: 9000
 management:

graphiql-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=graphql.kickstart.graphiql.boot.GraphiQLAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=graphql.kickstart.autoconfigure.editor.graphiql.GraphiQLAutoConfiguration

graphql-kickstart-spring-webflux/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
     api(project(':graphql-kickstart-spring-support'))
-
     api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
+
     compileOnly "org.springframework.boot:spring-boot-starter-webflux"
 }

graphql-spring-boot-autoconfigure/build.gradle

@@ -25,12 +25,19 @@ dependencies {
     api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+
     implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation(project(':graphql-kickstart-starter-utils'))
+
     // annotations
     api "io.github.graphql-java:graphql-java-annotations:$LIB_GRAPHQL_ANNOTATIONS_VER"
     implementation "org.reflections:reflections:$LIB_REFLECTIONS_VER"
     implementation "org.springframework.boot:spring-boot-starter-validation"
 
+    // graphiql
+    implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
+    compileOnly "org.springframework.boot:spring-boot-starter-security"
+
     compileOnly "org.springframework.boot:spring-boot-starter-websocket"
     compileOnly "org.springframework.boot:spring-boot-starter-web"
     compileOnly "org.springframework.boot:spring-boot-starter-actuator"