This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e78132260994e0557b8add5e3883818f8d3ad7b5
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Fri Apr 24 09:27:16 2020 +0700
JAMES-3065 s/HealthCheck::checkReactive/HealthCheck::check/
---
.../backends/es/ElasticSearchHealthCheck.java | 2 +-
.../es/ElasticSearchHealthCheckConnectionTest.java | 4 +--
.../backends/rabbitmq/RabbitMQHealthCheck.java | 2 +-
.../backends/rabbitmq/RabbitMQHealthCheckTest.java | 28 ++++++++++----------
.../apache/james/core/healthcheck/HealthCheck.java | 2 +-
.../events/EventDeadLettersHealthCheck.java | 2 +-
.../EventDeadLettersHealthCheckContract.java | 30 +++++++++++-----------
.../apache/james/GuiceLifecycleHealthCheck.java | 2 +-
.../org/apache/james/PeriodicalHealthChecks.java | 2 +-
.../apache/james/PeriodicalHealthChecksTest.java | 16 ++++++------
.../MessageFastViewProjectionHealthCheck.java | 2 +-
.../MessageFastViewProjectionHealthCheckTest.java | 26 +++++++++----------
.../james/jpa/healthcheck/JPAHealthCheck.java | 2 +-
.../james/jpa/healthcheck/JPAHealthCheckTest.java | 4 +--
.../james/webadmin/routes/HealthCheckRoutes.java | 4 +--
.../webadmin/routes/HealthCheckRoutesTest.java | 2 +-
16 files changed, 65 insertions(+), 65 deletions(-)
diff --git
a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchHealthCheck.java
b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchHealthCheck.java
index 4dded30..1d3f92e 100644
---
a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchHealthCheck.java
+++
b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchHealthCheck.java
@@ -55,7 +55,7 @@ public class ElasticSearchHealthCheck implements HealthCheck {
}
@Override
- public Mono<Result> checkReactive() {
+ public Mono<Result> check() {
String[] indices = indexNames.stream()
.map(IndexName::getValue)
.toArray(String[]::new);
diff --git
a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchHealthCheckConnectionTest.java
b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchHealthCheckConnectionTest.java
index 0dc6530..70bfa3b 100644
---
a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchHealthCheckConnectionTest.java
+++
b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchHealthCheckConnectionTest.java
@@ -44,7 +44,7 @@ class ElasticSearchHealthCheckConnectionTest {
@Test
void checkShouldSucceedWhenElasticSearchIsRunning() {
-
assertThat(elasticSearchHealthCheck.checkReactive().block().isHealthy()).isTrue();
+
assertThat(elasticSearchHealthCheck.check().block().isHealthy()).isTrue();
}
@Test
@@ -53,7 +53,7 @@ class ElasticSearchHealthCheckConnectionTest {
elasticSearch.getDockerElasticSearch().pause();
try {
-
assertThat(elasticSearchHealthCheck.checkReactive().block().isUnHealthy()).isTrue();
+
assertThat(elasticSearchHealthCheck.check().block().isUnHealthy()).isTrue();
} finally {
elasticSearch.getDockerElasticSearch().unpause();
}
diff --git
a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheck.java
b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheck.java
index 098dc26..fff049a 100644
---
a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheck.java
+++
b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheck.java
@@ -49,7 +49,7 @@ public class RabbitMQHealthCheck implements HealthCheck {
}
@Override
- public Mono<Result> checkReactive() {
+ public Mono<Result> check() {
try {
return Flux.concat(connectionPool.tryConnection(),
rabbitChannelPoolImpl.tryChannel())
diff --git
a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheckTest.java
b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheckTest.java
index f205bc7..fa2eef4 100644
---
a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheckTest.java
+++
b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQHealthCheckTest.java
@@ -46,21 +46,21 @@ class RabbitMQHealthCheckTest {
@Test
void checkShouldReturnHealthyWhenRabbitMQIsRunning() {
- Result check = healthCheck.checkReactive().block();
+ Result check = healthCheck.check().block();
assertThat(check.isHealthy()).isTrue();
}
@Test
void checkShouldReturnHealthyWhenCalledSeveralTime() {
- healthCheck.checkReactive().block();
- healthCheck.checkReactive().block();
- healthCheck.checkReactive().block();
- healthCheck.checkReactive().block();
- healthCheck.checkReactive().block();
- healthCheck.checkReactive().block();
- healthCheck.checkReactive().block();
- Result check = healthCheck.checkReactive().block();
+ healthCheck.check().block();
+ healthCheck.check().block();
+ healthCheck.check().block();
+ healthCheck.check().block();
+ healthCheck.check().block();
+ healthCheck.check().block();
+ healthCheck.check().block();
+ Result check = healthCheck.check().block();
assertThat(check.isHealthy()).isTrue();
}
@@ -69,7 +69,7 @@ class RabbitMQHealthCheckTest {
void checkShouldReturnUnhealthyWhenRabbitMQIsNotRunning(DockerRabbitMQ
rabbitMQ) throws Exception {
rabbitMQ.stopApp();
- Result check = healthCheck.checkReactive().block();
+ Result check = healthCheck.check().block();
assertThat(check.isHealthy()).isFalse();
}
@@ -77,21 +77,21 @@ class RabbitMQHealthCheckTest {
@Test
void checkShouldDetectWhenRabbitMQRecovered(DockerRabbitMQ rabbitMQ)
throws Exception {
rabbitMQ.stopApp();
- healthCheck.checkReactive().block();
+ healthCheck.check().block();
rabbitMQ.startApp();
- Result check = healthCheck.checkReactive().block();
+ Result check = healthCheck.check().block();
assertThat(check.isHealthy()).isTrue();
}
@Test
void checkShouldDetectWhenRabbitMQFail(DockerRabbitMQ rabbitMQ) throws
Exception {
- healthCheck.checkReactive().block();
+ healthCheck.check().block();
rabbitMQ.stopApp();
- Result check = healthCheck.checkReactive().block();
+ Result check = healthCheck.check().block();
assertThat(check.isHealthy()).isFalse();
}
}
\ No newline at end of file
diff --git
a/core/src/main/java/org/apache/james/core/healthcheck/HealthCheck.java
b/core/src/main/java/org/apache/james/core/healthcheck/HealthCheck.java
index 4f0bd4b..9fd5b0f 100644
--- a/core/src/main/java/org/apache/james/core/healthcheck/HealthCheck.java
+++ b/core/src/main/java/org/apache/james/core/healthcheck/HealthCheck.java
@@ -23,5 +23,5 @@ import org.reactivestreams.Publisher;
public interface HealthCheck {
ComponentName componentName();
- Publisher<Result> checkReactive();
+ Publisher<Result> check();
}
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheck.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheck.java
index dfc8ce1..27d33d6 100644
---
a/mailbox/api/src/main/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheck.java
+++
b/mailbox/api/src/main/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheck.java
@@ -43,7 +43,7 @@ public class EventDeadLettersHealthCheck implements
HealthCheck {
}
@Override
- public Mono<Result> checkReactive() {
+ public Mono<Result> check() {
return eventDeadLetters.containEvents()
.map(containEvents -> {
if (containEvents) {
diff --git
a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
index 73d4f39..7c16b7b 100644
---
a/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
+++
b/mailbox/api/src/test/java/org/apache/james/mailbox/events/EventDeadLettersHealthCheckContract.java
@@ -57,8 +57,8 @@ interface EventDeadLettersHealthCheckContract {
@Test
default void checkShouldReturnHealthyWhenEventDeadLetterEmpty() {
- assertThat(testee().checkReactive().block().isHealthy()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isHealthy()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.healthy(COMPONENT_NAME));
}
@@ -66,8 +66,8 @@ interface EventDeadLettersHealthCheckContract {
default void checkShouldReturnDegradedWhenEventDeadLetterContainEvent() {
eventDeadLetters().store(GROUP_A, EVENT_1).block();
- assertThat(testee().checkReactive().block().isDegraded()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isDegraded()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME,
EXPECTED_DEGRADED_MESSAGE));
}
@@ -76,8 +76,8 @@ interface EventDeadLettersHealthCheckContract {
eventDeadLetters().store(GROUP_A, EVENT_1).block();
eventDeadLetters().store(GROUP_B, EVENT_2).block();
- assertThat(testee().checkReactive().block().isDegraded()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isDegraded()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME,
EXPECTED_DEGRADED_MESSAGE));
}
@@ -86,15 +86,15 @@ interface EventDeadLettersHealthCheckContract {
EventDeadLetters.InsertionId insertionId1 =
eventDeadLetters().store(GROUP_A, EVENT_1).block();
EventDeadLetters.InsertionId insertionId2 =
eventDeadLetters().store(GROUP_B, EVENT_2).block();
- assertThat(testee().checkReactive().block().isDegraded()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isDegraded()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME,
EXPECTED_DEGRADED_MESSAGE));
eventDeadLetters().remove(GROUP_A, insertionId1).block();
eventDeadLetters().remove(GROUP_B, insertionId2).block();
- assertThat(testee().checkReactive().block().isHealthy()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isHealthy()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.healthy(COMPONENT_NAME));
}
@@ -103,14 +103,14 @@ interface EventDeadLettersHealthCheckContract {
EventDeadLetters.InsertionId insertionId1 =
eventDeadLetters().store(GROUP_A, EVENT_1).block();
eventDeadLetters().store(GROUP_B, EVENT_2).block();
- assertThat(testee().checkReactive().block().isDegraded()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isDegraded()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME,
EXPECTED_DEGRADED_MESSAGE));
eventDeadLetters().remove(GROUP_A, insertionId1).block();
- assertThat(testee().checkReactive().block().isDegraded()).isTrue();
- assertThat(testee().checkReactive().block())
+ assertThat(testee().check().block().isDegraded()).isTrue();
+ assertThat(testee().check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME,
EXPECTED_DEGRADED_MESSAGE));
}
@@ -119,7 +119,7 @@ interface EventDeadLettersHealthCheckContract {
Result actualResult;
try {
createErrorWhenDoingHealthCheck();
- actualResult = testee().checkReactive().block();
+ actualResult = testee().check().block();
} finally {
resolveErrorWhenDoingHealthCheck();
}
diff --git
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java
index 2dacb09..1da811a 100644
---
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java
+++
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java
@@ -41,7 +41,7 @@ public class GuiceLifecycleHealthCheck implements HealthCheck
{
}
@Override
- public Mono<Result> checkReactive() {
+ public Mono<Result> check() {
if (probe.isStarted()) {
return Mono.just(Result.healthy(componentName()));
} else {
diff --git
a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
b/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
index 68c08b7..c51efdf 100644
---
a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
+++
b/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
@@ -60,7 +60,7 @@ public class PeriodicalHealthChecks implements Startable {
public void start() {
disposable = Flux.interval(configuration.getPeriod(), scheduler)
.flatMap(any -> Flux.fromIterable(healthChecks)
- .flatMap(healthCheck ->
Mono.from(healthCheck.checkReactive())))
+ .flatMap(healthCheck -> Mono.from(healthCheck.check())))
.doOnNext(this::logResult)
.onErrorContinue(this::logError)
.subscribeOn(Schedulers.elastic())
diff --git
a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
b/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
index 8627197..49e346b 100644
---
a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
+++
b/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
@@ -54,8 +54,8 @@ public class PeriodicalHealthChecksTest {
void setUp() {
mockHealthCheck1 = Mockito.mock(EventDeadLettersHealthCheck.class);
mockHealthCheck2 = Mockito.mock(GuiceLifecycleHealthCheck.class);
-
when(mockHealthCheck1.checkReactive()).thenReturn(Mono.just(Result.healthy(new
ComponentName("mockHealthCheck1"))));
-
when(mockHealthCheck2.checkReactive()).thenReturn(Mono.just(Result.healthy(new
ComponentName("mockHealthCheck2"))));
+ when(mockHealthCheck1.check()).thenReturn(Mono.just(Result.healthy(new
ComponentName("mockHealthCheck1"))));
+ when(mockHealthCheck2.check()).thenReturn(Mono.just(Result.healthy(new
ComponentName("mockHealthCheck2"))));
scheduler = VirtualTimeScheduler.getOrSet();
testee = new PeriodicalHealthChecks(ImmutableSet.of(mockHealthCheck1,
mockHealthCheck2),
@@ -73,7 +73,7 @@ public class PeriodicalHealthChecksTest {
testee.start();
scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD));
- verify(mockHealthCheck1, atLeast(1)).checkReactive();
+ verify(mockHealthCheck1, atLeast(1)).check();
}
@Test
@@ -81,7 +81,7 @@ public class PeriodicalHealthChecksTest {
testee.start();
scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD *
EXPECTED_INVOKED_TIME));
- verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).checkReactive();
+ verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).check();
}
@Test
@@ -89,17 +89,17 @@ public class PeriodicalHealthChecksTest {
testee.start();
scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD *
EXPECTED_INVOKED_TIME));
- verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).checkReactive();
- verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).checkReactive();
+ verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).check();
+ verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).check();
}
@Test
void startShouldCallRemainingHealthChecksWhenAHealthCheckThrows() {
-
when(mockHealthCheck1.checkReactive()).thenReturn(Mono.error(RuntimeException::new));
+
when(mockHealthCheck1.check()).thenReturn(Mono.error(RuntimeException::new));
testee.start();
scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD *
EXPECTED_INVOKED_TIME));
- verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).checkReactive();
+ verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).check();
}
}
\ No newline at end of file
diff --git
a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheck.java
b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheck.java
index 61c5f79..25adc02 100644
---
a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheck.java
+++
b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheck.java
@@ -52,7 +52,7 @@ public class MessageFastViewProjectionHealthCheck implements
HealthCheck {
}
@Override
- public Mono<Result> checkReactive() {
+ public Mono<Result> check() {
return Mono.fromCallable(() -> retrieveMissCountMetric.getCount())
.flatMap(missCount -> {
if (missCount == 0) {
diff --git
a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheckTest.java
b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheckTest.java
index f7ac3fa..2b4dc5f 100644
---
a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheckTest.java
+++
b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionHealthCheckTest.java
@@ -62,7 +62,7 @@ class MessageFastViewProjectionHealthCheckTest {
@Test
void checkShouldReturnHealthyWhenNoRetrieveCalled() {
- assertThat(testee.checkReactive().block())
+ assertThat(testee.check().block())
.isEqualTo(Result.healthy(COMPONENT_NAME));
}
@@ -71,7 +71,7 @@ class MessageFastViewProjectionHealthCheckTest {
missMetric.increment();
missMetric.increment();
- assertThat(testee.checkReactive().block())
+ assertThat(testee.check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME, "retrieveMissCount
percentage 100.0% (2/2) is higher than the threshold 10.0%"));
}
@@ -80,7 +80,7 @@ class MessageFastViewProjectionHealthCheckTest {
missMetric.increment();
hitMetric.add(43);
- assertThat(testee.checkReactive().block())
+ assertThat(testee.check().block())
.isEqualTo(Result.healthy(COMPONENT_NAME));
}
@@ -89,7 +89,7 @@ class MessageFastViewProjectionHealthCheckTest {
missMetric.increment();
hitMetric.add(9);
- assertThat(testee.checkReactive().block())
+ assertThat(testee.check().block())
.isEqualTo(Result.healthy(COMPONENT_NAME));
}
@@ -98,7 +98,7 @@ class MessageFastViewProjectionHealthCheckTest {
missMetric.increment();
hitMetric.add(3);
- assertThat(testee.checkReactive().block())
+ assertThat(testee.check().block())
.isEqualTo(Result.degraded(COMPONENT_NAME,
"retrieveMissCount percentage 25.0% (1/4) is higher than
the threshold 10.0%"));
}
@@ -107,11 +107,11 @@ class MessageFastViewProjectionHealthCheckTest {
void checkShouldReturnHealthyAfterMoreHits() {
missMetric.increment();
hitMetric.increment();
- Result resultWithLessHit = testee.checkReactive().block();
+ Result resultWithLessHit = testee.check().block();
// more hits
hitMetric.add(10);
- Result resultWithMoreHit = testee.checkReactive().block();
+ Result resultWithMoreHit = testee.check().block();
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(resultWithLessHit)
@@ -126,11 +126,11 @@ class MessageFastViewProjectionHealthCheckTest {
void checkShouldKeepBeingDegradedAfterNotEnoughOfHits() {
missMetric.increment();
hitMetric.increment();
- Result resultWithLessHit = testee.checkReactive().block();
+ Result resultWithLessHit = testee.check().block();
// more hits, but not enough
hitMetric.add(3);
- Result resultWithMoreHit = testee.checkReactive().block();
+ Result resultWithMoreHit = testee.check().block();
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(resultWithLessHit)
@@ -148,11 +148,11 @@ class MessageFastViewProjectionHealthCheckTest {
// enough of hits
hitMetric.add(10);
- Result resultWithEnoughOfHits = testee.checkReactive().block();
+ Result resultWithEnoughOfHits = testee.check().block();
// more miss
missMetric.increment();
- Result resultWithMoreMiss = testee.checkReactive().block();
+ Result resultWithMoreMiss = testee.check().block();
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(resultWithEnoughOfHits)
@@ -168,12 +168,12 @@ class MessageFastViewProjectionHealthCheckTest {
missMetric.increment();
// enough of hits
hitMetric.add(10000);
- Result resultWithEnoughOfHits = testee.checkReactive().block();
+ Result resultWithEnoughOfHits = testee.check().block();
// more miss, but not enough
IntStream.rangeClosed(1, 3)
.forEach(counter -> missMetric.increment());
- Result resultWithMoreMiss = testee.checkReactive().block();
+ Result resultWithMoreMiss = testee.check().block();
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(resultWithEnoughOfHits)
diff --git
a/server/data/data-jpa/src/main/java/org/apache/james/jpa/healthcheck/JPAHealthCheck.java
b/server/data/data-jpa/src/main/java/org/apache/james/jpa/healthcheck/JPAHealthCheck.java
index 281626c..fce5c66 100644
---
a/server/data/data-jpa/src/main/java/org/apache/james/jpa/healthcheck/JPAHealthCheck.java
+++
b/server/data/data-jpa/src/main/java/org/apache/james/jpa/healthcheck/JPAHealthCheck.java
@@ -45,7 +45,7 @@ public class JPAHealthCheck implements HealthCheck {
}
@Override
- public Mono<Result> checkReactive() {
+ public Mono<Result> check() {
return Mono.fromCallable(entityManagerFactory::createEntityManager)
.map(entityManager -> entityManager.isOpen())
.map(open -> {
diff --git
a/server/data/data-jpa/src/test/java/org/apache/james/jpa/healthcheck/JPAHealthCheckTest.java
b/server/data/data-jpa/src/test/java/org/apache/james/jpa/healthcheck/JPAHealthCheckTest.java
index a365abe..38e8326 100644
---
a/server/data/data-jpa/src/test/java/org/apache/james/jpa/healthcheck/JPAHealthCheckTest.java
+++
b/server/data/data-jpa/src/test/java/org/apache/james/jpa/healthcheck/JPAHealthCheckTest.java
@@ -46,7 +46,7 @@ class JPAHealthCheckTest {
@Test
void testWhenActive() {
- Result result = jpaHealthCheck.checkReactive().block();
+ Result result = jpaHealthCheck.check().block();
ResultStatus healthy = ResultStatus.HEALTHY;
assertThat(result.getStatus()).as("Result %s status should be %s",
result.getStatus(), healthy)
.isEqualTo(healthy);
@@ -57,7 +57,7 @@ class JPAHealthCheckTest {
jpaTestCluster.getEntityManagerFactory().close();
Result result = Result.healthy(jpaHealthCheck.componentName());
try {
- result = jpaHealthCheck.checkReactive().block();
+ result = jpaHealthCheck.check().block();
} catch (IllegalStateException e) {
fail("The exception of the EMF was not handled property.ยช");
}
diff --git
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
index ce75afa..32747c2 100644
---
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
+++
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
@@ -122,7 +122,7 @@ public class HealthCheckRoutes implements PublicRoutes {
.findFirst()
.orElseThrow(() -> throw404(componentName));
- Result result = Mono.from(healthCheck.checkReactive()).block();
+ Result result = Mono.from(healthCheck.check()).block();
logFailedCheck(result);
response.status(getCorrespondingStatusCode(result.getStatus()));
return new HealthCheckExecutionResultDto(result);
@@ -179,7 +179,7 @@ public class HealthCheckRoutes implements PublicRoutes {
private Flux<Result> executeHealthChecks() {
return Flux.fromIterable(healthChecks)
- .flatMap(HealthCheck::checkReactive)
+ .flatMap(HealthCheck::check)
.doOnNext(this::logFailedCheck);
}
diff --git
a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
index a394531..939175f 100644
---
a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java
@@ -67,7 +67,7 @@ public class HealthCheckRoutesTest {
}
@Override
- public Publisher<Result> checkReactive() {
+ public Publisher<Result> check() {
return Mono.just(result);
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
