diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/DefaultScheduledTaskObservationConvention.java b/spring-context/src/main/java/org/springframework/scheduling/config/DefaultScheduledTaskObservationConvention.java index 99daaa42e4c..37b84148029 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/DefaultScheduledTaskObservationConvention.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/DefaultScheduledTaskObservationConvention.java @@ -26,7 +26,7 @@ import static org.springframework.scheduling.config.ScheduledTaskObservationDocu /** * Default implementation for {@link ScheduledTaskObservationConvention}. * @author Brian Clozel - * @since 6.1.0 + * @since 6.1 */ public class DefaultScheduledTaskObservationConvention implements ScheduledTaskObservationConvention { diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationContext.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationContext.java index 6a73daf5129..382dd10399e 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationContext.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationContext.java @@ -26,7 +26,7 @@ import org.springframework.util.ClassUtils; * Context that holds information for observation metadata collection * during the {@link ScheduledTaskObservationDocumentation#TASKS_SCHEDULED_EXECUTION execution of scheduled tasks}. * @author Brian Clozel - * @since 6.1.0 + * @since 6.1 */ public class ScheduledTaskObservationContext extends Observation.Context { diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationConvention.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationConvention.java index 732fc18f392..bbaf593420e 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationConvention.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationConvention.java @@ -23,7 +23,7 @@ import io.micrometer.observation.ObservationConvention; * Interface for an {@link ObservationConvention} for * {@link ScheduledTaskObservationDocumentation#TASKS_SCHEDULED_EXECUTION scheduled task executions}. * @author Brian Clozel - * @since 6.1.0 + * @since 6.1 */ public interface ScheduledTaskObservationConvention extends ObservationConvention { diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationDocumentation.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationDocumentation.java index 51850cf7d11..6e54f609249 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationDocumentation.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskObservationDocumentation.java @@ -28,7 +28,7 @@ import io.micrometer.observation.docs.ObservationDocumentation; *

This class is used by automated tools to document KeyValues attached to the {@code @Scheduled} observations. * * @author Brian Clozel - * @since 6.1.0 + * @since 6.1 */ public enum ScheduledTaskObservationDocumentation implements ObservationDocumentation { diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java index fb13ec6db0d..e5f5ef8348b 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java @@ -138,7 +138,7 @@ public class ScheduledTaskRegistrar implements ScheduledTaskHolder, Initializing /** * Return the {@link ObservationRegistry} for this registrar. - * @since 6.1.0 + * @since 6.1 */ @Nullable public ObservationRegistry getObservationRegistry() { @@ -147,7 +147,7 @@ public class ScheduledTaskRegistrar implements ScheduledTaskHolder, Initializing /** * Configure an {@link ObservationRegistry} to record observations for scheduled tasks. - * @since 6.1.0 + * @since 6.1 */ public void setObservationRegistry(@Nullable ObservationRegistry observationRegistry) { this.observationRegistry = observationRegistry; diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java index 1e6ffb93365..bc9fe80b0b7 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java @@ -56,7 +56,7 @@ public class ScheduledMethodRunnable implements Runnable { * @param target the target instance to call the method on * @param method the target method to call * @param observationRegistrySupplier a supplier for the observation registry to use - * @since 6.1.0 + * @since 6.1 */ public ScheduledMethodRunnable(Object target, Method method, Supplier observationRegistrySupplier) { this.target = target; diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java b/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java index fca440fc1fa..2333544a8bb 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/HttpWebHandlerAdapter.java @@ -206,7 +206,7 @@ public class HttpWebHandlerAdapter extends WebHandlerDecorator implements HttpHa } /** - * Configure a {@link ObservationRegistry} for recording server exchange observations. + * Configure an {@link ObservationRegistry} for recording server exchange observations. * By default, a {@link ObservationRegistry#NOOP no-op} instance will be used. * @param observationRegistry the observation registry to use * @since 6.1 diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java index 68024558916..30430f40e05 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java @@ -371,7 +371,7 @@ public final class WebHttpHandlerBuilder { } /** - * Configure a {@link ObservationRegistry} for recording server exchange observations. + * Configure an {@link ObservationRegistry} for recording server exchange observations. * By default, a {@link ObservationRegistry#NOOP no-op} registry will be configured. * @param observationRegistry the observation registry * @since 6.1 diff --git a/spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java b/spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java index b8b01951b3d..4e80dff3993 100644 --- a/spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java +++ b/spring-web/src/main/java/org/springframework/web/server/handler/ExceptionHandlingWebHandler.java @@ -41,9 +41,9 @@ public class ExceptionHandlingWebHandler extends WebHandlerDecorator { /** * Name of the {@link ServerWebExchange#getAttributes() attribute} that * contains the exception handled by {@link WebExceptionHandler WebExceptionHandlers}. - * @since 6.0.8 + * @since 6.1 */ - public static String HANDLED_WEB_EXCEPTION = ExceptionHandlingWebHandler.class.getSimpleName() + ".handledException"; + public static final String HANDLED_WEB_EXCEPTION = ExceptionHandlingWebHandler.class.getSimpleName() + ".handledException"; private final List exceptionHandlers; diff --git a/spring-web/src/test/java/org/springframework/web/server/adapter/HttpWebHandlerAdapterObservabilityTests.java b/spring-web/src/test/java/org/springframework/web/server/adapter/HttpWebHandlerAdapterObservabilityTests.java index f79956d5678..7e44daad549 100644 --- a/spring-web/src/test/java/org/springframework/web/server/adapter/HttpWebHandlerAdapterObservabilityTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/adapter/HttpWebHandlerAdapterObservabilityTests.java @@ -105,7 +105,7 @@ class HttpWebHandlerAdapterObservabilityTests { private Optional observationContext; - public HttpStatusSuccessStubWebHandler(HttpStatus responseStatus) { + HttpStatusSuccessStubWebHandler(HttpStatus responseStatus) { this.responseStatus = responseStatus; }