Stephane Nicoll
6 years ago
parent
246111cd84
commit
715db153e3
@ -1,73 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2018 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.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.springframework.boot.actuate.health;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
import org.springframework.util.Assert;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Factory to create a {@link CompositeReactiveHealthIndicator}.
|
|
||||||
*
|
|
||||||
* @author Stephane Nicoll
|
|
||||||
* @since 2.0.0
|
|
||||||
* @deprecated since 2.1.0 in favor of
|
|
||||||
* {@link CompositeReactiveHealthIndicator#CompositeReactiveHealthIndicator(HealthAggregator, ReactiveHealthIndicatorRegistry)}
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public class CompositeReactiveHealthIndicatorFactory {
|
|
||||||
|
|
||||||
private final Function<String, String> healthIndicatorNameFactory;
|
|
||||||
|
|
||||||
public CompositeReactiveHealthIndicatorFactory(
|
|
||||||
Function<String, String> healthIndicatorNameFactory) {
|
|
||||||
this.healthIndicatorNameFactory = healthIndicatorNameFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public CompositeReactiveHealthIndicatorFactory() {
|
|
||||||
this(new HealthIndicatorNameFactory());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a {@link CompositeReactiveHealthIndicator} based on the specified health
|
|
||||||
* indicators. Each {@link HealthIndicator} are wrapped to a
|
|
||||||
* {@link HealthIndicatorReactiveAdapter}. If two instances share the same name, the
|
|
||||||
* reactive variant takes precedence.
|
|
||||||
* @param healthAggregator the {@link HealthAggregator}
|
|
||||||
* @param reactiveHealthIndicators the {@link ReactiveHealthIndicator} instances
|
|
||||||
* mapped by name
|
|
||||||
* @param healthIndicators the {@link HealthIndicator} instances mapped by name if
|
|
||||||
* any.
|
|
||||||
* @return a {@link ReactiveHealthIndicator} that delegates to the specified
|
|
||||||
* {@code reactiveHealthIndicators}.
|
|
||||||
*/
|
|
||||||
public CompositeReactiveHealthIndicator createReactiveHealthIndicator(
|
|
||||||
HealthAggregator healthAggregator,
|
|
||||||
Map<String, ReactiveHealthIndicator> reactiveHealthIndicators,
|
|
||||||
Map<String, HealthIndicator> healthIndicators) {
|
|
||||||
Assert.notNull(healthAggregator, "HealthAggregator must not be null");
|
|
||||||
Assert.notNull(reactiveHealthIndicators,
|
|
||||||
"ReactiveHealthIndicators must not be null");
|
|
||||||
ReactiveHealthIndicatorRegistryFactory factory = new ReactiveHealthIndicatorRegistryFactory(
|
|
||||||
this.healthIndicatorNameFactory);
|
|
||||||
return new CompositeReactiveHealthIndicator(healthAggregator,
|
|
||||||
factory.createReactiveHealthIndicatorRegistry(reactiveHealthIndicators,
|
|
||||||
healthIndicators));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2018 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.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.springframework.boot.actuate.health;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
import reactor.core.publisher.Mono;
|
|
||||||
import reactor.test.StepVerifier;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
import static org.mockito.BDDMockito.given;
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.never;
|
|
||||||
import static org.mockito.Mockito.times;
|
|
||||||
import static org.mockito.Mockito.verify;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests for {@link CompositeReactiveHealthIndicatorFactory}.
|
|
||||||
*
|
|
||||||
* @author Stephane Nicoll
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public class CompositeReactiveHealthIndicatorFactoryTests {
|
|
||||||
|
|
||||||
private static final Health UP = new Health.Builder().status(Status.UP).build();
|
|
||||||
|
|
||||||
private static final Health DOWN = new Health.Builder().status(Status.DOWN).build();
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void noHealthIndicator() {
|
|
||||||
ReactiveHealthIndicator healthIndicator = createHealthIndicator(
|
|
||||||
Collections.singletonMap("test", () -> Mono.just(UP)), null);
|
|
||||||
StepVerifier.create(healthIndicator.health()).consumeNextWith((h) -> {
|
|
||||||
assertThat(h.getStatus()).isEqualTo(Status.UP);
|
|
||||||
assertThat(h.getDetails()).containsOnlyKeys("test");
|
|
||||||
}).verifyComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void defaultHealthIndicatorNameFactory() {
|
|
||||||
ReactiveHealthIndicator healthIndicator = new CompositeReactiveHealthIndicatorFactory()
|
|
||||||
.createReactiveHealthIndicator(new OrderedHealthAggregator(), Collections
|
|
||||||
.singletonMap("myHealthIndicator", () -> Mono.just(UP)), null);
|
|
||||||
StepVerifier.create(healthIndicator.health()).consumeNextWith((h) -> {
|
|
||||||
assertThat(h.getStatus()).isEqualTo(Status.UP);
|
|
||||||
assertThat(h.getDetails()).containsOnlyKeys("my");
|
|
||||||
}).verifyComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void healthIndicatorIsAdapted() {
|
|
||||||
ReactiveHealthIndicator healthIndicator = createHealthIndicator(
|
|
||||||
Collections.singletonMap("test", () -> Mono.just(UP)),
|
|
||||||
Collections.singletonMap("regular", () -> DOWN));
|
|
||||||
StepVerifier.create(healthIndicator.health()).consumeNextWith((h) -> {
|
|
||||||
assertThat(h.getStatus()).isEqualTo(Status.DOWN);
|
|
||||||
assertThat(h.getDetails()).containsOnlyKeys("test", "regular");
|
|
||||||
}).verifyComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void reactiveHealthIndicatorTakesPrecedence() {
|
|
||||||
ReactiveHealthIndicator reactiveHealthIndicator = mock(
|
|
||||||
ReactiveHealthIndicator.class);
|
|
||||||
given(reactiveHealthIndicator.health()).willReturn(Mono.just(UP));
|
|
||||||
HealthIndicator regularHealthIndicator = mock(HealthIndicator.class);
|
|
||||||
given(regularHealthIndicator.health()).willReturn(UP);
|
|
||||||
ReactiveHealthIndicator healthIndicator = createHealthIndicator(
|
|
||||||
Collections.singletonMap("test", reactiveHealthIndicator),
|
|
||||||
Collections.singletonMap("test", regularHealthIndicator));
|
|
||||||
StepVerifier.create(healthIndicator.health()).consumeNextWith((h) -> {
|
|
||||||
assertThat(h.getStatus()).isEqualTo(Status.UP);
|
|
||||||
assertThat(h.getDetails()).containsOnlyKeys("test");
|
|
||||||
}).verifyComplete();
|
|
||||||
verify(reactiveHealthIndicator, times(1)).health();
|
|
||||||
verify(regularHealthIndicator, never()).health();
|
|
||||||
}
|
|
||||||
|
|
||||||
private ReactiveHealthIndicator createHealthIndicator(
|
|
||||||
Map<String, ReactiveHealthIndicator> reactiveHealthIndicators,
|
|
||||||
Map<String, HealthIndicator> healthIndicators) {
|
|
||||||
return new CompositeReactiveHealthIndicatorFactory((n) -> n)
|
|
||||||
.createReactiveHealthIndicator(new OrderedHealthAggregator(),
|
|
||||||
reactiveHealthIndicators, healthIndicators);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue