JAMES-2260 Fix typo s/expended/expanded/
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cba3030e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cba3030e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cba3030e Branch: refs/heads/master Commit: cba3030e677b9ab12a52342fdcd9b30992bc541f Parents: 1a7b6a9 Author: benwa <btell...@linagora.com> Authored: Mon Dec 18 17:15:02 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Wed Dec 20 08:23:06 2017 +0700 ---------------------------------------------------------------------- .../mailets/remoteDelivery/DelaysAndMaxRetry.java | 3 ++- .../remoteDelivery/RemoteDeliveryConfiguration.java | 4 ++-- .../remoteDelivery/DelaysAndMaxRetryTest.java | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/cba3030e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetry.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetry.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetry.java index ecd9deb..e2b43ba 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetry.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetry.java @@ -20,6 +20,7 @@ package org.apache.james.transport.mailets.remoteDelivery; import java.util.List; + import javax.mail.MessagingException; import org.slf4j.Logger; @@ -134,7 +135,7 @@ public class DelaysAndMaxRetry { * @param list the list to expand * @return the expanded list */ - public List<Long> getExpendedDelays() { + public List<Long> getExpandedDelays() { ImmutableList.Builder<Long> builder = ImmutableList.builder(); for (Delay delay: delays) { builder.addAll(delay.getExpendendDelays()); http://git-wip-us.apache.org/repos/asf/james-project/blob/cba3030e/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java index d6c59d8..1c970d6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Optional; import java.util.Properties; -import org.apache.james.domainlist.api.DomainList; import org.apache.commons.lang3.tuple.Pair; +import org.apache.james.domainlist.api.DomainList; import org.apache.mailet.MailetConfig; import org.apache.mailet.base.MailetUtil; import org.slf4j.Logger; @@ -101,7 +101,7 @@ public class RemoteDeliveryConfiguration { DelaysAndMaxRetry delaysAndMaxRetry = computeDelaysAndMaxRetry(mailetConfig); maxRetries = delaysAndMaxRetry.getMaxRetries(); - delayTimes = delaysAndMaxRetry.getExpendedDelays(); + delayTimes = delaysAndMaxRetry.getExpandedDelays(); smtpTimeout = computeSmtpTimeout(mailetConfig); connectionTimeout = computeConnectionTimeout(mailetConfig); dnsProblemRetry = computeDnsProblemRetry(mailetConfig); http://git-wip-us.apache.org/repos/asf/james-project/blob/cba3030e/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetryTest.java index 223acb2..133743d 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetryTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelaysAndMaxRetryTest.java @@ -114,30 +114,30 @@ public class DelaysAndMaxRetryTest { } @Test - public void getExpendedDelaysShouldReturnEmptyWhenNoDelay() throws Exception { + public void getExpandedDelaysShouldReturnEmptyWhenNoDelay() throws Exception { DelaysAndMaxRetry testee = DelaysAndMaxRetry.from(0, ""); - assertThat(testee.getExpendedDelays()).isEmpty(); + assertThat(testee.getExpandedDelays()).isEmpty(); } @Test - public void getExpendedDelaysShouldExpandSingleDelays() throws Exception { + public void getExpandedDelaysShouldExpandSingleDelays() throws Exception { DelaysAndMaxRetry testee = DelaysAndMaxRetry.from(3, "1*1S,1*2S,1*5S"); - assertThat(testee.getExpendedDelays()).containsExactly(1000L, 2000L, 5000L); + assertThat(testee.getExpandedDelays()).containsExactly(1000L, 2000L, 5000L); } @Test - public void getExpendedDelaysShouldExpandMultipleDelays() throws Exception { + public void getExpandedDelaysShouldExpandMultipleDelays() throws Exception { DelaysAndMaxRetry testee = DelaysAndMaxRetry.from(3, "1*1S,2*2S,2*5S"); - assertThat(testee.getExpendedDelays()).containsExactly(1000L, 2000L, 2000L, 5000L, 5000L); + assertThat(testee.getExpandedDelays()).containsExactly(1000L, 2000L, 2000L, 5000L, 5000L); } @Test - public void getExpendedDelaysShouldExpandMultipleDelaysWithSpaces() throws Exception { + public void getExpandedDelaysShouldExpandMultipleDelaysWithSpaces() throws Exception { DelaysAndMaxRetry testee = DelaysAndMaxRetry.from(3, "1 * 1 S, 2 * 2 S , 2 * 5 S"); - assertThat(testee.getExpendedDelays()).containsExactly(1000L, 2000L, 2000L, 5000L, 5000L); + assertThat(testee.getExpandedDelays()).containsExactly(1000L, 2000L, 2000L, 5000L, 5000L); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
