Merge pull request #900 from graphql-java-kickstart/feature/spring-boot

Feature/spring boot

Author: oliemansm

gradle.properties

@@ -31,8 +31,8 @@ TARGET_COMPATIBILITY=17
 ### Dependencies
 LIB_GRAPHQL_JAVA_VER=19.3
 LIB_EXTENDED_SCALARS_VER=19.1
-LIB_SPRING_BOOT_VER=2.7.6
-LIB_GRAPHQL_SERVLET_VER=14.0.0
+LIB_SPRING_BOOT_VER=3.0.0
+LIB_GRAPHQL_SERVLET_VER=15.0.0
 LIB_GRAPHQL_JAVA_TOOLS_VER=13.0.2
 LIB_GRAPHQL_ANNOTATIONS_VER=9.1
 LIB_REFLECTIONS_VER=0.10.2

graphql-kickstart-spring-support/src/test/java/graphql/kickstart/spring/error/GraphQLErrorStartupListenerTest.java

@@ -34,6 +34,6 @@ private ApplicationReadyEvent getApplicationReadyEvent() {
         new AnnotationConfigWebApplicationContext();
     annotationConfigWebApplicationContext.refresh();
     return new ApplicationReadyEvent(
-        new SpringApplication(), new String[0], annotationConfigWebApplicationContext);
+        new SpringApplication(), new String[0], annotationConfigWebApplicationContext, null);
   }
 }

graphql-spring-boot-autoconfigure/build.gradle

@@ -19,8 +19,8 @@
 
 dependencies {
     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'))
+    api project(":graphql-kickstart-spring-support")
+    api project(':graphql-kickstart-spring-webflux')
     api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VER"
     api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
@@ -46,7 +46,7 @@ dependencies {
     compileOnly "org.springframework.boot:spring-boot-configuration-processor"
     compileOnly "org.springframework.boot:spring-boot-starter-web"
 
-    testImplementation(project(":graphql-spring-boot-starter-test"))
+    testImplementation project(":graphql-spring-boot-starter-test")
     testImplementation "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     testImplementation "org.springframework.boot:spring-boot-starter-web"
     testImplementation "org.springframework.boot:spring-boot-starter-test"
@@ -57,7 +57,7 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-security"
     testImplementation "org.springframework.security:spring-security-test"
     testImplementation "io.projectreactor:reactor-core"
-    testImplementation "io.reactivex.rxjava2:rxjava"
+    testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
     testImplementation "org.jsoup:jsoup:$LIB_JSOUP_VER"
 }
 

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/annotations/GraphQLAnnotationsAutoConfiguration.java

@@ -34,14 +34,14 @@
 import org.reflections.scanners.MethodAnnotationsScanner;
 import org.reflections.scanners.SubTypesScanner;
 import org.reflections.scanners.TypeAnnotationsScanner;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 @Slf4j
-@Configuration
+@AutoConfiguration
 @RequiredArgsConstructor
 @ConditionalOnProperty(value = "graphql.schema-strategy", havingValue = "ANNOTATIONS")
 @EnableConfigurationProperties(GraphQLAnnotationsProperties.class)

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/annotations/GraphQLAnnotationsProperties.java

@@ -1,6 +1,6 @@
 package graphql.kickstart.autoconfigure.annotations;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/altair/AltairAutoConfiguration.java

@@ -1,15 +1,15 @@
 package graphql.kickstart.autoconfigure.editor.altair;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.DispatcherServlet;
 
 /** @author Moncef AOUDIA */
-@Configuration
+@AutoConfiguration
 @ConditionalOnWebApplication
 @EnableConfigurationProperties({AltairProperties.class, AltairOptions.class, AltairResources.class})
 @ConditionalOnClass(DispatcherServlet.class)

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/altair/AltairController.java

@@ -11,8 +11,8 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/GraphiQLAutoConfiguration.java

@@ -3,6 +3,7 @@
 import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
 import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.SERVLET;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -16,13 +17,15 @@
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+;
 
 /**
  * @author Andrew Potter
  * @author Ronny Bräunlich
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty(value = "graphql.graphiql.enabled", havingValue = "true")
 @EnableConfigurationProperties(GraphiQLProperties.class)
 public class GraphiQLAutoConfiguration {

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/ReactiveGraphiQLController.java

@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.util.Map;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/graphiql/ServletGraphiQLController.java

@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;