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

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28347
This commit is contained in:
Phillip Webb
2021-10-14 11:27:17 -07:00
parent 1a30c660f3 4dc5142128
commit 2430d8a41a
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvokerTests.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -101,6 +102,31 @@ class CachingOperationInvokerTests {
assertThat(response).isSameAs(cachedResponse);
}
@Test // gh-28313
void cacheWhenEachPrincipalIsUniqueDoesNotConsumeTooMuchMemory() throws Exception {
MonoOperationInvoker target = new MonoOperationInvoker();
CachingOperationInvoker invoker = new CachingOperationInvoker(target, 50L);
int count = 1000;
for (int i = 0; i < count; i++) {
invokeWithUniquePrincipal(invoker);
}
long expired = System.currentTimeMillis() + 50;
while (System.currentTimeMillis() < expired) {
Thread.sleep(10);
}
invokeWithUniquePrincipal(invoker);
assertThat(invoker).extracting("cachedResponses").asInstanceOf(InstanceOfAssertFactories.MAP)
.hasSizeLessThan(count);
}
private void invokeWithUniquePrincipal(CachingOperationInvoker invoker) {
SecurityContext securityContext = mock(SecurityContext.class);
Principal principal = mock(Principal.class);
given(securityContext.getPrincipal()).willReturn(principal);
InvocationContext context = new InvocationContext(securityContext, Collections.emptyMap());
((Mono<?>) invoker.invoke(context)).block();
}
private void assertCacheIsUsed(Map<String, Object> parameters) {
assertCacheIsUsed(parameters, null);
}