You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/01/10 10:14:23 UTC
[23/53] [abbrv] james-project git commit: JAMES-2277 tab to 4 spaces
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
index bebbe7d..62cf17d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/MailboxStatusResponseEncoder.java
@@ -53,36 +53,36 @@ public class MailboxStatusResponseEncoder extends AbstractChainedImapEncoder imp
composer.openParen();
if (messages != null) {
- composer.message(STATUS_MESSAGES);
+ composer.message(STATUS_MESSAGES);
final long messagesValue = messages.longValue();
composer.message(messagesValue);
}
if (recent != null) {
- composer.message(STATUS_RECENT);
+ composer.message(STATUS_RECENT);
final long recentValue = recent.longValue();
composer.message(recentValue);
}
if (uidNext != null) {
- composer.message(STATUS_UIDNEXT);
+ composer.message(STATUS_UIDNEXT);
final long uidNextValue = uidNext.asLong();
composer.message(uidNextValue);
}
if (highestModSeq != null) {
- composer.message(STATUS_HIGHESTMODSEQ);
- composer.message(highestModSeq);
+ composer.message(STATUS_HIGHESTMODSEQ);
+ composer.message(highestModSeq);
}
if (uidValidity != null) {
- composer.message(STATUS_UIDVALIDITY);
+ composer.message(STATUS_UIDVALIDITY);
final long uidValidityValue = uidValidity.longValue();
composer.message(uidValidityValue);
}
if (unseen != null) {
- composer.message(STATUS_UNSEEN);
+ composer.message(STATUS_UNSEEN);
final long unseenValue = unseen.longValue();
composer.message(unseenValue);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
index f12c02a..fdbc767 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/SearchResponseEncoder.java
@@ -49,10 +49,10 @@ public class SearchResponseEncoder extends AbstractChainedImapEncoder {
// add MODSEQ
if (highestModSeq != null) {
- composer.openParen();
- composer.message("MODSEQ");
- composer.message(highestModSeq);
- composer.closeParen();
+ composer.openParen();
+ composer.message("MODSEQ");
+ composer.message(highestModSeq);
+ composer.closeParen();
}
composer.end();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
index a8115f4..6f0bf25 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java
@@ -68,16 +68,16 @@ public class StatusResponseEncoder extends AbstractChainedImapEncoder {
//composer.statusResponse(tag, command, type, code, parameters, useParens, number, text);
if (tag == null) {
- composer.untagged();
+ composer.untagged();
} else {
- composer.tag(tag);
+ composer.tag(tag);
}
composer.message(type);
if (responseCode != null) {
- composer.openSquareBracket();
- composer.message(code);
+ composer.openSquareBracket();
+ composer.message(code);
if (number > -1) {
- composer.message(number);
+ composer.message(number);
}
if (parameters != null && !parameters.isEmpty()) {
if (useParens) {
@@ -93,10 +93,10 @@ public class StatusResponseEncoder extends AbstractChainedImapEncoder {
composer.closeSquareBracket();
}
if (command != null) {
- composer.commandName(command.getName());
+ composer.commandName(command.getName());
}
if (text != null && !"".equals(text)) {
- composer.message(text);
+ composer.message(text);
}
composer.end();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
index 270a7ca..7c92fec 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/MoveRequest.java
@@ -28,8 +28,8 @@ import org.apache.james.imap.api.message.request.ImapRequest;
*/
public class MoveRequest extends AbstractMessageRangeRequest {
- public MoveRequest(ImapCommand command, IdRange[] idSet, String mailboxName, boolean useUids, String tag) {
- super(command, idSet, mailboxName, useUids, tag);
- }
+ public MoveRequest(ImapCommand command, IdRange[] idSet, String mailboxName, boolean useUids, String tag) {
+ super(command, idSet, mailboxName, useUids, tag);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
index b93c2bf..6b5a05c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
@@ -92,7 +92,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
final Flags flags = request.getFlags();
if (unchangedSince != -1) {
- MetaData metaData = mailbox.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT);
+ MetaData metaData = mailbox.getMetaData(false, mailboxSession, FetchGroup.NO_COUNT);
if (metaData.isModSeqPermanent() == false) {
// Check if the mailbox did not support modsequences. If so return a tagged bad response.
// See RFC4551 3.1.2. NOMODSEQ Response Code
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
index 0fea83b..866a2e3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
@@ -74,12 +74,12 @@ public final class EnvelopeBuilder {
// ENVELOPE header values must be unfolded
// See IMAP-269
- //
- //
- // IMAP-Servers are advised to also replace tabs with single spaces while doing the unfolding. This is what javamails
- // unfold does. mime4j's unfold does strictly follow the rfc and so preserve them
- //
- // See IMAP-327 and https://mailman2.u.washington.edu/mailman/htdig/imap-protocol/2010-July/001271.html
+ //
+ //
+ // IMAP-Servers are advised to also replace tabs with single spaces while doing the unfolding. This is what javamails
+ // unfold does. mime4j's unfold does strictly follow the rfc and so preserve them
+ //
+ // See IMAP-327 and https://mailman2.u.washington.edu/mailman/htdig/imap-protocol/2010-July/001271.html
result = MimeUtility.unfold(value);
}
@@ -116,11 +116,11 @@ public final class EnvelopeBuilder {
// We need to unfold the header line.
// See https://issues.apache.org/jira/browse/IMAP-154
- //
- // IMAP-Servers are advised to also replace tabs with single spaces while doing the unfolding. This is what javamails
- // unfold does. mime4j's unfold does strictly follow the rfc and so preserve them
- //
- // See IMAP-327 and https://mailman2.u.washington.edu/mailman/htdig/imap-protocol/2010-July/001271.html
+ //
+ // IMAP-Servers are advised to also replace tabs with single spaces while doing the unfolding. This is what javamails
+ // unfold does. mime4j's unfold does strictly follow the rfc and so preserve them
+ //
+ // See IMAP-327 and https://mailman2.u.washington.edu/mailman/htdig/imap-protocol/2010-July/001271.html
String value = MimeUtility.unfold(header.getValue());
if ("".equals(value.trim())) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
index 0512cdd..cad8eda 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
@@ -33,63 +33,63 @@ import org.junit.Test;
public class IdRangeParseTest {
-
- /**
- * Test for https://issues.apache.org/jira/browse/IMAP-212
- * @throws DecodingException
- */
- @Test
- public void testRangeInRandomOrder() throws DecodingException {
- int val1 = 1;
- int val2 = 3;
-
- IdRange[] ranges1 = ranges(rangeAsString(val1, val2));
- assertEquals(1, ranges1.length);
- assertEquals(val1, ranges1[0].getLowVal());
- assertEquals(val2, ranges1[0].getHighVal());
-
- IdRange[] ranges2 = ranges(rangeAsString(val2, val1));
- assertEquals(1, ranges2.length);
- assertEquals(val1, ranges2[0].getLowVal());
- assertEquals(val2, ranges2[0].getHighVal());
- }
-
- @Test
- public void testRangeUnsigned() throws DecodingException {
- int val1 = 1;
-
- try {
- ranges(rangeAsString(0, val1));
- Assert.fail();
- } catch (DecodingException e) {
- // number smaller then 1 should not work
- }
-
-
- try {
- ranges(rangeAsString(Long.MAX_VALUE, val1));
- Assert.fail();
- } catch (DecodingException e) {
- // number smaller then 1 should not work
- }
-
- IdRange[] ranges2 = ranges(rangeAsString(ImapConstants.MIN_NZ_NUMBER, ImapConstants.MAX_NZ_NUMBER));
- assertEquals(1, ranges2.length);
- assertEquals(ImapConstants.MIN_NZ_NUMBER, ranges2[0].getLowVal());
- assertEquals(ImapConstants.MAX_NZ_NUMBER, ranges2[0].getHighVal());
-
- }
-
- private String rangeAsString(long val1, long val2) {
- return val1 + ":" + val2;
- }
-
- private IdRange[] ranges(String rangesAsString) throws DecodingException {
+
+ /**
+ * Test for https://issues.apache.org/jira/browse/IMAP-212
+ * @throws DecodingException
+ */
+ @Test
+ public void testRangeInRandomOrder() throws DecodingException {
+ int val1 = 1;
+ int val2 = 3;
+
+ IdRange[] ranges1 = ranges(rangeAsString(val1, val2));
+ assertEquals(1, ranges1.length);
+ assertEquals(val1, ranges1[0].getLowVal());
+ assertEquals(val2, ranges1[0].getHighVal());
+
+ IdRange[] ranges2 = ranges(rangeAsString(val2, val1));
+ assertEquals(1, ranges2.length);
+ assertEquals(val1, ranges2[0].getLowVal());
+ assertEquals(val2, ranges2[0].getHighVal());
+ }
+
+ @Test
+ public void testRangeUnsigned() throws DecodingException {
+ int val1 = 1;
+
+ try {
+ ranges(rangeAsString(0, val1));
+ Assert.fail();
+ } catch (DecodingException e) {
+ // number smaller then 1 should not work
+ }
+
+
+ try {
+ ranges(rangeAsString(Long.MAX_VALUE, val1));
+ Assert.fail();
+ } catch (DecodingException e) {
+ // number smaller then 1 should not work
+ }
+
+ IdRange[] ranges2 = ranges(rangeAsString(ImapConstants.MIN_NZ_NUMBER, ImapConstants.MAX_NZ_NUMBER));
+ assertEquals(1, ranges2.length);
+ assertEquals(ImapConstants.MIN_NZ_NUMBER, ranges2[0].getLowVal());
+ assertEquals(ImapConstants.MAX_NZ_NUMBER, ranges2[0].getHighVal());
+
+ }
+
+ private String rangeAsString(long val1, long val2) {
+ return val1 + ":" + val2;
+ }
+
+ private IdRange[] ranges(String rangesAsString) throws DecodingException {
ImapRequestLineReader reader = new ImapRequestStreamLineReader(
new ByteArrayInputStream((rangesAsString + "\r\n").getBytes()),
new ByteArrayOutputStream());
- return reader.parseIdRange();
- }
+ return reader.parseIdRange();
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
index 1a869e6..2c36cac 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
@@ -74,7 +74,7 @@ public class SearchCommandParserCharsetTest {
ImapMessage message;
- private ImapSession session;
+ private ImapSession session;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
index 9f78150..8ed9e21 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
@@ -138,7 +138,7 @@ public class SearchCommandParserQuotedCharsetTest {
private Mockery mockery = new JUnit4Mockery();
- private ImapSession session;
+ private ImapSession session;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
index e308250..470ff88 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
@@ -47,7 +47,7 @@ public class StoreCommandParserTest {
private Mockery mockery = new JUnit4Mockery();
- private ImapSession session;
+ private ImapSession session;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
index 8ce7e83..5ab80be 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
@@ -71,7 +71,7 @@ public class ListResponseEncoderTest {
}
@Test
- public void encoderShouldIncludeListCommand() throws Exception {
+ public void encoderShouldIncludeListCommand() throws Exception {
encoder.encode(new ListResponse(MailboxMetaData.Children.HAS_CHILDREN, MailboxMetaData.Selectability.NONE, "name", '.'), composer, new FakeImapSession());
assertThat(writer.getString()).startsWith("* LIST");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java
index cb0fdff..04181bf 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java
@@ -78,7 +78,7 @@ public class XListResponseEncoderTest {
}
@Test
- public void encoderShouldIncludeListCommand() throws Exception {
+ public void encoderShouldIncludeListCommand() throws Exception {
encoder.encode(
new XListResponse(
MailboxMetaData.Children.HAS_CHILDREN,
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
index 44ff0b9..e6ddb97 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
@@ -47,7 +47,7 @@ public class ByteImapResponseWriter implements ImapConstants, ImapResponseWriter
}
public String getString() throws Exception {
- return new String(getBytes());
+ return new String(getBytes());
}
public void clear() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index ff0e8ac..77b7f74 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -154,7 +154,7 @@ public class SearchProcessorTest {
final IdRange[] ids = { new IdRange(1, Long.MAX_VALUE) };
final SearchQuery.UidRange[] ranges = { new SearchQuery.UidRange(MessageUid.of(42), MessageUid.of(100)) };
mockery.checking(new Expectations() {{
- allowing(selectedMailbox).existsCount();will(returnValue(100L));
+ allowing(selectedMailbox).existsCount();will(returnValue(100L));
oneOf(selectedMailbox).uid(with(equal(1)));will(returnValue(Optional.of(MessageUid.of(42))));
allowing(selectedMailbox).getFirstUid(); will(returnValue(Optional.of(MessageUid.of(1))));
allowing(selectedMailbox).getLastUid(); will(returnValue(Optional.of(MessageUid.of(100))));
@@ -171,7 +171,7 @@ public class SearchProcessorTest {
final IdRange[] ids = { new IdRange(1, 5) };
final SearchQuery.UidRange[] ranges = { new SearchQuery.UidRange(MessageUid.of(42), MessageUid.of(1729)) };
mockery.checking(new Expectations() {{
- allowing(selectedMailbox).existsCount();will(returnValue(2L));
+ allowing(selectedMailbox).existsCount();will(returnValue(2L));
oneOf(selectedMailbox).uid(with(equal(1)));will(returnValue(Optional.of(MessageUid.of(42L))));
oneOf(selectedMailbox).uid(with(equal(5)));will(returnValue(Optional.of(MessageUid.of(1729L))));
allowing(selectedMailbox).getFirstUid(); will(returnValue(Optional.of(MessageUid.of(1L))));
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java b/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java
index 48cc5aa..75f9b8e 100644
--- a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsLocaleDateTest.java
@@ -93,7 +93,7 @@ public class DecoderUtilsLocaleDateTest {
}
@SuppressWarnings("deprecation")
- private void decodeDateTime() throws Exception {
+ private void decodeDateTime() throws Exception {
assertEquals("21 Oct 1972 20:00:00 GMT", DecoderUtils.decodeDateTime(
"21-Oct-1972 20:00:00 +0000").toGMTString());
assertEquals("21 Oct 1972 19:00:00 GMT", DecoderUtils.decodeDateTime(
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java
index ee24047..7693b32 100644
--- a/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java
@@ -116,7 +116,7 @@ public class DecoderUtilsTest {
@Test
@SuppressWarnings("deprecation")
- public void testSimpleDecodeDateTime() throws Exception {
+ public void testSimpleDecodeDateTime() throws Exception {
assertEquals("21 Oct 1972 20:00:00 GMT", DecoderUtils.decodeDateTime(
"21-Oct-1972 20:00:00 +0000").toGMTString());
assertEquals("21 Oct 1972 19:00:00 GMT", DecoderUtils.decodeDateTime(
@@ -182,7 +182,7 @@ public class DecoderUtilsTest {
@Test
@SuppressWarnings("deprecation")
- public void testAppleMailPrependsZeroNotSpace() throws Exception {
+ public void testAppleMailPrependsZeroNotSpace() throws Exception {
assertEquals("9 Apr 2008 13:17:51 GMT", DecoderUtils.decodeDateTime(
"09-Apr-2008 15:17:51 +0200").toGMTString());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
index c02ccbc..b4167a7 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
@@ -41,7 +41,7 @@ public abstract class AbstractChannelPipelineFactory implements ChannelPipelineF
protected final ConnectionPerIpLimitUpstreamHandler connectionPerIpLimitHandler;
private final HashedWheelTimer timer = new HashedWheelTimer();
private final ChannelGroupHandler groupHandler;
- private final int timeout;
+ private final int timeout;
private final ExecutionHandler eHandler;
private final ChannelHandlerFactory frameHandlerFactory;
public AbstractChannelPipelineFactory(int timeout, int maxConnections, int maxConnectsPerIp, ChannelGroup channels) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
index 25311ee..9454428 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
@@ -119,7 +119,7 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
@SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
+ @Override
public void channelDisconnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
try (Closeable closeable = ProtocolMDCContext.from(protocol, ctx)) {
List<DisconnectHandler> connectHandlers = chain.getHandlers(DisconnectHandler.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
index cb66060..a9f95c8 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ConnectionPerIpLimitUpstreamHandler.java
@@ -70,11 +70,11 @@ public class ConnectionPerIpLimitUpstreamHandler extends SimpleChannelUpstreamHa
AtomicInteger atomicCount = connections.get(remoteIp);
if (atomicCount == null) {
- atomicCount = new AtomicInteger(1);
+ atomicCount = new AtomicInteger(1);
AtomicInteger oldAtomicCount = connections.putIfAbsent(remoteIp, atomicCount);
// if another thread put a new counter for this ip, we must use the other one.
if (oldAtomicCount != null) {
- atomicCount = oldAtomicCount;
+ atomicCount = oldAtomicCount;
}
} else {
Integer count = atomicCount.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
index e4c5efb..bd3411d 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java
@@ -86,7 +86,7 @@ public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHa
* java.util.List)
*/
@SuppressWarnings("unchecked")
- public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
+ public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (interfaceName.equals(CapaCapability.class)) {
caps = (List<CapaCapability>) extension;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java
index 3a2ec7b..9680eaa 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MessageMetaDataUtils.java
@@ -53,7 +53,7 @@ public class MessageMetaDataUtils {
* @return
*/
public static boolean isRFC1939Compatible(String uid) {
- if (uid == null) {
+ if (uid == null) {
return false;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
index 87cf886..4d9f4b4 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java
@@ -165,19 +165,19 @@ public class TopCmdHandler extends RetrCmdHandler implements CapaCapability {
// check for empty line
if (!isBody && isEmptyLine && lastChar == '\r' && a == '\n') {
- // reached body
- isBody = true;
+ // reached body
+ isBody = true;
}
if (lastChar == '\r' && a == '\n') {
- // reset empty line flag
- isEmptyLine = true;
+ // reset empty line flag
+ isEmptyLine = true;
- if (isBody) {
- count++;
- }
+ if (isBody) {
+ count++;
+ }
} else if (lastChar == '\n' && a != '\r') {
- isEmptyLine = false;
+ isEmptyLine = false;
}
lastChar = a;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
index 38428e8..ec41080 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMailbox.java
@@ -40,9 +40,9 @@ public abstract class ImapMailbox implements Mailbox {
*/
public abstract InputStream getMessageBody(long uid) throws IOException;
- public InputStream getMessageBody(String uid) throws NumberFormatException, IOException {
- return this.getMessageBody(Long.parseLong(uid));
- }
+ public InputStream getMessageBody(String uid) throws NumberFormatException, IOException {
+ return this.getMessageBody(Long.parseLong(uid));
+ }
/**
* Returns the message headers as {@link InputStream} or <code>null</code>
@@ -54,9 +54,9 @@ public abstract class ImapMailbox implements Mailbox {
*/
public abstract InputStream getMessageHeaders(long uid) throws IOException;
- public InputStream getMessageHeaders(String uid) throws NumberFormatException, IOException {
- return this.getMessageHeaders(Long.parseLong(uid));
- }
+ public InputStream getMessageHeaders(String uid) throws NumberFormatException, IOException {
+ return this.getMessageHeaders(Long.parseLong(uid));
+ }
/**
* Return the full message (headers + body) as {@link InputStream} or
@@ -69,9 +69,9 @@ public abstract class ImapMailbox implements Mailbox {
*/
public abstract InputStream getMessage(long uid) throws IOException;
- public InputStream getMessage(String uid) throws NumberFormatException, IOException {
- return this.getMessage(Long.parseLong(uid));
- }
+ public InputStream getMessage(String uid) throws NumberFormatException, IOException {
+ return this.getMessage(Long.parseLong(uid));
+ }
/**
* Remove the messages with the given uids
@@ -85,6 +85,6 @@ public abstract class ImapMailbox implements Mailbox {
.mapToLong(Long::parseLong)
.toArray();
this.remove(imapUids);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMessageMetaData.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMessageMetaData.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMessageMetaData.java
index e95f02c..2d66437 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMessageMetaData.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/ImapMessageMetaData.java
@@ -25,8 +25,8 @@ package org.apache.james.protocols.pop3.mailbox;
public final class ImapMessageMetaData extends MessageMetaData {
public ImapMessageMetaData(Long uid, long size) {
- super(uid.toString(), size);
- }
+ super(uid.toString(), size);
+ }
@Override
public String getUid(String mailboxId) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java
index 56f4590..c087373 100644
--- a/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java
+++ b/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/mailbox/MessageMetaData.java
@@ -35,25 +35,25 @@ public class MessageMetaData {
if (!MessageMetaDataUtils.isRFC1939Compatible(uid)) {
throw new IllegalArgumentException("UID is not RFC1939 compatible");
}
- }
+ }
- /**
+ /**
* Return the uid of the message
*
* @return uid
*/
public String getUid() {
- return uid;
+ return uid;
}
/**
- * Return the uid of the message. This method uses extra Mailbox ID argument to make
- * UID unique when it is not globally unique. By default assuming UID globally unique.
- *
- * @param mailboxId
- * Mailbox ID
- * @return
- */
+ * Return the uid of the message. This method uses extra Mailbox ID argument to make
+ * UID unique when it is not globally unique. By default assuming UID globally unique.
+ *
+ * @param mailboxId
+ * Mailbox ID
+ * @return
+ */
public String getUid(String mailboxId) {
return uid;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
index 5814384..4ec7e35 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
@@ -299,7 +299,7 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p
* java.util.List)
*/
@SuppressWarnings("unchecked")
- public void wireExtensions(Class<?> interfaceName, List<?> extension) {
+ public void wireExtensions(Class<?> interfaceName, List<?> extension) {
if (getHookInterface().equals(interfaceName)) {
this.hooks = (List<Hook>) extension;
} else if (HookResultHook.class.equals(interfaceName)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
index 277cf1d..9b83ac6 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
@@ -193,7 +193,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
index 84f5ed6..307ad2e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
@@ -60,7 +60,7 @@ public class ExpnCmdHandler implements CommandHandler<SMTPSession> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
index 54562fc..f314e6d 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
@@ -43,7 +43,7 @@ import com.google.common.collect.ImmutableSet;
*/
public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> {
- private static final String COMMAND_NAME = "HELO";
+ private static final String COMMAND_NAME = "HELO";
/**
* The name of the command handled by the command handler
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
index 8ff6258..d299d2a 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
@@ -58,7 +58,7 @@ public class HelpCmdHandler implements CommandHandler<SMTPSession> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
index 89bb5a4..faa945b 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
@@ -107,7 +107,7 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
return response;
}
- /**
+ /**
* Handler method called upon receipt of a MAIL command. Sets up handler to
* deliver mail as the stated sender.
*
@@ -134,7 +134,7 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
index 4a5963d..141a6ee 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
@@ -60,7 +60,7 @@ public class NoopCmdHandler implements CommandHandler<SMTPSession> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
index 8816718..e8a76f1 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
@@ -102,7 +102,7 @@ public class QuitCmdHandler extends AbstractHookableCmdHandler<QuitHook> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
index 568f5c0..d9820e4 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
@@ -220,7 +220,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
/**
@@ -241,6 +241,6 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
}
protected String getDefaultDomain() {
- return "localhost";
+ return "localhost";
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
index 8ed8b5c..5bfd614 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
@@ -75,7 +75,7 @@ public class RsetCmdHandler implements CommandHandler<SMTPSession> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
index 39aa3fb..d189c9f 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
@@ -58,7 +58,7 @@ public class VrfyCmdHandler implements CommandHandler<SMTPSession> {
* @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- return COMMANDS;
+ return COMMANDS;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index e3d2d51..1b54aba 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -531,7 +531,7 @@ public class AuthCmdHandler
* @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
@SuppressWarnings("unchecked")
- public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
+ public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (AuthHook.class.equals(interfaceName)) {
this.hooks = (List<AuthHook>) extension;
// If no AuthHook is configured then we revert to the default LocalUsersRespository check
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
index bc87827..9737d83 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
@@ -118,7 +118,7 @@ public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> impleme
* java.util.List)
*/
@SuppressWarnings("unchecked")
- public void wireExtensions(Class<?> interfaceName, List<?> extension) {
+ public void wireExtensions(Class<?> interfaceName, List<?> extension) {
super.wireExtensions(interfaceName, extension);
if (EhloExtension.class.equals(interfaceName)) {
this.ehloExtensions = (List<EhloExtension>) extension;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java
index 75cfe01..1d47e74 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java
@@ -27,9 +27,9 @@ import org.apache.james.protocols.smtp.SMTPSession;
* store all the state information in the SMTPSession object
*/
public interface MessageHook extends Hook {
- /**
- * Handle Message
- */
- HookResult onMessage(SMTPSession session, MailEnvelope mail);
+ /**
+ * Handle Message
+ */
+ HookResult onMessage(SMTPSession session, MailEnvelope mail);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java
index 16876d7..91820fc 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/UnknownHook.java
@@ -27,13 +27,13 @@ import org.apache.james.protocols.smtp.SMTPSession;
*/
public interface UnknownHook extends Hook {
- /**
- * Called on unknown smtp command
- *
- * @param session
- * @param command
- * @return result
- */
+ /**
+ * Called on unknown smtp command
+ *
+ * @param session
+ * @param command
+ * @return result
+ */
HookResult doUnknown(SMTPSession session, String command);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
index e59b4c6..6d340ac 100644
--- a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
+++ b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
@@ -347,7 +347,7 @@ public class ServerCmdTest {
testee.executeCommandLine(commandLine);
control.verify();
}
-
+
@Test
public void listUserMailboxesMappingsCommandShouldWork() throws Exception {
String user = "user@domain";
@@ -826,8 +826,8 @@ public class ServerCmdTest {
control.verify();
}
}
-
-
+
+
@Test(expected = InvalidArgumentNumberException.class)
public void importEmlFileToMailboxCommandShouldThrowOnMissingArguments() throws Exception {
String user = "user@domain";
@@ -1138,7 +1138,7 @@ public class ServerCmdTest {
control.verify();
}
}
-
+
@Test(expected = InvalidArgumentNumberException.class)
public void listUserMailboxesMappingsCommandShouldThrowOnAdditionalArguments() throws Exception {
String user = "user@domain";
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 6cba668..39520e7 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -274,7 +274,7 @@ public class MailboxManagementTest {
assertThat(iterator.hasNext()).isFalse();
}
-
+
@Test(expected = NullPointerException.class)
public void deleteMailboxShouldThrowOnNullNamespace() {
mailboxManagerManagement.deleteMailbox(null, "a", "a");
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java
index cb9628e..c2f7510 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/DoublingRetryScheduleTest.java
@@ -35,11 +35,11 @@ public class DoublingRetryScheduleTest {
*/
@Test
public final void testDoublingRetrySchedule() {
- assertTrue(RetrySchedule.class.isAssignableFrom(DoublingRetrySchedule.class));
- assertEquals(0, new DoublingRetrySchedule(0, 0).getInterval(0));
- assertEquals(0, new DoublingRetrySchedule(-1, -1).getInterval(0));
- assertEquals(0, new DoublingRetrySchedule(-1, 0).getInterval(0));
- assertEquals(0, new DoublingRetrySchedule(0, -1).getInterval(0));
+ assertTrue(RetrySchedule.class.isAssignableFrom(DoublingRetrySchedule.class));
+ assertEquals(0, new DoublingRetrySchedule(0, 0).getInterval(0));
+ assertEquals(0, new DoublingRetrySchedule(-1, -1).getInterval(0));
+ assertEquals(0, new DoublingRetrySchedule(-1, 0).getInterval(0));
+ assertEquals(0, new DoublingRetrySchedule(0, -1).getInterval(0));
}
/**
@@ -47,30 +47,30 @@ public class DoublingRetryScheduleTest {
*/
@Test
public final void testGetInterval() {
- assertEquals(0, new DoublingRetrySchedule(0, 8).getInterval(0));
- assertEquals(1, new DoublingRetrySchedule(0, 8).getInterval(1));
- assertEquals(2, new DoublingRetrySchedule(0, 8).getInterval(2));
- assertEquals(4, new DoublingRetrySchedule(0, 8).getInterval(3));
- assertEquals(8, new DoublingRetrySchedule(0, 8).getInterval(4));
- assertEquals(8, new DoublingRetrySchedule(0, 8).getInterval(5));
+ assertEquals(0, new DoublingRetrySchedule(0, 8).getInterval(0));
+ assertEquals(1, new DoublingRetrySchedule(0, 8).getInterval(1));
+ assertEquals(2, new DoublingRetrySchedule(0, 8).getInterval(2));
+ assertEquals(4, new DoublingRetrySchedule(0, 8).getInterval(3));
+ assertEquals(8, new DoublingRetrySchedule(0, 8).getInterval(4));
+ assertEquals(8, new DoublingRetrySchedule(0, 8).getInterval(5));
- assertEquals(1, new DoublingRetrySchedule(1, 8).getInterval(0));
- assertEquals(2, new DoublingRetrySchedule(1, 8).getInterval(1));
- assertEquals(4, new DoublingRetrySchedule(1, 8).getInterval(2));
- assertEquals(8, new DoublingRetrySchedule(1, 8).getInterval(3));
- assertEquals(8, new DoublingRetrySchedule(1, 8).getInterval(4));
+ assertEquals(1, new DoublingRetrySchedule(1, 8).getInterval(0));
+ assertEquals(2, new DoublingRetrySchedule(1, 8).getInterval(1));
+ assertEquals(4, new DoublingRetrySchedule(1, 8).getInterval(2));
+ assertEquals(8, new DoublingRetrySchedule(1, 8).getInterval(3));
+ assertEquals(8, new DoublingRetrySchedule(1, 8).getInterval(4));
- assertEquals(3, new DoublingRetrySchedule(3, 12).getInterval(0));
- assertEquals(6, new DoublingRetrySchedule(3, 12).getInterval(1));
- assertEquals(12, new DoublingRetrySchedule(3, 12).getInterval(2));
- assertEquals(12, new DoublingRetrySchedule(3, 12).getInterval(3));
+ assertEquals(3, new DoublingRetrySchedule(3, 12).getInterval(0));
+ assertEquals(6, new DoublingRetrySchedule(3, 12).getInterval(1));
+ assertEquals(12, new DoublingRetrySchedule(3, 12).getInterval(2));
+ assertEquals(12, new DoublingRetrySchedule(3, 12).getInterval(3));
- assertEquals(0, new DoublingRetrySchedule(0, 8, 1000).getInterval(0));
- assertEquals(1000, new DoublingRetrySchedule(0, 8, 1000).getInterval(1));
- assertEquals(2000, new DoublingRetrySchedule(0, 8, 1000).getInterval(2));
- assertEquals(4000, new DoublingRetrySchedule(0, 8, 1000).getInterval(3));
- assertEquals(8000, new DoublingRetrySchedule(0, 8, 1000).getInterval(4));
- assertEquals(8000, new DoublingRetrySchedule(0, 8, 1000).getInterval(5));
+ assertEquals(0, new DoublingRetrySchedule(0, 8, 1000).getInterval(0));
+ assertEquals(1000, new DoublingRetrySchedule(0, 8, 1000).getInterval(1));
+ assertEquals(2000, new DoublingRetrySchedule(0, 8, 1000).getInterval(2));
+ assertEquals(4000, new DoublingRetrySchedule(0, 8, 1000).getInterval(3));
+ assertEquals(8000, new DoublingRetrySchedule(0, 8, 1000).getInterval(4));
+ assertEquals(8000, new DoublingRetrySchedule(0, 8, 1000).getInterval(5));
}
/**
@@ -78,7 +78,7 @@ public class DoublingRetryScheduleTest {
*/
@Test
public final void testToString() {
- assertEquals("DoublingRetrySchedule [startInterval=0, maxInterval=1, multiplier=1]", new DoublingRetrySchedule(0,
- 1).toString());
+ assertEquals("DoublingRetrySchedule [startInterval=0, maxInterval=1, multiplier=1]", new DoublingRetrySchedule(0,
+ 1).toString());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
index 6dad10b..83d8609 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
@@ -47,42 +47,42 @@ public class ExceptionRetryHandlerTest {
*/
@Before
public void setUp() throws Exception {
- _exceptionClasses = new Class<?>[]{Exception.class};
- _proxy = new TestRetryingProxy();
- _schedule = new TestRetrySchedule();
+ _exceptionClasses = new Class<?>[]{Exception.class};
+ _proxy = new TestRetryingProxy();
+ _schedule = new TestRetrySchedule();
}
private class TestRetryingProxy implements ExceptionRetryingProxy {
- /**
+ /**
*/
- @Override
- public Context getDelegate() {
- return null;
- }
+ @Override
+ public Context getDelegate() {
+ return null;
+ }
- /**
+ /**
*/
- @Override
- public Context newDelegate() throws Exception {
- return null;
- }
+ @Override
+ public Context newDelegate() throws Exception {
+ return null;
+ }
- /**
+ /**
*/
- @Override
- public void resetDelegate() throws Exception {
- }
+ @Override
+ public void resetDelegate() throws Exception {
+ }
}
private class TestRetrySchedule implements RetrySchedule {
- /**
+ /**
*/
- @Override
- public long getInterval(int index) {
- return index;
- }
+ @Override
+ public long getInterval(int index) {
+ return index;
+ }
}
/**
@@ -90,14 +90,14 @@ public class ExceptionRetryHandlerTest {
*/
@Test
public final void testExceptionRetryHandler() {
- assertTrue(RetryHandler.class.isAssignableFrom(new ExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- return null;
- }
- }.getClass()));
+ assertTrue(RetryHandler.class.isAssignableFrom(new ExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ return null;
+ }
+ }.getClass()));
}
/**
@@ -106,29 +106,29 @@ public class ExceptionRetryHandlerTest {
*/
@Test
public final void testPerform() throws Exception {
- Object result = new ExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- return "Hi!";
- }
- }.perform();
- assertEquals("Hi!", result);
-
- try {
- new ExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- throw new Exception();
- }
- }.perform();
- } catch (Exception ex) {
- // no-op
- }
- assertEquals("Hi!", result);
+ Object result = new ExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ return "Hi!";
+ }
+ }.perform();
+ assertEquals("Hi!", result);
+
+ try {
+ new ExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ throw new Exception();
+ }
+ }.perform();
+ } catch (Exception ex) {
+ // no-op
+ }
+ assertEquals("Hi!", result);
}
/**
@@ -136,27 +136,27 @@ public class ExceptionRetryHandlerTest {
*/
@Test
public final void testPostFailure() {
- final List<Exception> results = new ArrayList<>();
- RetryHandler handler = new ExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 7) {
-
- @Override
- public void postFailure(Exception ex, int retryCount) {
- super.postFailure(ex, retryCount);
- results.add(ex);
- }
-
- @Override
- public Object operation() throws Exception {
- throw new Exception();
- }
- };
- try {
- handler.perform();
- } catch (Exception ex) {
- // no-op
- }
- assertEquals(7, results.size());
+ final List<Exception> results = new ArrayList<>();
+ RetryHandler handler = new ExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 7) {
+
+ @Override
+ public void postFailure(Exception ex, int retryCount) {
+ super.postFailure(ex, retryCount);
+ results.add(ex);
+ }
+
+ @Override
+ public Object operation() throws Exception {
+ throw new Exception();
+ }
+ };
+ try {
+ handler.perform();
+ } catch (Exception ex) {
+ // no-op
+ }
+ assertEquals(7, results.size());
}
/**
@@ -165,15 +165,15 @@ public class ExceptionRetryHandlerTest {
*/
@Test
public final void testOperation() throws Exception {
- RetryHandler handler = new ExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- return "Hi!";
- }
- };
- assertEquals("Hi!", handler.operation());
+ RetryHandler handler = new ExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ return "Hi!";
+ }
+ };
+ assertEquals("Hi!", handler.operation());
}
/**
@@ -181,14 +181,14 @@ public class ExceptionRetryHandlerTest {
*/
@Test
public final void testGetRetryInterval() {
- ExceptionRetryHandler handler = new ExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- return null;
- }
- };
- assertEquals(8, handler.getRetryInterval(8));
+ ExceptionRetryHandler handler = new ExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ return null;
+ }
+ };
+ assertEquals(8, handler.getRetryInterval(8));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
index 7781498..36360c0 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
@@ -43,42 +43,42 @@ public class NamingExceptionRetryHandlerTest {
*/
@Before
public void setUp() throws Exception {
- _exceptionClasses = new Class<?>[]{NamingException.class};
- _proxy = new TestRetryingProxy();
- _schedule = new TestRetrySchedule();
+ _exceptionClasses = new Class<?>[]{NamingException.class};
+ _proxy = new TestRetryingProxy();
+ _schedule = new TestRetrySchedule();
}
private class TestRetryingProxy implements ExceptionRetryingProxy {
- /**
+ /**
*/
- @Override
- public Context getDelegate() {
- return null;
- }
+ @Override
+ public Context getDelegate() {
+ return null;
+ }
- /**
+ /**
*/
- @Override
- public Context newDelegate() throws NamingException {
- return null;
- }
+ @Override
+ public Context newDelegate() throws NamingException {
+ return null;
+ }
- /**
+ /**
*/
- @Override
- public void resetDelegate() throws NamingException {
- }
+ @Override
+ public void resetDelegate() throws NamingException {
+ }
}
private class TestRetrySchedule implements RetrySchedule {
- /**
+ /**
*/
- @Override
- public long getInterval(int index) {
- return index;
- }
+ @Override
+ public long getInterval(int index) {
+ return index;
+ }
}
/**
@@ -86,14 +86,14 @@ public class NamingExceptionRetryHandlerTest {
*/
@Test
public final void testExceptionRetryHandler() {
- assertTrue(RetryHandler.class.isAssignableFrom(new NamingExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- return null;
- }
- }.getClass()));
+ assertTrue(RetryHandler.class.isAssignableFrom(new NamingExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ return null;
+ }
+ }.getClass()));
}
/**
@@ -102,28 +102,28 @@ public class NamingExceptionRetryHandlerTest {
*/
@Test
public final void testPerform() throws NamingException {
- Object result = new NamingExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws NamingException {
- return "Hi!";
- }
- }.perform();
- assertEquals("Hi!", result);
-
- try {
- new NamingExceptionRetryHandler(
- _exceptionClasses, _proxy, _schedule, 0) {
-
- @Override
- public Object operation() throws Exception {
- throw new NamingException();
- }
- }.perform();
- } catch (NamingException ex) {
- // no-op
- }
- assertEquals("Hi!", result);
+ Object result = new NamingExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws NamingException {
+ return "Hi!";
+ }
+ }.perform();
+ assertEquals("Hi!", result);
+
+ try {
+ new NamingExceptionRetryHandler(
+ _exceptionClasses, _proxy, _schedule, 0) {
+
+ @Override
+ public Object operation() throws Exception {
+ throw new NamingException();
+ }
+ }.perform();
+ } catch (NamingException ex) {
+ // no-op
+ }
+ assertEquals("Hi!", result);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
index 79c98b6..2f45630 100644
--- a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest {
private static final String TARGET_REPOSITORY_FOLDER = "target/var/users";
- private File targetRepositoryFolder;
+ private File targetRepositoryFolder;
@Before
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index 35620d3..73daf8b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -46,7 +46,7 @@ import org.apache.mailet.Mail;
public class CommonProcessors {
- public static final String ERROR_REPOSITORY = "file://var/mail/error/";
+ public static final String ERROR_REPOSITORY = "file://var/mail/error/";
public static ProcessorConfiguration root() {
return ProcessorConfiguration.root()
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelayTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelayTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelayTest.java
index 6adb15d..0f82b1b 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelayTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DelayTest.java
@@ -97,7 +97,7 @@ public class DelayTest {
@Test
public void stringConstructorShouldWorkForNumberAttemptsAndUnitWithSpaces() throws Exception {
- assertThat(Delay.from("2 * 36 s")).isEqualTo(new Delay(2, 36000));
+ assertThat(Delay.from("2 * 36 s")).isEqualTo(new Delay(2, 36000));
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/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 133743d..d2c9449 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
@@ -136,8 +136,8 @@ public class DelaysAndMaxRetryTest {
@Test
public void getExpandedDelaysShouldExpandMultipleDelaysWithSpaces() throws Exception {
- DelaysAndMaxRetry testee = DelaysAndMaxRetry.from(3, "1 * 1 S, 2 * 2 S , 2 * 5 S");
-
- assertThat(testee.getExpandedDelays()).containsExactly(1000L, 2000L, 2000L, 5000L, 5000L);
+ DelaysAndMaxRetry testee = DelaysAndMaxRetry.from(3, "1 * 1 S, 2 * 2 S , 2 * 5 S");
+
+ assertThat(testee.getExpandedDelays()).containsExactly(1000L, 2000L, 2000L, 5000L, 5000L);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
index 1317521..1ce4d38 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -64,9 +64,9 @@ public abstract class JMAPAuthenticationTest {
jmapServer = createJmapServer(zonedDateTimeProvider);
jmapServer.start();
RestAssured.requestSpecification = new RequestSpecBuilder()
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
- .build();
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ .setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
+ .build();
userCredentials = UserCredentials.builder()
.username("user@domain.tld")
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
index f4ad385..36ba443 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryStepdefs.java
@@ -54,7 +54,7 @@ public class MemoryStepdefs {
mainStepdefs.jmapServer = new GuiceJamesServer()
.combineWith(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
.overrideWith(new MemoryJmapServerModule(temporaryFolder),
- (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory))
+ (binder) -> binder.bind(MessageId.Factory.class).toInstance(mainStepdefs.messageIdFactory))
.overrideWith((binder) -> binder.bind(PersistenceAdapter.class).to(MemoryPersistenceAdapter.class));
mainStepdefs.init();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
index ce821fe..1c753fd 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
@@ -68,11 +68,11 @@ public class JMAPServletTest {
server.start();
RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .setPort(server.getPort())
- .build();
+ .setContentType(ContentType.JSON)
+ .setAccept(ContentType.JSON)
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ .setPort(server.getPort())
+ .build();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
index 73e253b..6558c79 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
@@ -43,10 +43,10 @@ import org.jboss.netty.handler.stream.ChunkedStream;
public class ChannelImapResponseWriter implements ImapResponseWriter {
private final Channel channel;
- private final boolean zeroCopy;
+ private final boolean zeroCopy;
public ChannelImapResponseWriter(Channel channel) {
- this(channel, true);
+ this(channel, true);
}
public ChannelImapResponseWriter(Channel channel, boolean zeroCopy) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
index 5170bc6..0b3e127 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
@@ -27,32 +27,32 @@ import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
public class SwitchableDelimiterBasedFrameDecoder extends DelimiterBasedFrameDecoder {
- private volatile boolean framingEnabled = true;
-
- public SwitchableDelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, ChannelBuffer... delimiters) {
- super(maxFrameLength, stripDelimiter, delimiters);
- }
-
- @Override
- public synchronized void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
- if (this.framingEnabled) {
- super.messageReceived(ctx, e);
- } else {
- ctx.sendUpstream(e);
- }
- }
-
- public synchronized void enableFraming() {
- this.framingEnabled = true;
-
- }
-
- public synchronized void disableFraming(ChannelHandlerContext ctx) {
- this.framingEnabled = false;
- if (this.cumulation != null && this.cumulation.readable()) {
- final ChannelBuffer spareBytes = this.cumulation.readBytes(this.cumulation.readableBytes());
- Channels.fireMessageReceived(ctx, spareBytes);
- }
- }
+ private volatile boolean framingEnabled = true;
+
+ public SwitchableDelimiterBasedFrameDecoder(int maxFrameLength, boolean stripDelimiter, ChannelBuffer... delimiters) {
+ super(maxFrameLength, stripDelimiter, delimiters);
+ }
+
+ @Override
+ public synchronized void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
+ if (this.framingEnabled) {
+ super.messageReceived(ctx, e);
+ } else {
+ ctx.sendUpstream(e);
+ }
+ }
+
+ public synchronized void enableFraming() {
+ this.framingEnabled = true;
+
+ }
+
+ public synchronized void disableFraming(ChannelHandlerContext ctx) {
+ this.framingEnabled = false;
+ if (this.cumulation != null && this.cumulation.readable()) {
+ final ChannelBuffer spareBytes = this.cumulation.readBytes(this.cumulation.readableBytes());
+ Channels.fireMessageReceived(ctx, spareBytes);
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index 12b4c6f..3599526 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -392,9 +392,9 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
SSLContext context = SSLContext.getInstance("TLS");
context.init(kmf.getKeyManagers(), null, null);
if (useStartTLS) {
- encryption = Encryption.createStartTls(context, enabledCipherSuites);
+ encryption = Encryption.createStartTls(context, enabledCipherSuites);
} else {
- encryption = Encryption.createTls(context, enabledCipherSuites);
+ encryption = Encryption.createTls(context, enabledCipherSuites);
}
} finally {
if (fis != null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
index 0d8ea36..03cf955 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
@@ -35,7 +35,7 @@ public class ExtendedSMTPSession extends org.apache.james.protocols.smtp.SMTPSes
this.smtpConfiguration = smtpConfiguration;
}
- public boolean verifyIdentity() {
+ public boolean verifyIdentity() {
return !(smtpConfiguration instanceof SMTPHandlerConfigurationDataImpl) || ((SMTPHandlerConfigurationDataImpl) smtpConfiguration).verifyIdentity();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a61d975a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index 3f403bc..7a14390 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -87,10 +87,10 @@ public class WebAdminServerIntegrationTest {
webAdminGuiceProbe = guiceJamesServer.getProbe(WebAdminGuiceProbe.class);
RestAssured.requestSpecification = new RequestSpecBuilder()
- .setContentType(ContentType.JSON)
- .setAccept(ContentType.JSON)
- .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
- .build();
+ .setContentType(ContentType.JSON)
+ .setAccept(ContentType.JSON)
+ .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
+ .build();
}
@After
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org