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 3ba85a34cb3830a3dfc31c49b56b77eda8b5deaf Author: LanKhuat <[email protected]> AuthorDate: Thu Mar 26 20:48:03 2020 +0700 JAMES-3117 Add PeriodicalHealthChecksConfiguration/Test --- .../james/PeriodicalHealthChecksConfiguration.java | 9 +++++---- .../PeriodicalHealthChecksConfigurationTest.java | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java b/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java index aa8bbfb..444ef4e 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java @@ -23,6 +23,7 @@ import java.time.Duration; import java.util.Objects; import org.apache.commons.configuration2.Configuration; +import org.apache.james.util.DurationParser; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -30,9 +31,9 @@ import com.google.common.base.Preconditions; public class PeriodicalHealthChecksConfiguration { private static final String HEALTH_CHECK_PERIOD = "healthcheck.period"; - private static final String DEFAULT_HEALTH_CHECK_PERIOD = "PT60s"; + private static final String DEFAULT_HEALTH_CHECK_PERIOD = "60s"; public static final PeriodicalHealthChecksConfiguration DEFAULT_CONFIGURATION = builder() - .period(Duration.parse(DEFAULT_HEALTH_CHECK_PERIOD)) + .period(DurationParser.parse(DEFAULT_HEALTH_CHECK_PERIOD)) .build(); public interface Builder { @@ -59,12 +60,12 @@ public class PeriodicalHealthChecksConfiguration { } public static Builder.RequiredPeriod builder() { - return period -> new Builder.ReadyToBuild(period); + return Builder.ReadyToBuild::new; } public static PeriodicalHealthChecksConfiguration from(Configuration configuration) { return builder() - .period(Duration.parse(configuration.getString(HEALTH_CHECK_PERIOD, DEFAULT_HEALTH_CHECK_PERIOD))) + .period(DurationParser.parse(configuration.getString(HEALTH_CHECK_PERIOD, DEFAULT_HEALTH_CHECK_PERIOD))) .build(); } diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java index d7830cf..10fdcf5 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java @@ -24,9 +24,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; -import java.time.format.DateTimeParseException; import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.james.util.DurationParser; import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -34,7 +34,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; public class PeriodicalHealthChecksConfigurationTest { private static final String HEALTH_CHECK_PERIOD = "healthcheck.period"; - private static final String PERIOD = "PT5s"; + private static final String PERIOD = "5s"; private static final String EMPTY_STRING = ""; private static final String RANDOM_STRING = "abcdsfsfs"; @@ -55,15 +55,15 @@ public class PeriodicalHealthChecksConfigurationTest { @Test void builderShouldThrowWhenPeriodHasIncorrectFormat() { assertThatThrownBy(() -> PeriodicalHealthChecksConfiguration.builder() - .period(Duration.parse(RANDOM_STRING)) + .period(DurationParser.parse(RANDOM_STRING)) .build()) - .isInstanceOf(DateTimeParseException.class); + .isInstanceOf(NumberFormatException.class); } @Test void builderShouldThrowWhenPeriodIsNegative() { assertThatThrownBy(() -> PeriodicalHealthChecksConfiguration.builder() - .period(Duration.parse("-" + PERIOD)) + .period(DurationParser.parse("-" + PERIOD)) .build()) .isInstanceOf(IllegalArgumentException.class); } @@ -79,10 +79,10 @@ public class PeriodicalHealthChecksConfigurationTest { @Test void builderShouldReturnCorrectConfiguration() { PeriodicalHealthChecksConfiguration configuration = PeriodicalHealthChecksConfiguration.builder() - .period(Duration.parse(PERIOD)) + .period(DurationParser.parse(PERIOD)) .build(); - assertThat(configuration.getPeriod()).isEqualTo(Duration.parse(PERIOD)); + assertThat(configuration.getPeriod()).isEqualTo(DurationParser.parse(PERIOD)); } @Test @@ -91,7 +91,7 @@ public class PeriodicalHealthChecksConfigurationTest { configuration.addProperty(HEALTH_CHECK_PERIOD, EMPTY_STRING); assertThatThrownBy(() -> PeriodicalHealthChecksConfiguration.from(configuration)) - .isInstanceOf(DateTimeParseException.class); + .isInstanceOf(NumberFormatException.class); } @Test @@ -119,7 +119,7 @@ public class PeriodicalHealthChecksConfigurationTest { configuration.addProperty(HEALTH_CHECK_PERIOD, RANDOM_STRING); assertThatThrownBy(() -> PeriodicalHealthChecksConfiguration.from(configuration)) - .isInstanceOf(DateTimeParseException.class); + .isInstanceOf(NumberFormatException.class); } @Test @@ -128,7 +128,7 @@ public class PeriodicalHealthChecksConfigurationTest { configuration.addProperty(HEALTH_CHECK_PERIOD, PERIOD); assertThat(PeriodicalHealthChecksConfiguration.from(configuration)).isEqualTo(PeriodicalHealthChecksConfiguration.builder() - .period(Duration.parse(PERIOD)) + .period(DurationParser.parse(PERIOD)) .build()); } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
