Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add ThreadLocalAccessor for LocaleContext and RequestAttributes"

Browse Source 
See gh-32243
This commit is contained in:
Stéphane Nicoll
2024-02-15 15:50:10 +01:00
parent 5bd1c1fddb
commit aef4b21f19
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/context/i18n/LocaleContextThreadLocalAccessor.java
View File

@@ -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
*/

6
spring-web/src/main/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessor.java
View File

@@ -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
*/

4
spring-web/src/test/java/org/springframework/web/context/request/RequestAttributesThreadLocalAccessorTests.java
View File

@@ -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());