Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 58359f0

Browse files
oliemansmoliemansm
committed
feat: migrate autoconfiguration to spring boot 3
1 parent 9c941eb commit 58359f0

19 files changed

+50
-48
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
import org.reflections.scanners.MethodAnnotationsScanner;
3535
import org.reflections.scanners.SubTypesScanner;
3636
import org.reflections.scanners.TypeAnnotationsScanner;
37+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3738
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3839
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3940
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4041
import org.springframework.context.annotation.Bean;
41-
import org.springframework.context.annotation.Configuration;
4242

4343
@Slf4j
44-
@Configuration
44+
@AutoConfiguration
4545
@RequiredArgsConstructor
4646
@ConditionalOnProperty(value = "graphql.schema-strategy", havingValue = "ANNOTATIONS")
4747
@EnableConfigurationProperties(GraphQLAnnotationsProperties.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package graphql.kickstart.autoconfigure.editor.altair;
22

3+
import org.springframework.boot.autoconfigure.AutoConfiguration;
34
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
45
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
56
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
67
import org.springframework.boot.context.properties.EnableConfigurationProperties;
78
import org.springframework.context.annotation.Bean;
8-
import org.springframework.context.annotation.Configuration;
99
import org.springframework.web.servlet.DispatcherServlet;
1010

1111
/** @author Moncef AOUDIA */
12-
@Configuration
12+
@AutoConfiguration
1313
@ConditionalOnWebApplication
1414
@EnableConfigurationProperties({AltairProperties.class, AltairOptions.class, AltairResources.class})
1515
@ConditionalOnClass(DispatcherServlet.class)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.REACTIVE;
44
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type.SERVLET;
55

6+
import org.springframework.boot.autoconfigure.AutoConfiguration;
67
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
78
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
89
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -16,13 +17,15 @@
1617
import org.springframework.web.reactive.function.server.ServerResponse;
1718
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
1819
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
19-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;;
20+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
21+
22+
;
2023

2124
/**
2225
* @author Andrew Potter
2326
* @author Ronny Bräunlich
2427
*/
25-
@Configuration
28+
@AutoConfiguration
2629
@ConditionalOnProperty(value = "graphql.graphiql.enabled", havingValue = "true")
2730
@EnableConfigurationProperties(GraphiQLProperties.class)
2831
public class GraphiQLAutoConfiguration {

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/PlaygroundAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import graphql.kickstart.autoconfigure.editor.playground.properties.PlaygroundProperties;
5+
import org.springframework.boot.autoconfigure.AutoConfiguration;
56
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
67
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
78
import org.springframework.boot.context.properties.EnableConfigurationProperties;
89
import org.springframework.context.annotation.Bean;
9-
import org.springframework.context.annotation.Configuration;
1010

11-
@Configuration
11+
@AutoConfiguration
1212
@ConditionalOnWebApplication
1313
@EnableConfigurationProperties(PlaygroundProperties.class)
1414
public class PlaygroundAutoConfiguration {

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/PlaygroundWebFluxAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package graphql.kickstart.autoconfigure.editor.playground;
22

33
import lombok.RequiredArgsConstructor;
4+
import org.springframework.boot.autoconfigure.AutoConfiguration;
45
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
56
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
67
import org.springframework.context.annotation.Bean;
7-
import org.springframework.context.annotation.Configuration;
88
import org.springframework.context.annotation.Import;
99
import org.springframework.core.io.ClassPathResource;
1010
import org.springframework.web.reactive.config.WebFluxConfigurer;
1111
import org.springframework.web.reactive.function.server.RouterFunction;
1212
import org.springframework.web.reactive.function.server.RouterFunctions;
1313
import org.springframework.web.reactive.function.server.ServerResponse;
1414

15-
@Configuration
15+
@AutoConfiguration
1616
@Import(PlaygroundWebFluxControllerAdvice.class)
1717
@ConditionalOnClass(WebFluxConfigurer.class)
1818
@ConditionalOnProperty(value = "graphql.playground.enabled", havingValue = "true")

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/ReactiveVoyagerAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package graphql.kickstart.autoconfigure.editor.voyager;
22

3+
import org.springframework.boot.autoconfigure.AutoConfiguration;
34
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
45
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
56
import org.springframework.boot.context.properties.EnableConfigurationProperties;
67
import org.springframework.context.annotation.Bean;
7-
import org.springframework.context.annotation.Configuration;
88
import org.springframework.core.io.ClassPathResource;
99
import org.springframework.web.reactive.function.server.RouterFunction;
1010
import org.springframework.web.reactive.function.server.RouterFunctions;
1111
import org.springframework.web.reactive.function.server.ServerResponse;
1212

1313
/** @author Max David Günther */
14-
@Configuration
14+
@AutoConfiguration
1515
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
1616
@ConditionalOnProperty(value = "graphql.voyager.enabled", havingValue = "true")
1717
@EnableConfigurationProperties(VoyagerPropertiesConfiguration.class)

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/voyager/VoyagerAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package graphql.kickstart.autoconfigure.editor.voyager;
22

3+
import org.springframework.boot.autoconfigure.AutoConfiguration;
34
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
45
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
56
import org.springframework.boot.context.properties.EnableConfigurationProperties;
67
import org.springframework.context.annotation.Bean;
7-
import org.springframework.context.annotation.Configuration;
88

99
/** @author Guilherme Blanco */
10-
@Configuration
10+
@AutoConfiguration
1111
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
1212
@ConditionalOnProperty(value = "graphql.voyager.enabled", havingValue = "true")
1313
@EnableConfigurationProperties(VoyagerPropertiesConfiguration.class)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.Optional;
2828
import lombok.extern.slf4j.Slf4j;
2929
import org.springframework.beans.factory.annotation.Autowired;
30+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3031
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3132
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3233
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -36,11 +37,10 @@
3637
import org.springframework.boot.context.properties.ConfigurationProperties;
3738
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3839
import org.springframework.context.annotation.Bean;
39-
import org.springframework.context.annotation.Configuration;
4040

4141
/** @author Andrew Potter */
4242
@Slf4j
43-
@Configuration
43+
@AutoConfiguration
4444
@ConditionalOnClass(SchemaParser.class)
4545
@ConditionalOnProperty(
4646
value = "graphql.schema-strategy",

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/GraphQLSpringWebfluxAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@
3636
import org.springframework.beans.factory.ObjectProvider;
3737
import org.springframework.beans.factory.annotation.Autowired;
3838
import org.springframework.beans.factory.annotation.Value;
39+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3940
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
4041
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4142
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
4243
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
4344
import org.springframework.context.annotation.Bean;
4445
import org.springframework.context.annotation.Conditional;
45-
import org.springframework.context.annotation.Configuration;
4646
import org.springframework.context.annotation.Import;
4747
import org.springframework.web.reactive.HandlerMapping;
4848
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
4949
import org.springframework.web.reactive.socket.WebSocketHandler;
5050
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
5151

5252
@Slf4j
53-
@Configuration
53+
@AutoConfiguration
5454
@Import({
5555
GraphQLController.class,
5656
ReactiveWebSocketSubscriptionsHandler.class,

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/reactive/MonoAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import graphql.kickstart.tools.SchemaParserOptions.GenericWrapper;
88
import java.util.List;
99
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.boot.autoconfigure.AutoConfiguration;
1011
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
1112
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1213
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
1314
import org.springframework.context.annotation.Bean;
14-
import org.springframework.context.annotation.Configuration;
1515
import reactor.core.publisher.Mono;
1616

17-
@Configuration
17+
@AutoConfiguration
1818
@ConditionalOnClass(SchemaParser.class)
1919
@ConditionalOnWebApplication(type = REACTIVE)
2020
@AutoConfigureBefore(GraphQLJavaToolsAutoConfiguration.class)

0 commit comments

Comments
 (0)