MAILBOX-374 Specify unit for minDelays upon connection retries
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c1a2a95b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c1a2a95b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c1a2a95b Branch: refs/heads/master Commit: c1a2a95b7f1092025bc289adf89ee27d0ab36eb1 Parents: edf8530 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Jan 24 14:17:19 2019 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Jan 25 10:33:25 2019 +0700 ---------------------------------------------------------------------- .../backend/rabbitmq/RabbitMQConfiguration.java | 25 ++++++++++---------- .../rabbitmq/RabbitMQConnectionFactory.java | 2 +- .../james/backend/rabbitmq/DockerRabbitMQ.java | 2 +- .../rabbitmq/RabbitMQConfigurationTest.java | 6 ++--- .../rabbitmq/RabbitMQConnectionFactoryTest.java | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/c1a2a95b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConfiguration.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConfiguration.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConfiguration.java index 8da712a..41b4dfc 100644 --- a/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConfiguration.java +++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConfiguration.java @@ -103,14 +103,14 @@ public class RabbitMQConfiguration { private final URI managementUri; private final ManagementCredentials managementCredentials; private Optional<Integer> maxRetries; - private Optional<Integer> minDelay; + private Optional<Integer> minDelayInMs; private Builder(URI amqpUri, URI managementUri, ManagementCredentials managementCredentials) { this.amqpUri = amqpUri; this.managementUri = managementUri; this.managementCredentials = managementCredentials; this.maxRetries = Optional.empty(); - this.minDelay = Optional.empty(); + this.minDelayInMs = Optional.empty(); } public Builder maxRetries(int maxRetries) { @@ -118,8 +118,8 @@ public class RabbitMQConfiguration { return this; } - public Builder minDelay(int minDelay) { - this.minDelay = Optional.of(minDelay); + public Builder minDelayInMs(int minDelay) { + this.minDelayInMs = Optional.of(minDelay); return this; } @@ -131,7 +131,7 @@ public class RabbitMQConfiguration { managementUri, managementCredentials, maxRetries.orElse(DEFAULT_MAX_RETRIES), - minDelay.orElse(DEFAULT_MIN_DELAY)); + minDelayInMs.orElse(DEFAULT_MIN_DELAY)); } } @@ -170,15 +170,16 @@ public class RabbitMQConfiguration { private final URI uri; private final URI managementUri; private final int maxRetries; - private final int minDelay; + private final int minDelayInMs; + private final ManagementCredentials managementCredentials; - private RabbitMQConfiguration(URI uri, URI managementUri, ManagementCredentials managementCredentials, int maxRetries, int minDelay) { + private RabbitMQConfiguration(URI uri, URI managementUri, ManagementCredentials managementCredentials, int maxRetries, int minDelayInMs) { this.uri = uri; this.managementUri = managementUri; this.managementCredentials = managementCredentials; this.maxRetries = maxRetries; - this.minDelay = minDelay; + this.minDelayInMs = minDelayInMs; } public URI getUri() { @@ -193,8 +194,8 @@ public class RabbitMQConfiguration { return maxRetries; } - public int getMinDelay() { - return minDelay; + public int getMinDelayInMs() { + return minDelayInMs; } public ManagementCredentials getManagementCredentials() { @@ -209,7 +210,7 @@ public class RabbitMQConfiguration { return Objects.equals(this.uri, that.uri) && Objects.equals(this.managementUri, that.managementUri) && Objects.equals(this.maxRetries, that.maxRetries) - && Objects.equals(this.minDelay, that.minDelay) + && Objects.equals(this.minDelayInMs, that.minDelayInMs) && Objects.equals(this.managementCredentials, that.managementCredentials); } return false; @@ -217,6 +218,6 @@ public class RabbitMQConfiguration { @Override public final int hashCode() { - return Objects.hash(uri, managementUri, maxRetries, minDelay, managementCredentials); + return Objects.hash(uri, managementUri, maxRetries, minDelayInMs, managementCredentials); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/c1a2a95b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactory.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactory.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactory.java index c13b21b..ac469e4 100644 --- a/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactory.java +++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactory.java @@ -77,7 +77,7 @@ public class RabbitMQConnectionFactory { public Mono<Connection> connectionMono() { return Mono.fromCallable(new ConnectionCallable(connectionFactory)) - .retryBackoff(configuration.getMaxRetries(), Duration.ofMillis(configuration.getMinDelay())) + .retryBackoff(configuration.getMaxRetries(), Duration.ofMillis(configuration.getMinDelayInMs())) .publishOn(Schedulers.elastic()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/c1a2a95b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java index 1dc7daf..d5f420e 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/DockerRabbitMQ.java @@ -246,7 +246,7 @@ public class DockerRabbitMQ { .managementUri(managementUri()) .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) .maxRetries(MAX_THREE_RETRIES) - .minDelay(MIN_DELAY_OF_ONE_HUNDRED_MILLISECONDS) + .minDelayInMs(MIN_DELAY_OF_ONE_HUNDRED_MILLISECONDS) .build(); return new RabbitMQConnectionFactory(rabbitMQConfiguration); http://git-wip-us.apache.org/repos/asf/james-project/blob/c1a2a95b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConfigurationTest.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConfigurationTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConfigurationTest.java index cbdf02f..dbefc59 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConfigurationTest.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConfigurationTest.java @@ -207,7 +207,7 @@ class RabbitMQConfigurationTest { .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) .build(); - assertThat(rabbitMQConfiguration.getMinDelay()) + assertThat(rabbitMQConfiguration.getMinDelayInMs()) .isEqualTo(RabbitMQConfiguration.Builder.DEFAULT_MIN_DELAY); } @@ -219,10 +219,10 @@ class RabbitMQConfigurationTest { .amqpUri(new URI("amqp://james:james@rabbitmq_host:5672")) .managementUri(new URI("http://james:james@rabbitmq_host:15672/api/")) .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) - .minDelay(minDelay) + .minDelayInMs(minDelay) .build(); - assertThat(rabbitMQConfiguration.getMinDelay()) + assertThat(rabbitMQConfiguration.getMinDelayInMs()) .isEqualTo(minDelay); } http://git-wip-us.apache.org/repos/asf/james-project/blob/c1a2a95b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java index 024db49..3dce665 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java @@ -56,7 +56,7 @@ class RabbitMQConnectionFactoryTest { .managementUri(URI.create("http://james:james@rabbitmq_host:15672/api/")) .managementCredentials(DEFAULT_MANAGEMENT_CREDENTIAL) .maxRetries(1) - .minDelay(1) + .minDelayInMs(1) .build(); RabbitMQConnectionFactory rabbitMQConnectionFactory = new RabbitMQConnectionFactory(rabbitMQConfiguration); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org