root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

This commit is contained in:
Stephane Nicoll 2020-02-20 11:03:41 +01:00
parent c5bce2b99d 592ae85043
commit 26c673a1a4
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,10 +18,10 @@ package org.springframework.boot.actuate.endpoint.invoker.cache;
import java.security.Principal;
import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
@ -74,25 +74,25 @@ class CachingOperationInvokerTests {
@Test
void cacheInTtlWithMonoResponse() {
MonoOperationInvoker.invocations = 0;
MonoOperationInvoker.invocations = new AtomicInteger();
MonoOperationInvoker target = new MonoOperationInvoker();
InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap());
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
Object response = ((Mono<?>) invoker.invoke(context)).block();
Object cachedResponse = ((Mono<?>) invoker.invoke(context)).block();
assertThat(MonoOperationInvoker.invocations).isEqualTo(1);
assertThat(MonoOperationInvoker.invocations).hasValue(1);
assertThat(response).isSameAs(cachedResponse);
}
@Test
void cacheInTtlWithFluxResponse() {
FluxOperationInvoker.invocations = 0;
FluxOperationInvoker.invocations = new AtomicInteger();
FluxOperationInvoker target = new FluxOperationInvoker();
InvocationContext context = new InvocationContext(mock(SecurityContext.class), Collections.emptyMap());
CachingOperationInvoker invoker = new CachingOperationInvoker(target, CACHE_TTL);
Object response = ((Flux<?>) invoker.invoke(context)).blockLast();
Object cachedResponse = ((Flux<?>) invoker.invoke(context)).blockLast();
assertThat(FluxOperationInvoker.invocations).isEqualTo(1);
assertThat(FluxOperationInvoker.invocations).hasValue(1);
assertThat(response).isSameAs(cachedResponse);
}
@ -178,13 +178,13 @@ class CachingOperationInvokerTests {
private static class MonoOperationInvoker implements OperationInvoker {
static int invocations;
static AtomicInteger invocations = new AtomicInteger();
@Override
public Object invoke(InvocationContext context) throws MissingParametersException {
public Mono<String> invoke(InvocationContext context) throws MissingParametersException {
return Mono.fromCallable(() -> {
invocations++;
return Mono.just("test");
invocations.incrementAndGet();
return "test";
});
}
@ -192,14 +192,11 @@ class CachingOperationInvokerTests {
private static class FluxOperationInvoker implements OperationInvoker {
static int invocations;
static AtomicInteger invocations = new AtomicInteger();
@Override
public Object invoke(InvocationContext context) throws MissingParametersException {
return Flux.fromIterable(() -> {
invocations++;
return Arrays.asList("spring", "boot").iterator();
});
public Flux<String> invoke(InvocationContext context) throws MissingParametersException {
return Flux.just("spring", "boot").hide().doFirst(invocations::incrementAndGet);
}
}