Skip to content

Commit dae7f6d

Browse files
wilkinsonaphilwebb
authored andcommitted
Create spring-boot-jackson-module
1 parent fe80ba8 commit dae7f6d

File tree

118 files changed

+206
-169
lines changed

Some content is hidden

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

118 files changed

+206
-169
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ include "spring-boot-project:spring-boot-all-integration-tests"
6767
include "spring-boot-project:spring-boot-docker-compose"
6868
include "spring-boot-project:spring-boot-devtools"
6969
include "spring-boot-project:spring-boot-docs"
70+
include "spring-boot-project:spring-boot-jackson"
7071
include "spring-boot-project:spring-boot-jetty"
7172
include "spring-boot-project:spring-boot-reactor-netty"
7273
include "spring-boot-project:spring-boot-test"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies {
1818
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
1919

2020
optional(project(":spring-boot-project:spring-boot-amqp"))
21+
optional(project(":spring-boot-project:spring-boot-jackson"))
2122
optional(project(":spring-boot-project:spring-boot-jetty"))
2223
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
2324
optional(project(":spring-boot-project:spring-boot-tomcat"))

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jackson/JacksonEndpointAutoConfiguration.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
import com.fasterxml.jackson.databind.SerializationFeature;
2222

2323
import org.springframework.boot.actuate.endpoint.jackson.EndpointObjectMapper;
24-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
24+
import org.springframework.boot.autoconfigure.AutoConfiguration;
2525
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
28-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
2928
import org.springframework.context.annotation.Bean;
30-
import org.springframework.context.annotation.Configuration;
3129
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
3230

3331
/**
@@ -36,8 +34,7 @@
3634
* @author Phillip Webb
3735
* @since 3.0.0
3836
*/
39-
@Configuration(proxyBeanMethods = false)
40-
@AutoConfigureAfter(JacksonAutoConfiguration.class)
37+
@AutoConfiguration
4138
public class JacksonEndpointAutoConfiguration {
4239

4340
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryReactiveHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
import org.springframework.boot.autoconfigure.AutoConfigurations;
3434
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3535
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3736
import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
3837
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3938
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
39+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4040
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
4141
import org.springframework.context.annotation.Bean;
4242
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
5252
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
5353
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
54-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
5554
import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
5655
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
5756
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
57+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
5858
import org.springframework.boot.ssl.SslBundle;
5959
import org.springframework.boot.ssl.jks.JksSslStoreBundle;
6060
import org.springframework.boot.ssl.jks.JksSslStoreDetails;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
import org.springframework.boot.autoconfigure.AutoConfigurations;
4141
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4242
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
43-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
4443
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
4544
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
4645
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
4746
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
47+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4848
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4949
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
5050
import org.springframework.context.ApplicationContext;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
import org.springframework.boot.autoconfigure.AutoConfigurations;
3333
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
35-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
3736
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
3837
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3938
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
39+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4040
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4141

4242
import static org.assertj.core.api.Assertions.assertThat;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
34-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
3736
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3837
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
38+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3939
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4040
import org.springframework.boot.testsupport.classpath.resources.WithResource;
4141

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3939
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4040
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
41-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
4241
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
4342
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
4443
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
4544
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
45+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4646
import org.springframework.context.annotation.Bean;
4747
import org.springframework.context.annotation.Configuration;
4848
import org.springframework.context.annotation.Import;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebFluxIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3030
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3131
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
32-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3332
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
33+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3434
import org.springframework.boot.test.util.TestPropertyValues;
3535
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
3636
import org.springframework.security.authentication.TestingAuthenticationToken;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebMvcIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3030
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3231
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
3332
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3433
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
34+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3535
import org.springframework.boot.test.util.TestPropertyValues;
3636
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
3737
import org.springframework.context.annotation.Import;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointAccessIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
3232
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.AutoConfigurations;
34-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
35+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3636
import org.springframework.boot.test.context.FilteredClassLoader;
3737
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
3232
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.AutoConfigurations;
34-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
36+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3737
import org.springframework.boot.test.context.FilteredClassLoader;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3939
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyHealthEndpointAdditionalPathIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.springframework.boot.actuate.autoconfigure.web.server.tomcat.TomcatServletManagementContextAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
28+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
2929
import org.springframework.boot.test.context.FilteredClassLoader;
3030
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3131
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointAccessIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.AutoConfigurations;
2727
import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
30+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3131
import org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration;
3232
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
3333
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointCorsIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
2929
import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3130
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
3231
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
32+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3333
import org.springframework.boot.test.context.runner.ContextConsumer;
3434
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3535
import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
2828
import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration;
29-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
3130
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
31+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3232
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3333
import org.springframework.context.ApplicationContext;
3434
import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxHealthEndpointAdditionalPathIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.boot.actuate.autoconfigure.web.server.netty.NettyReactiveManagementContextAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.AutoConfigurations;
2727
import org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
30+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3131
import org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration;
3232
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
3333
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointAccessIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
3535
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3736
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3837
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
38+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3939
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4040
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4141
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointCorsIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
2929
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3130
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3231
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
32+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3333
import org.springframework.boot.test.context.runner.ContextConsumer;
3434
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3535
import org.springframework.http.HttpHeaders;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointExposureIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
3737
import org.springframework.boot.autoconfigure.AutoConfigurations;
3838
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
39-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
4039
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
4140
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
41+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4242
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4343
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4444
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
3535
import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
3636
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
37-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
3837
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
3938
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
4039
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
40+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4141
import org.springframework.boot.test.util.TestPropertyValues;
4242
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
4343
import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcHealthEndpointAdditionalPathIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.AutoConfigurations;
2727
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
30+
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3131
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3232
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3333
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;

0 commit comments

Comments
 (0)