diff --git a/spring-web/src/main/java/org/springframework/web/observation/DefaultHttpRequestsObservationConvention.java b/spring-web/src/main/java/org/springframework/web/observation/servlet/DefaultHttpRequestsObservationConvention.java similarity index 99% rename from spring-web/src/main/java/org/springframework/web/observation/DefaultHttpRequestsObservationConvention.java rename to spring-web/src/main/java/org/springframework/web/observation/servlet/DefaultHttpRequestsObservationConvention.java index d4b0e17de62f..c83cc854da19 100644 --- a/spring-web/src/main/java/org/springframework/web/observation/DefaultHttpRequestsObservationConvention.java +++ b/spring-web/src/main/java/org/springframework/web/observation/servlet/DefaultHttpRequestsObservationConvention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.observation; +package org.springframework.web.observation.servlet; import io.micrometer.common.KeyValue; import io.micrometer.common.KeyValues; diff --git a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationContext.java b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationContext.java similarity index 96% rename from spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationContext.java rename to spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationContext.java index 6007e88e18d9..9338b52f9ab3 100644 --- a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationContext.java +++ b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.observation; +package org.springframework.web.observation.servlet; import io.micrometer.observation.transport.RequestReplyReceiverContext; import jakarta.servlet.http.HttpServletRequest; diff --git a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationConvention.java b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationConvention.java similarity index 95% rename from spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationConvention.java rename to spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationConvention.java index bac16c6dd46c..affad1797513 100644 --- a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationConvention.java +++ b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationConvention.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.observation; +package org.springframework.web.observation.servlet; import io.micrometer.observation.Observation; import io.micrometer.observation.ObservationConvention; diff --git a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationDocumentation.java b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationDocumentation.java similarity index 98% rename from spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationDocumentation.java rename to spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationDocumentation.java index a468da62f993..00a3a17eab00 100644 --- a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationDocumentation.java +++ b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationDocumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.observation; +package org.springframework.web.observation.servlet; import io.micrometer.common.docs.KeyName; import io.micrometer.observation.Observation; diff --git a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationFilter.java b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationFilter.java similarity index 99% rename from spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationFilter.java rename to spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationFilter.java index fc6fab636376..835054c31fb7 100644 --- a/spring-web/src/main/java/org/springframework/web/observation/HttpRequestsObservationFilter.java +++ b/spring-web/src/main/java/org/springframework/web/observation/servlet/HttpRequestsObservationFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.observation; +package org.springframework.web.observation.servlet; import java.io.IOException; import java.util.Optional; diff --git a/spring-web/src/main/java/org/springframework/web/observation/servlet/package-info.java b/spring-web/src/main/java/org/springframework/web/observation/servlet/package-info.java new file mode 100644 index 000000000000..d251a33e4a4e --- /dev/null +++ b/spring-web/src/main/java/org/springframework/web/observation/servlet/package-info.java @@ -0,0 +1,9 @@ +/** + * Instrumentation for {@link io.micrometer.observation.Observation observing} Servlet web applications. + */ +@NonNullApi +@NonNullFields +package org.springframework.web.observation.servlet; + +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-web/src/test/java/org/springframework/web/observation/DefaultHttpRequestsObservationConventionTests.java b/spring-web/src/test/java/org/springframework/web/observation/DefaultHttpRequestsObservationConventionTests.java index 14ac6c3abedb..c5a13dff753d 100644 --- a/spring-web/src/test/java/org/springframework/web/observation/DefaultHttpRequestsObservationConventionTests.java +++ b/spring-web/src/test/java/org/springframework/web/observation/DefaultHttpRequestsObservationConventionTests.java @@ -20,6 +20,8 @@ import io.micrometer.observation.Observation; import org.junit.jupiter.api.Test; +import org.springframework.web.observation.servlet.DefaultHttpRequestsObservationConvention; +import org.springframework.web.observation.servlet.HttpRequestsObservationContext; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import org.springframework.web.testfixture.servlet.MockHttpServletResponse; diff --git a/spring-web/src/test/java/org/springframework/web/observation/HttpRequestsObservationFilterTests.java b/spring-web/src/test/java/org/springframework/web/observation/HttpRequestsObservationFilterTests.java index 8f2e59874dab..4988b47fd55e 100644 --- a/spring-web/src/test/java/org/springframework/web/observation/HttpRequestsObservationFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/observation/HttpRequestsObservationFilterTests.java @@ -23,6 +23,8 @@ import org.junit.jupiter.api.Test; import org.springframework.http.HttpMethod; +import org.springframework.web.observation.servlet.HttpRequestsObservationContext; +import org.springframework.web.observation.servlet.HttpRequestsObservationFilter; import org.springframework.web.testfixture.servlet.MockFilterChain; import org.springframework.web.testfixture.servlet.MockHttpServletRequest; import org.springframework.web.testfixture.servlet.MockHttpServletResponse; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java index 5376aee637f4..e5f1a8c84875 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java @@ -32,7 +32,7 @@ import org.springframework.http.converter.xml.SourceHttpMessageConverter; import org.springframework.lang.Nullable; import org.springframework.util.CollectionUtils; -import org.springframework.web.observation.HttpRequestsObservationFilter; +import org.springframework.web.observation.servlet.HttpRequestsObservationFilter; import org.springframework.web.servlet.function.HandlerFunction; import org.springframework.web.servlet.function.RouterFunction; import org.springframework.web.servlet.function.RouterFunctions; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java index 4c7009f1bb2c..17e97f50c32e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import org.springframework.web.observation.HttpRequestsObservationFilter; +import org.springframework.web.observation.servlet.HttpRequestsObservationFilter; import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerMapping; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java index 727382096d2e..5b2c2e602cf6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java @@ -45,7 +45,7 @@ import org.springframework.web.bind.UnsatisfiedServletRequestParameterException; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.observation.HttpRequestsObservationFilter; +import org.springframework.web.observation.servlet.HttpRequestsObservationFilter; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.handler.AbstractHandlerMethodMapping; import org.springframework.web.servlet.mvc.condition.NameValueExpression; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/support/RouterFunctionMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/support/RouterFunctionMappingTests.java index 28b8f91d760c..49ac60564f19 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/support/RouterFunctionMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/support/RouterFunctionMappingTests.java @@ -26,8 +26,8 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.web.observation.HttpRequestsObservationContext; -import org.springframework.web.observation.HttpRequestsObservationFilter; +import org.springframework.web.observation.servlet.HttpRequestsObservationContext; +import org.springframework.web.observation.servlet.HttpRequestsObservationFilter; import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.function.HandlerFunction; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java index a3cf9695ec93..9f3a7bdb3098 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java @@ -49,8 +49,8 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.support.InvocableHandlerMethod; import org.springframework.web.method.support.ModelAndViewContainer; -import org.springframework.web.observation.HttpRequestsObservationContext; -import org.springframework.web.observation.HttpRequestsObservationFilter; +import org.springframework.web.observation.servlet.HttpRequestsObservationContext; +import org.springframework.web.observation.servlet.HttpRequestsObservationFilter; import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerMapping;