Skip to content

Commit e611dee

Browse files
wilkinsonasnicoll
wilkinsona
authored and
snicoll
committed
Create spring-boot-webmvc module
1 parent f7ff7a1 commit e611dee

File tree

128 files changed

+450
-378
lines changed

Some content is hidden

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

128 files changed

+450
-378
lines changed

Diff for: ‎settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
117117
include "spring-boot-project:spring-boot-tx"
118118
include "spring-boot-project:spring-boot-undertow"
119119
include "spring-boot-project:spring-boot-validation"
120+
include "spring-boot-project:spring-boot-webmvc"
120121
include "spring-boot-system-tests:spring-boot-deployment-tests"
121122
include "spring-boot-system-tests:spring-boot-image-tests"
122123
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ dependencies {
4646
optional(project(":spring-boot-project:spring-boot-tomcat"))
4747
optional(project(":spring-boot-project:spring-boot-undertow"))
4848
optional(project(":spring-boot-project:spring-boot-validation"))
49+
optional(project(":spring-boot-project:spring-boot-webmvc"))
4950
optional("ch.qos.logback:logback-classic")
5051
optional("org.apache.cassandra:java-driver-core") {
5152
exclude group: "org.slf4j", module: "jcl-over-slf4j"

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
28-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
2928
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
29+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletPath;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.web.servlet.DispatcherServlet;

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/SecurityRequestMatchersManagementContextConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
2827
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
28+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletPath;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.security.web.util.matcher.RequestMatcher;

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
2626
import org.springframework.beans.factory.HierarchicalBeanFactory;
2727
import org.springframework.beans.factory.ListableBeanFactory;
2828
import org.springframework.beans.factory.annotation.Autowired;
29-
import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
29+
import org.springframework.boot.webmvc.error.DefaultErrorAttributes;
3030
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
3131
import org.springframework.web.servlet.HandlerExceptionResolver;
3232
import org.springframework.web.servlet.ModelAndView;

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ManagementErrorEndpoint.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.springframework.boot.autoconfigure.web.ErrorProperties;
2222
import org.springframework.boot.web.error.ErrorAttributeOptions;
2323
import org.springframework.boot.web.error.ErrorAttributeOptions.Include;
24-
import org.springframework.boot.web.servlet.error.ErrorAttributes;
25-
import org.springframework.boot.web.servlet.error.ErrorController;
24+
import org.springframework.boot.webmvc.error.ErrorAttributes;
25+
import org.springframework.boot.webmvc.error.ErrorController;
2626
import org.springframework.stereotype.Controller;
2727
import org.springframework.util.Assert;
2828
import org.springframework.web.bind.annotation.RequestMapping;

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2727
import org.springframework.boot.autoconfigure.web.ServerProperties;
28-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
29-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletRegistrationBean;
3028
import org.springframework.boot.web.server.ErrorPage;
3129
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
3230
import org.springframework.boot.web.server.servlet.ConfigurableServletWebServerFactory;
33-
import org.springframework.boot.web.servlet.error.ErrorAttributes;
3431
import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter;
32+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
33+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletRegistrationBean;
34+
import org.springframework.boot.webmvc.error.ErrorAttributes;
3535
import org.springframework.context.annotation.Bean;
3636
import org.springframework.core.Ordered;
3737
import org.springframework.web.context.request.RequestContextListener;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4242
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
4343
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
44-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
45-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
4644
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
4745
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4846
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4947
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
48+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
49+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
5050
import org.springframework.context.ApplicationContext;
5151
import org.springframework.http.HttpMethod;
5252
import org.springframework.mock.web.MockHttpServletRequest;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
3535
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
37-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3836
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3937
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4038
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
39+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
40+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4141

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
35-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3735
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3836
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3937
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4038
import org.springframework.boot.testsupport.classpath.resources.WithResource;
39+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
40+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4141

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

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import org.springframework.boot.actuate.endpoint.EndpointAccessResolver;
2626
import org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar;
2727
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
28-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
2928
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3029
import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
3130
import org.springframework.boot.test.context.FilteredClassLoader;
3231
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3332
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
33+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletPath;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;
3636
import org.springframework.context.annotation.Import;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
4040
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
4141
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
42-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
43-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
4442
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
4543
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
44+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
45+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4646
import org.springframework.context.annotation.Bean;
4747
import org.springframework.context.annotation.Configuration;
4848
import org.springframework.context.annotation.Import;

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,12 +54,12 @@
5454
import org.springframework.boot.actuate.health.SystemHealth;
5555
import org.springframework.boot.autoconfigure.AutoConfigurations;
5656
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
57-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
5857
import org.springframework.boot.logging.LogLevel;
5958
import org.springframework.boot.test.context.FilteredClassLoader;
6059
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
6160
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
6261
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
62+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
6363
import org.springframework.context.annotation.Bean;
6464
import org.springframework.context.annotation.Configuration;
6565
import org.springframework.web.servlet.DispatcherServlet;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3030
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
32-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3331
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3432
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3533
import org.springframework.boot.test.util.TestPropertyValues;
3634
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
35+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
36+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
3737
import org.springframework.context.annotation.Import;
3838
import org.springframework.http.HttpStatus;
3939
import org.springframework.http.MediaType;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
3333
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.AutoConfigurations;
35-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3735
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3836
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3937
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4038
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4139
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4240
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4341
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
42+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
43+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4444
import org.springframework.http.HttpMethod;
4545
import org.springframework.http.HttpStatus;
4646
import org.springframework.test.web.reactive.server.EntityExchangeResult;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2727
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
29-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3129
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3230
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3331
import org.springframework.boot.test.context.runner.ContextConsumer;
3432
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
33+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
34+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
3535
import org.springframework.http.HttpHeaders;
3636
import org.springframework.http.HttpStatus;
3737
import org.springframework.test.web.servlet.assertj.MockMvcTester;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3636
import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
3737
import org.springframework.boot.autoconfigure.AutoConfigurations;
38-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
39-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
4038
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
4139
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4240
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4341
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4442
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4543
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4644
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
45+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
46+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4747
import org.springframework.context.annotation.Bean;
4848
import org.springframework.context.annotation.Configuration;
4949
import org.springframework.http.HttpMethod;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
3535
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
37-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3836
import org.springframework.boot.hateoas.autoconfigure.HypermediaAutoConfiguration;
3937
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
4038
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4139
import org.springframework.boot.test.util.TestPropertyValues;
4240
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
41+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
42+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4343
import org.springframework.context.annotation.Bean;
4444
import org.springframework.context.annotation.Configuration;
4545
import org.springframework.context.annotation.Import;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
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.web.servlet.DispatcherServletAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
2927
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3028
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3129
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3230
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3331
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3432
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
3533
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
34+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
35+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
3636
import org.springframework.web.context.ConfigurableWebApplicationContext;
3737

3838
/**

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
import org.springframework.boot.actuate.autoconfigure.observation.web.servlet.WebMvcObservationAutoConfiguration;
4949
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
5050
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
51-
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
52-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
5351
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
5452
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
5553
import org.springframework.boot.test.context.SpringBootTest;
@@ -58,6 +56,8 @@
5856
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
5957
import org.springframework.boot.web.client.RestTemplateBuilder;
6058
import org.springframework.boot.web.servlet.FilterRegistrationBean;
59+
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
60+
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
6161
import org.springframework.context.ApplicationContext;
6262
import org.springframework.context.annotation.Bean;
6363
import org.springframework.context.annotation.Configuration;

0 commit comments

Comments
 (0)