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

Commit 6ada03d

Browse files
oliemansmoliemansm
authored
Merge pull request #900 from graphql-java-kickstart/feature/spring-boot
Feature/spring boot
2 parents e7e06c0 + 58359f0 commit 6ada03d

File tree

44 files changed

+109
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+109
-108
lines changed

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ TARGET_COMPATIBILITY=17
3131
### Dependencies
3232
LIB_GRAPHQL_JAVA_VER=19.3
3333
LIB_EXTENDED_SCALARS_VER=19.1
34-
LIB_SPRING_BOOT_VER=2.7.6
35-
LIB_GRAPHQL_SERVLET_VER=14.0.0
34+
LIB_SPRING_BOOT_VER=3.0.0
35+
LIB_GRAPHQL_SERVLET_VER=15.0.0
3636
LIB_GRAPHQL_JAVA_TOOLS_VER=13.0.2
3737
LIB_GRAPHQL_ANNOTATIONS_VER=9.1
3838
LIB_REFLECTIONS_VER=0.10.2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ private ApplicationReadyEvent getApplicationReadyEvent() {
3434
new AnnotationConfigWebApplicationContext();
3535
annotationConfigWebApplicationContext.refresh();
3636
return new ApplicationReadyEvent(
37-
new SpringApplication(), new String[0], annotationConfigWebApplicationContext);
37+
new SpringApplication(), new String[0], annotationConfigWebApplicationContext, null);
3838
}
3939
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
dependencies {
2121
api "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
22-
api(project(":graphql-kickstart-spring-support"))
23-
api(project(':graphql-kickstart-spring-webflux'))
22+
api project(":graphql-kickstart-spring-support")
23+
api project(':graphql-kickstart-spring-webflux')
2424
api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VER"
2525
api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
2626
api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
@@ -46,7 +46,7 @@ dependencies {
4646
compileOnly "org.springframework.boot:spring-boot-configuration-processor"
4747
compileOnly "org.springframework.boot:spring-boot-starter-web"
4848

49-
testImplementation(project(":graphql-spring-boot-starter-test"))
49+
testImplementation project(":graphql-spring-boot-starter-test")
5050
testImplementation "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
5151
testImplementation "org.springframework.boot:spring-boot-starter-web"
5252
testImplementation "org.springframework.boot:spring-boot-starter-test"
@@ -57,7 +57,7 @@ dependencies {
5757
testImplementation "org.springframework.boot:spring-boot-starter-security"
5858
testImplementation "org.springframework.security:spring-security-test"
5959
testImplementation "io.projectreactor:reactor-core"
60-
testImplementation "io.reactivex.rxjava2:rxjava"
60+
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
6161
testImplementation "org.jsoup:jsoup:$LIB_JSOUP_VER"
6262
}
6363

‎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/annotations/GraphQLAnnotationsProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package graphql.kickstart.autoconfigure.annotations;
22

3-
import javax.validation.constraints.NotBlank;
3+
import jakarta.validation.constraints.NotBlank;
44
import lombok.AllArgsConstructor;
55
import lombok.Builder;
66
import lombok.Data;

‎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/altair/AltairController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import java.nio.charset.Charset;
1212
import java.util.HashMap;
1313
import java.util.Map;
14-
import javax.annotation.PostConstruct;
15-
import javax.servlet.http.HttpServletResponse;
14+
import jakarta.annotation.PostConstruct;
15+
import jakarta.servlet.http.HttpServletResponse;
1616
import lombok.RequiredArgsConstructor;
1717
import lombok.SneakyThrows;
1818
import lombok.extern.slf4j.Slf4j;

‎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/graphiql/ReactiveGraphiQLController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.io.IOException;
44
import java.util.Map;
5-
import javax.annotation.PostConstruct;
5+
import jakarta.annotation.PostConstruct;
66
import lombok.extern.slf4j.Slf4j;
77
import org.springframework.core.io.buffer.DataBufferFactory;
88
import org.springframework.core.io.buffer.DefaultDataBufferFactory;

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

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

33
import java.io.IOException;
44
import java.util.Map;
5-
import javax.annotation.PostConstruct;
6-
import javax.servlet.http.HttpServletRequest;
7-
import javax.servlet.http.HttpServletResponse;
5+
import jakarta.annotation.PostConstruct;
6+
import jakarta.servlet.http.HttpServletRequest;
7+
import jakarta.servlet.http.HttpServletResponse;
88
import lombok.extern.slf4j.Slf4j;
99
import org.springframework.stereotype.Controller;
1010
import org.springframework.web.bind.annotation.GetMapping;

‎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/playground/ResourceSerializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
import com.fasterxml.jackson.databind.SerializerProvider;
66
import java.io.IOException;
77
import java.nio.charset.StandardCharsets;
8-
import org.apache.tomcat.util.http.fileupload.util.Streams;
98
import org.springframework.boot.jackson.JsonComponent;
109
import org.springframework.core.io.Resource;
10+
import org.springframework.util.StreamUtils;
1111

1212
@JsonComponent
1313
public class ResourceSerializer extends JsonSerializer<Resource> {
1414
@Override
1515
public void serialize(
1616
final Resource value, final JsonGenerator gen, final SerializerProvider serializers)
1717
throws IOException {
18-
final String content = Streams.asString(value.getInputStream(), StandardCharsets.UTF_8.name());
18+
final String content = StreamUtils.copyToString(value.getInputStream(), StandardCharsets.UTF_8);
1919
gen.writeString(content);
2020
}
2121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package graphql.kickstart.autoconfigure.editor.playground.properties;
22

3-
import javax.validation.constraints.NotBlank;
3+
import jakarta.validation.constraints.NotBlank;
44
import lombok.Data;
55

66
@Data

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Collections;
66
import java.util.List;
77
import java.util.Map;
8-
import javax.validation.constraints.NotBlank;
8+
import jakarta.validation.constraints.NotBlank;
99
import lombok.Data;
1010
import org.springframework.boot.context.properties.ConfigurationProperties;
1111
import org.springframework.boot.context.properties.NestedConfigurationProperty;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package graphql.kickstart.autoconfigure.editor.playground.properties;
22

3-
import javax.validation.constraints.NotBlank;
3+
import jakarta.validation.constraints.NotBlank;
44
import lombok.Data;
55

66
@Data

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/settings/PlaygroundPrettierSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package graphql.kickstart.autoconfigure.editor.playground.properties.settings;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
4-
import javax.validation.constraints.Min;
4+
import jakarta.validation.constraints.Min;
55
import lombok.Data;
66

77
@Data

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/editor/playground/properties/settings/PlaygroundSchemaPollingSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package graphql.kickstart.autoconfigure.editor.playground.properties.settings;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
4-
import javax.validation.constraints.Min;
4+
import jakarta.validation.constraints.Min;
55
import lombok.Data;
66

77
@Data

‎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/editor/voyager/VoyagerController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.io.IOException;
66
import java.util.Map;
7-
import javax.servlet.http.HttpServletRequest;
7+
import jakarta.servlet.http.HttpServletRequest;
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.http.MediaType;
1010
import org.springframework.http.ResponseEntity;

‎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)

‎graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/autoconfigure/web/servlet/GraphQLInstrumentationAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import lombok.RequiredArgsConstructor;
1212
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
1313
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
14+
import org.springframework.boot.autoconfigure.AutoConfiguration;
1415
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
1516
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1617
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -19,10 +20,9 @@
1920
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2021
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2122
import org.springframework.context.annotation.Bean;
22-
import org.springframework.context.annotation.Configuration;
2323

2424
/** @author Marcel Overdijk */
25-
@Configuration
25+
@AutoConfiguration
2626
@RequiredArgsConstructor
2727
@ConditionalOnClass(MetricsAutoConfiguration.class)
2828
@AutoConfigureAfter({

0 commit comments

Comments
 (0)