From fbb1ba1bb3497d1b69ea5a9787e7a875c541d9e3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 22 Jan 2018 11:25:40 +0000 Subject: [PATCH] Move actuator mappings introspection classes into dedicated packages Closes gh-9979 --- .../MappingsEndpointAutoConfiguration.java | 15 +++++++------ .../web/mappings/package-info.java | 20 +++++++++++++++++ .../main/resources/META-INF/spring.factories | 2 +- ...ngsEndpointReactiveDocumentationTests.java | 6 ++--- ...ingsEndpointServletDocumentationTests.java | 10 ++++----- .../EndpointAutoConfigurationClasses.java | 2 +- .../MappingDescriptionProvider.java | 2 +- .../web/{ => mappings}/MappingsEndpoint.java | 2 +- .../web/{ => mappings}/package-info.java | 4 ++-- .../DispatcherHandlerMappingDescription.java | 2 +- ...herHandlersMappingDescriptionProvider.java | 4 ++-- .../reactive}/package-info.java | 4 ++-- .../DispatcherServletHandlerMappings.java | 2 +- .../DispatcherServletMappingDescription.java | 2 +- ...herServletsMappingDescriptionProvider.java | 4 ++-- .../FilterRegistrationMappingDescription.java | 2 +- .../FiltersMappingDescriptionProvider.java | 4 ++-- .../RegistrationMappingDescription.java | 2 +- ...ServletRegistrationMappingDescription.java | 2 +- .../ServletsMappingDescriptionProvider.java | 4 ++-- .../servlet}/package-info.java | 4 ++-- .../{ => mappings}/MappingsEndpointTests.java | 22 +++++++++---------- 22 files changed, 71 insertions(+), 50 deletions(-) rename spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/{ => mappings}/MappingsEndpointAutoConfiguration.java (82%) create mode 100644 spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/package-info.java rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/MappingDescriptionProvider.java (96%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/MappingsEndpoint.java (98%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/package-info.java (86%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/reactive/DispatcherHandlerMappingDescription.java (94%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/reactive/DispatcherHandlersMappingDescriptionProvider.java (98%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{servlet => mappings/reactive}/package-info.java (85%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/DispatcherServletHandlerMappings.java (98%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/DispatcherServletMappingDescription.java (96%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/DispatcherServletsMappingDescriptionProvider.java (98%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/FilterRegistrationMappingDescription.java (96%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/FiltersMappingDescriptionProvider.java (92%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/RegistrationMappingDescription.java (96%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/ServletRegistrationMappingDescription.java (95%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{ => mappings}/servlet/ServletsMappingDescriptionProvider.java (92%) rename spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/{reactive => mappings/servlet}/package-info.java (85%) rename spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/{ => mappings}/MappingsEndpointTests.java (87%) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/MappingsEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java similarity index 82% rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/MappingsEndpointAutoConfiguration.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java index 52aa8e73fa..622ce38fd2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/MappingsEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package org.springframework.boot.actuate.autoconfigure.web; +package org.springframework.boot.actuate.autoconfigure.web.mappings; import java.util.Collection; import java.util.Collections; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; -import org.springframework.boot.actuate.web.MappingsEndpoint; -import org.springframework.boot.actuate.web.reactive.DispatcherHandlersMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.DispatcherServletsMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.FiltersMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.ServletsMappingDescriptionProvider; +import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingsEndpoint; +import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/package-info.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/package-info.java new file mode 100644 index 0000000000..d83205e6c4 --- /dev/null +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Classes for auto-configuration of actuator web request mapping concerns. + */ +package org.springframework.boot.actuate.autoconfigure.web.mappings; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories index 6bd280cc93..b14ec5473c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories @@ -41,7 +41,7 @@ org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthIndicatorAu org.springframework.boot.actuate.autoconfigure.trace.TraceEndpointAutoConfiguration,\ org.springframework.boot.actuate.autoconfigure.trace.TraceRepositoryAutoConfiguration,\ org.springframework.boot.actuate.autoconfigure.trace.TraceWebFilterAutoConfiguration,\ -org.springframework.boot.actuate.autoconfigure.web.MappingsEndpointAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration,\ org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementContextAutoConfiguration,\ org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration,\ org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java index 8e98a0f1e8..c52831c0b3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java @@ -23,9 +23,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; -import org.springframework.boot.actuate.web.MappingsEndpoint; -import org.springframework.boot.actuate.web.reactive.DispatcherHandlersMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingsEndpoint; +import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java index 8d64ec9557..3878f4b497 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java @@ -23,11 +23,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; -import org.springframework.boot.actuate.web.MappingsEndpoint; -import org.springframework.boot.actuate.web.servlet.DispatcherServletsMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.FiltersMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.ServletsMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingsEndpoint; +import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/EndpointAutoConfigurationClasses.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/EndpointAutoConfigurationClasses.java index e9b346bb2c..402d8ee567 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/EndpointAutoConfigurationClasses.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/EndpointAutoConfigurationClasses.java @@ -29,7 +29,7 @@ import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoC import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.trace.TraceEndpointAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.web.MappingsEndpointAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration; /** * A list of all endpoint auto-configuration classes for use in tests. diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/MappingDescriptionProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java similarity index 96% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/MappingDescriptionProvider.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java index 09e2eb074d..751549a841 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/MappingDescriptionProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingDescriptionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web; +package org.springframework.boot.actuate.web.mappings; import java.util.List; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/MappingsEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java similarity index 98% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/MappingsEndpoint.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java index 65e4a4001b..c404aa7cee 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/MappingsEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web; +package org.springframework.boot.actuate.web.mappings; import java.util.Collection; import java.util.HashMap; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/package-info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/package-info.java similarity index 86% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/package-info.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/package-info.java index 5e4a290dd9..5cb15d3de5 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/package-info.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/package-info.java @@ -15,6 +15,6 @@ */ /** - * Actuator web support. + * Actuator web request mappings support. */ -package org.springframework.boot.actuate.web; +package org.springframework.boot.actuate.web.mappings; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/DispatcherHandlerMappingDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlerMappingDescription.java similarity index 94% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/DispatcherHandlerMappingDescription.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlerMappingDescription.java index 44316a9b34..ca00bf7564 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/DispatcherHandlerMappingDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlerMappingDescription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.reactive; +package org.springframework.boot.actuate.web.mappings.reactive; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/DispatcherHandlersMappingDescriptionProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java similarity index 98% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/DispatcherHandlersMappingDescriptionProvider.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java index 3085048f80..9ac7e95f8f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/DispatcherHandlersMappingDescriptionProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/DispatcherHandlersMappingDescriptionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.reactive; +package org.springframework.boot.actuate.web.mappings.reactive; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +28,7 @@ import java.util.stream.Stream; import reactor.core.publisher.Mono; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; import org.springframework.web.method.HandlerMethod; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/package-info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/package-info.java similarity index 85% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/package-info.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/package-info.java index 8292be36c2..6eb9e1fe46 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/package-info.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/reactive/package-info.java @@ -15,6 +15,6 @@ */ /** - * Actuator web support using Spring MVC. + * Actuator reactive request mappings support. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.reactive; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletHandlerMappings.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java similarity index 98% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletHandlerMappings.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java index 07855073df..6763d72b2b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletHandlerMappings.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import java.util.Collections; import java.util.List; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletMappingDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletMappingDescription.java similarity index 96% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletMappingDescription.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletMappingDescription.java index 3084b10fd4..691944190f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletMappingDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletMappingDescription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletsMappingDescriptionProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletsMappingDescriptionProvider.java similarity index 98% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletsMappingDescriptionProvider.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletsMappingDescriptionProvider.java index 0d59de3c34..51e6f86608 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/DispatcherServletsMappingDescriptionProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletsMappingDescriptionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import java.util.ArrayList; import java.util.Collections; @@ -25,7 +25,7 @@ import java.util.Map.Entry; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; import org.springframework.context.ApplicationContext; import org.springframework.data.rest.webmvc.support.DelegatingHandlerMapping; import org.springframework.util.ClassUtils; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/FilterRegistrationMappingDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FilterRegistrationMappingDescription.java similarity index 96% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/FilterRegistrationMappingDescription.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FilterRegistrationMappingDescription.java index dcd6c0d5f2..c1115f2df2 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/FilterRegistrationMappingDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FilterRegistrationMappingDescription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import java.util.Collection; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/FiltersMappingDescriptionProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FiltersMappingDescriptionProvider.java similarity index 92% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/FiltersMappingDescriptionProvider.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FiltersMappingDescriptionProvider.java index 83522138b7..12ffee5c34 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/FiltersMappingDescriptionProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/FiltersMappingDescriptionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import java.util.Collections; import java.util.List; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import javax.servlet.Filter; import javax.servlet.ServletContext; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; import org.springframework.context.ApplicationContext; import org.springframework.web.context.WebApplicationContext; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/RegistrationMappingDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RegistrationMappingDescription.java similarity index 96% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/RegistrationMappingDescription.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RegistrationMappingDescription.java index 45fb38454a..1a93161d93 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/RegistrationMappingDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RegistrationMappingDescription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import javax.servlet.Registration; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/ServletRegistrationMappingDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletRegistrationMappingDescription.java similarity index 95% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/ServletRegistrationMappingDescription.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletRegistrationMappingDescription.java index 6c2a0affd5..c0d12393db 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/ServletRegistrationMappingDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletRegistrationMappingDescription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import java.util.Collection; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/ServletsMappingDescriptionProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletsMappingDescriptionProvider.java similarity index 92% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/ServletsMappingDescriptionProvider.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletsMappingDescriptionProvider.java index adeab11d89..d979cfae0a 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/servlet/ServletsMappingDescriptionProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletsMappingDescriptionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web.servlet; +package org.springframework.boot.actuate.web.mappings.servlet; import java.util.Collections; import java.util.List; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import javax.servlet.Servlet; import javax.servlet.ServletContext; -import org.springframework.boot.actuate.web.MappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider; import org.springframework.context.ApplicationContext; import org.springframework.web.context.WebApplicationContext; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/package-info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/package-info.java similarity index 85% rename from spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/package-info.java rename to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/package-info.java index abb6ab2f6b..b7262f9127 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/reactive/package-info.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/package-info.java @@ -15,6 +15,6 @@ */ /** - * Actuator web support using WebFlux. + * Actuator servlet request mappings support. */ -package org.springframework.boot.actuate.web.reactive; +package org.springframework.boot.actuate.web.mappings.servlet; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/MappingsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java similarity index 87% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/MappingsEndpointTests.java rename to spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java index 6eb84f0e78..bc24af3c98 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/MappingsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/mappings/MappingsEndpointTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.web; +package org.springframework.boot.actuate.web.mappings; import java.util.Collection; import java.util.Collections; @@ -29,16 +29,16 @@ import javax.servlet.ServletRegistration; import org.junit.Test; -import org.springframework.boot.actuate.web.MappingsEndpoint.ApplicationMappings; -import org.springframework.boot.actuate.web.MappingsEndpoint.ContextMappings; -import org.springframework.boot.actuate.web.reactive.DispatcherHandlerMappingDescription; -import org.springframework.boot.actuate.web.reactive.DispatcherHandlersMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.DispatcherServletMappingDescription; -import org.springframework.boot.actuate.web.servlet.DispatcherServletsMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.FilterRegistrationMappingDescription; -import org.springframework.boot.actuate.web.servlet.FiltersMappingDescriptionProvider; -import org.springframework.boot.actuate.web.servlet.ServletRegistrationMappingDescription; -import org.springframework.boot.actuate.web.servlet.ServletsMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.MappingsEndpoint.ApplicationMappings; +import org.springframework.boot.actuate.web.mappings.MappingsEndpoint.ContextMappings; +import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlerMappingDescription; +import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletMappingDescription; +import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.FilterRegistrationMappingDescription; +import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider; +import org.springframework.boot.actuate.web.mappings.servlet.ServletRegistrationMappingDescription; +import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.ApplicationContext;