From aef4b21f19474005fdca4a13c50da2ae87ac34a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 15 Feb 2024 15:50:10 +0100 Subject: [PATCH] Polish "Add ThreadLocalAccessor for LocaleContext and RequestAttributes" See gh-32243 --- .../context/i18n/LocaleContextThreadLocalAccessor.java | 6 ++++-- .../request/RequestAttributesThreadLocalAccessor.java | 6 ++++-- .../request/RequestAttributesThreadLocalAccessorTests.java | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextThreadLocalAccessor.java b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextThreadLocalAccessor.java index be1c6abda37..4a0c09d2cab 100644 --- a/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextThreadLocalAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextThreadLocalAccessor.java @@ -19,8 +19,10 @@ package org.springframework.context.i18n; import io.micrometer.context.ThreadLocalAccessor; /** - * Adapt {@link LocaleContextHolder} to the {@link ThreadLocalAccessor} contract to assist - * the Micrometer Context Propagation library with {@link LocaleContext} propagation. + * Adapt {@link LocaleContextHolder} to the {@link ThreadLocalAccessor} contract + * to assist the Micrometer Context Propagation library with {@link LocaleContext} + * propagation. + * * @author Tadaya Tsuyukubo * @since 6.2 */ diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessor.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessor.java index e2639f7b96f..a3e74cb8791 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessor.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessor.java @@ -19,8 +19,10 @@ package org.springframework.web.context.request; import io.micrometer.context.ThreadLocalAccessor; /** - * Adapt {@link RequestContextHolder} to the {@link ThreadLocalAccessor} contract to assist - * the Micrometer Context Propagation library with {@link RequestAttributes} propagation. + * Adapt {@link RequestContextHolder} to the {@link ThreadLocalAccessor} contract + * to assist the Micrometer Context Propagation library with + * {@link RequestAttributes} propagation. + * * @author Tadaya Tsuyukubo * @since 6.2 */ diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessorTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessorTests.java index 0d36ae337b0..4a4434ed05d 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessorTests.java @@ -23,6 +23,7 @@ import java.util.stream.Stream; import io.micrometer.context.ContextRegistry; import io.micrometer.context.ContextSnapshot; +import io.micrometer.context.ContextSnapshot.Scope; import io.micrometer.context.ContextSnapshotFactory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.params.ParameterizedTest; @@ -51,6 +52,7 @@ class RequestAttributesThreadLocalAccessorTests { @ParameterizedTest @MethodSource + @SuppressWarnings({ "try", "unused" }) void propagation(@Nullable RequestAttributes previous, RequestAttributes current) throws Exception { RequestContextHolder.setRequestAttributes(current); ContextSnapshot snapshot = ContextSnapshotFactory.builder() @@ -64,7 +66,7 @@ class RequestAttributesThreadLocalAccessorTests { CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { RequestContextHolder.setRequestAttributes(previous); - try (ContextSnapshot.Scope scope = snapshot.setThreadLocals()) { + try (Scope scope = snapshot.setThreadLocals()) { currentHolder.set(RequestContextHolder.getRequestAttributes()); } previousHolder.set(RequestContextHolder.getRequestAttributes());