http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java index 3cfc9ef..0b2e742 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java @@ -423,7 +423,7 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search if (headerName.equalsIgnoreCase(name)) { String value = header.getValue(); AddressList aList = LenientAddressParser.DEFAULT.parseAddressList(value); - for ( Address address : aList) { + for (Address address : aList) { if (address instanceof Mailbox) { if (AddressFormatter.DEFAULT.encode((Mailbox) address).toUpperCase(Locale.US) .contains(text)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java index eebf585..1dbecda 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java @@ -331,7 +331,7 @@ public class SearchUtil { */ private static String removeSubjectBlob(String subject) { String subj = subject; - while(subj.charAt(0) == OPEN_SQUARE_BRACKED) { + while (subj.charAt(0) == OPEN_SQUARE_BRACKED) { int length = subj.length(); subj = removeBlob(subject); int i = 0; @@ -425,8 +425,8 @@ public class SearchUtil { int subStringEnd = decodedSubject.length(); int originalSize = decodedSubject.length(); - int curPos = originalSize -1; - while(true) { + int curPos = originalSize - 1; + while (true) { char c = decodedSubject.charAt(curPos--); if (c == WS) { subStringEnd--; @@ -456,7 +456,7 @@ public class SearchUtil { for (int a = 0; a < subject.length(); a++) { char c = subject.charAt(a); lastChar = c; - if (( a != 0 && c == OPEN_SQUARE_BRACKED) || c == CLOSE_SQUARE_BRACKED) { + if ((a != 0 && c == OPEN_SQUARE_BRACKED) || c == CLOSE_SQUARE_BRACKED) { break; } i++; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java index bd72981..d5875bb 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java @@ -135,9 +135,9 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex { } else { // we have to fetch all messages Iterator<MailboxMessage> messages = mapper.findInMailbox(mailbox, MessageRange.all(), FetchType.Full, -1); - while(messages.hasNext()) { - MailboxMessage m = messages.next(); - hitSet.add(m); + while (messages.hasNext()) { + MailboxMessage m = messages.next(); + hitSet.add(m); } } return ImmutableList.copyOf(new MessageSearches(hitSet.iterator(), query, textExtractor).iterator()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java index 767c6a9..d6137fe 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java @@ -30,13 +30,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractHeaderComparator implements Comparator<MailboxMessage>{ +public abstract class AbstractHeaderComparator implements Comparator<MailboxMessage> { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractHeaderComparator.class); - public static final String FROM ="from"; - public static final String TO ="to"; - public static final String CC ="cc"; + public static final String FROM = "from"; + public static final String TO = "to"; + public static final String CC = "cc"; protected String getHeaderValue(String headerName, MailboxMessage message) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java index f001cd2..dbd3f69 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/BaseSubjectComparator.java @@ -23,7 +23,7 @@ import java.util.Comparator; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.search.SearchUtil; -public class BaseSubjectComparator extends AbstractHeaderComparator{ +public class BaseSubjectComparator extends AbstractHeaderComparator { public static final Comparator<MailboxMessage> BASESUBJECT = new BaseSubjectComparator(); private static final String SUBJECT = "subject"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java index 9252293..3c8d53e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/CombinedComparator.java @@ -34,7 +34,7 @@ import com.google.common.base.Preconditions; * {@link Comparator} which takes a Array of other {@link Comparator}'s and use them to compare two {@link MailboxMessage} instances till one of them * return <> 0 */ -public class CombinedComparator implements Comparator<MailboxMessage>{ +public class CombinedComparator implements Comparator<MailboxMessage> { public static CombinedComparator create(List<Sort> sorts) { Preconditions.checkNotNull(sorts); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java index 6c96346..d59940d 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderDisplayComparator.java @@ -23,7 +23,7 @@ import java.util.Comparator; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.search.SearchUtil; -public class HeaderDisplayComparator extends AbstractHeaderComparator{ +public class HeaderDisplayComparator extends AbstractHeaderComparator { public static final Comparator<MailboxMessage> FROM_COMPARATOR = new HeaderDisplayComparator(FROM); public static final Comparator<MailboxMessage> TO_COMPARATOR = new HeaderDisplayComparator(TO); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java index dbc4b67..780c34e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/HeaderMailboxComparator.java @@ -23,7 +23,7 @@ import java.util.Comparator; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.search.SearchUtil; -public class HeaderMailboxComparator extends AbstractHeaderComparator{ +public class HeaderMailboxComparator extends AbstractHeaderComparator { public static final Comparator<MailboxMessage> FROM_COMPARATOR = new HeaderMailboxComparator(FROM); public static final Comparator<MailboxMessage> TO_COMPARATOR = new HeaderMailboxComparator(TO); public static final Comparator<MailboxMessage> CC_COMPARATOR = new HeaderMailboxComparator(CC); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java index d2329d3..7db51ca 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/InternalDateComparator.java @@ -25,7 +25,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; /** * {@link Comparator} which compares {@link MailboxMessage}'s with their {@link MailboxMessage#getInternalDate()} value */ -public class InternalDateComparator implements Comparator<MailboxMessage>{ +public class InternalDateComparator implements Comparator<MailboxMessage> { public static final Comparator<MailboxMessage> INTERNALDATE = new InternalDateComparator(); @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/ReverseComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/ReverseComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/ReverseComparator.java index c8d17ac..8abc477 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/ReverseComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/ReverseComparator.java @@ -27,7 +27,7 @@ import com.google.common.base.Objects; /** * {@link Comparator} which wraps an other {@link Comparator} and reverse it */ -public class ReverseComparator implements Comparator<MailboxMessage>{ +public class ReverseComparator implements Comparator<MailboxMessage> { private final Comparator<MailboxMessage> comparator; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java index 156f24c..ccb7180 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SizeComparator.java @@ -25,7 +25,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; /** * {@link Comparator} which compares {@link MailboxMessage}'s with their {@link MailboxMessage#getFullContentOctets()} value */ -public class SizeComparator implements Comparator<MailboxMessage>{ +public class SizeComparator implements Comparator<MailboxMessage> { public static final Comparator<MailboxMessage> SIZE = new SizeComparator(); @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java index 1884dd2..5081e03 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/UidComparator.java @@ -25,7 +25,7 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage; /** * {@link Comparator} which compares {@link MailboxMessage}'s with their {@link MailboxMessage#getUid()} value */ -public class UidComparator implements Comparator<MailboxMessage>{ +public class UidComparator implements Comparator<MailboxMessage> { public static final Comparator<MailboxMessage> UID = new UidComparator(); @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java index 6ed03c6..96474a5 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/BodyOffsetInputStream.java @@ -29,7 +29,7 @@ import java.io.PushbackInputStream; * IMPORTANT: This class is not thread-safe! * */ -public class BodyOffsetInputStream extends InputStream{ +public class BodyOffsetInputStream extends InputStream { private long count = 0; private long bodyStartOctet = -1; private final PushbackInputStream in; @@ -56,7 +56,7 @@ public class BodyOffsetInputStream extends InputStream{ int c = in.read(); if (c == 0x0A) { - bodyStartOctet = count+4; + bodyStartOctet = count + 4; } in.unread(c); } @@ -127,7 +127,7 @@ public class BodyOffsetInputStream extends InputStream{ @Override public long skip(long n) throws IOException { long i = 0; - while(i++ < n) { + while (i++ < n) { if (read() == -1) { break; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java index f26ea90..dddd420 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/CountingInputStream.java @@ -80,7 +80,7 @@ public final class CountingInputStream extends InputStream { * @throws IOException */ public void readAll() throws IOException { - while (read()>0) { + while (read() > 0) { ; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java index c9bef98..b465178 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java @@ -48,7 +48,7 @@ public class FullByteContent implements Content { this.size = caculateSize(); } - protected long caculateSize() throws MailboxException{ + protected long caculateSize() throws MailboxException { long result = body.length; result += 2; for (Header header : headers) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java index d117554..525f2cd 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/InputStreamContent.java @@ -28,7 +28,7 @@ import org.apache.james.mailbox.store.mail.model.Message; * {@link Content} which is stored in a {@link InputStream} * */ -public final class InputStreamContent implements Content{ +public final class InputStreamContent implements Content { private final Message m; private final Type type; @@ -38,7 +38,7 @@ public final class InputStreamContent implements Content{ Body } - public InputStreamContent(Message m, Type type) throws IOException{ + public InputStreamContent(Message m, Type type) throws IOException { this.m = m; this.type = type; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java index 6a41907..ff2243e 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/LimitingFileInputStream.java @@ -30,7 +30,7 @@ import java.nio.channels.FileLock; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; -public class LimitingFileInputStream extends FileInputStream{ +public class LimitingFileInputStream extends FileInputStream { private long pos = 0; private final long limit; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java index 7a44eea..28563c2 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MailboxMessageResultImplTest.java @@ -143,12 +143,12 @@ public class MailboxMessageResultImplTest { @Test public void testShouldReturnPositiveWhenFirstGreaterThanSecond() throws Exception { - assertTrue( msgResultC.compareTo(msgResultB) > 0); + assertTrue(msgResultC.compareTo(msgResultB) > 0); } @Test public void testShouldReturnNegativeWhenFirstLessThanSecond() throws Exception { - assertTrue( msgResultB.compareTo(msgResultC) < 0); + assertTrue(msgResultB.compareTo(msgResultC) < 0); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java index 46d4a0d..16ff2d3 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java @@ -130,7 +130,7 @@ public class StoreMailboxManagerAnnotationTest { @Test public void getAllAnnotationsShouldReturnEmptyForNonStoredAnnotation() throws Exception { when(mailboxMapper.findMailboxByPath(eq(mailboxPath))).thenReturn(mailbox); - when(annotationMapper.getAllAnnotations(eq(mailboxId))).thenReturn(Collections.<MailboxAnnotation> emptyList()); + when(annotationMapper.getAllAnnotations(eq(mailboxId))).thenReturn(Collections.<MailboxAnnotation>emptyList()); assertThat(annotationManager.getAllAnnotations(mailboxPath, session)).isEmpty(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java index f6885e0..e8aea93 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java @@ -209,7 +209,7 @@ public class StoreMailboxMessageResultIteratorTest { assertThat(iterator.next()).isNotNull(); } - @Test(expected=NoSuchElementException.class) + @Test(expected = NoSuchElementException.class) public void nextShouldThrowWhenNoElement() { MessageRange messages = MessageUid.of(1).toRange(); MessageRange findRange = MessageUid.of(2).toRange(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java index 9798ae7..266722b 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMessageIdManagerTestSystem.java @@ -61,7 +61,7 @@ public class StoreMessageIdManagerTestSystem extends MessageIdManagerTestSystem } @Override - public Mailbox createMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException{ + public Mailbox createMailbox(MailboxPath mailboxPath, MailboxSession session) throws MailboxException { return mapperFactory.createMailboxMapper(session).findMailboxByPath(mailboxPath); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java index 5442c0c..6b0a2ff 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/MailboxAnnotationListenerTest.java @@ -92,7 +92,7 @@ public class MailboxAnnotationListenerTest { } @Test - public void eventShoudlDoNothingIfMailboxDoesNotHaveAnyAnnotation() throws Exception{ + public void eventShoudlDoNothingIfMailboxDoesNotHaveAnyAnnotation() throws Exception { when(annotationMapper.getAllAnnotations(any(MailboxId.class))).thenReturn(ImmutableList.<MailboxAnnotation>of()); listener.event(deleteEvent); @@ -106,7 +106,7 @@ public class MailboxAnnotationListenerTest { } @Test - public void eventShoudlDeleteAllMailboxAnnotation() throws Exception{ + public void eventShoudlDeleteAllMailboxAnnotation() throws Exception { when(annotationMapper.getAllAnnotations(eq(mailboxId))).thenReturn(ANNOTATIONS); listener.event(deleteEvent); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java index 2dc9308..195d63a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java @@ -298,7 +298,7 @@ public class DistantMailboxPathRegisterTest { for (int i = 0; i < increments; i++) { register.register(MAILBOX_PATH); } - ExecutorService executorService = Executors.newFixedThreadPool(2* numTask); + ExecutorService executorService = Executors.newFixedThreadPool(2 * numTask); for (int i = 0; i < numTask; i++) { executorService.submit(() -> { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java index 96cc74f..7c5e800 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java @@ -33,7 +33,7 @@ public class DelegatingMailboxMessageTest { throws Exception { MailboxMessage one = buildMessage(100); MailboxMessage two = buildMessage(99); - assertTrue( one.compareTo(two) > 0); + assertTrue(one.compareTo(two) > 0); } private MailboxMessage buildMessage(int uid) throws Exception { @@ -47,7 +47,7 @@ public class DelegatingMailboxMessageTest { throws Exception { MailboxMessage one = buildMessage(98); MailboxMessage two = buildMessage(99); - assertTrue( one.compareTo(two) < 0); + assertTrue(one.compareTo(two) < 0); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java index d088a7c..067349f 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxAssertTests.java @@ -31,8 +31,8 @@ public class MailboxAssertTests { @Test public void isEqualToShouldNotFailWithEqualMailbox() { - SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); - SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); + SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); MailboxAssert.assertThat(mailbox1).isEqualTo(mailbox2); @@ -40,7 +40,7 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualNamespace() { - SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("other_namespace", "user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); @@ -49,7 +49,7 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualUser() { - SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "other_user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); @@ -58,7 +58,7 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualName() { - SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); SimpleMailbox mailbox2 = new SimpleMailbox(new MailboxPath("namespace", "user", "other_name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); @@ -67,8 +67,8 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualId() { - SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); - SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); + SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(TestId.of(MAILBOX_ID.id + 1)); MailboxAssert.assertThat(mailbox1).isEqualTo(mailbox2); @@ -76,8 +76,8 @@ public class MailboxAssertTests { @Test(expected = AssertionError.class) public void isEqualToShouldFailWithNotEqualUidValidity() { - SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY); - SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser( "user", "name"), UID_VALIDITY + 1); + SimpleMailbox mailbox1 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY); + SimpleMailbox mailbox2 = new SimpleMailbox(MailboxPath.forUser("user", "name"), UID_VALIDITY + 1); mailbox1.setMailboxId(MAILBOX_ID); mailbox2.setMailboxId(MAILBOX_ID); MailboxAssert.assertThat(mailbox1).isEqualTo(mailbox2); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java index fe20be4..43704b7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java @@ -96,24 +96,24 @@ public abstract class MailboxMapperTest { } @Test - public void saveShouldPersistTheMailbox() throws MailboxException{ + public void saveShouldPersistTheMailbox() throws MailboxException { mailboxMapper.save(benwaInboxMailbox); MailboxAssert.assertThat(mailboxMapper.findMailboxByPath(benwaInboxPath)).isEqualTo(benwaInboxMailbox); } @Test - public void saveShouldThrowWhenMailboxAlreadyExist() throws MailboxException{ + public void saveShouldThrowWhenMailboxAlreadyExist() throws MailboxException { mailboxMapper.save(benwaInboxMailbox); SimpleMailbox mailbox = new SimpleMailbox(benwaInboxMailbox); mailbox.setMailboxId(null); - assertThatThrownBy(() ->mailboxMapper.save(mailbox)) + assertThatThrownBy(() -> mailboxMapper.save(mailbox)) .isInstanceOf(MailboxExistsException.class); } @Test - public void saveWithNullUserShouldPersistTheMailbox() throws MailboxException{ + public void saveWithNullUserShouldPersistTheMailbox() throws MailboxException { mailboxMapper.save(esnDevGroupInboxMailbox); MailboxAssert.assertThat(mailboxMapper.findMailboxByPath(esnDevGroupInboxPath)).isEqualTo(esnDevGroupInboxMailbox); } @@ -251,19 +251,19 @@ public abstract class MailboxMapperTest { private void initData() { benwaInboxPath = MailboxPath.forUser("benwa", "INBOX"); - benwaWorkPath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work"); - benwaWorkTodoPath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work"+DELIMITER+"todo"); - benwaPersoPath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"perso"); - benwaWorkDonePath = MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work"+DELIMITER+"done"); + benwaWorkPath = MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work"); + benwaWorkTodoPath = MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work" + DELIMITER + "todo"); + benwaPersoPath = MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "perso"); + benwaWorkDonePath = MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work" + DELIMITER + "done"); bobInboxPath = MailboxPath.forUser("bob", "INBOX"); bobyMailboxPath = MailboxPath.forUser("boby", "INBOX.that.is.a.trick"); bobDifferentNamespacePath = new MailboxPath("#private_bob", "bob", "INBOX.bob"); esnDevGroupInboxPath = new MailboxPath("#community_ESN_DEV", null, "INBOX"); - esnDevGroupHublinPath = new MailboxPath("#community_ESN_DEV", null, "INBOX"+DELIMITER+"hublin"); - esnDevGroupJamesPath = new MailboxPath("#community_ESN_DEV", null, "INBOX"+DELIMITER+"james"); + esnDevGroupHublinPath = new MailboxPath("#community_ESN_DEV", null, "INBOX" + DELIMITER + "hublin"); + esnDevGroupJamesPath = new MailboxPath("#community_ESN_DEV", null, "INBOX" + DELIMITER + "james"); obmTeamGroupInboxPath = new MailboxPath("#community_OBM_Core_Team", null, "INBOX"); - obmTeamGroupOPushPath = new MailboxPath("#community_OBM_Core_Team", null, "INBOX"+DELIMITER+"OPush"); - obmTeamGroupRoundCubePath = new MailboxPath("#community_OBM_Core_Team", null, "INBOX"+DELIMITER+"roundCube"); + obmTeamGroupOPushPath = new MailboxPath("#community_OBM_Core_Team", null, "INBOX" + DELIMITER + "OPush"); + obmTeamGroupRoundCubePath = new MailboxPath("#community_OBM_Core_Team", null, "INBOX" + DELIMITER + "roundCube"); benwaInboxMailbox = createMailbox(benwaInboxPath); benwaWorkMailbox = createMailbox(benwaWorkPath); @@ -281,7 +281,7 @@ public abstract class MailboxMapperTest { bobDifferentNamespaceMailbox = createMailbox(bobDifferentNamespacePath); } - private void saveAll() throws MailboxException{ + private void saveAll() throws MailboxException { mailboxMapper.save(benwaInboxMailbox); mailboxMapper.save(benwaWorkMailbox); mailboxMapper.save(benwaWorkTodoMailbox); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java index 559415c..676e1bb 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java @@ -100,7 +100,7 @@ public abstract class MessageIdMapperTest { @Test public void findShouldReturnEmptyWhenIdListIsEmpty() throws MailboxException { - assertThat(sut.find(ImmutableList.<MessageId> of(), FetchType.Full)).isEmpty(); + assertThat(sut.find(ImmutableList.<MessageId>of(), FetchType.Full)).isEmpty(); } @Test @@ -315,7 +315,7 @@ public abstract class MessageIdMapperTest { sut.save(message1InOtherMailbox); MessageId messageId = message1.getMessageId(); - sut.delete(messageId, ImmutableList.<MailboxId> of()); + sut.delete(messageId, ImmutableList.<MailboxId>of()); List<MailboxId> mailboxes = sut.findMailboxes(messageId); assertThat(mailboxes).containsOnly(benwaInboxMailbox.getMailboxId(), benwaWorkMailbox.getMailboxId()); @@ -464,7 +464,7 @@ public abstract class MessageIdMapperTest { MessageId messageId = message1.getMessageId(); Flags newFlags = new Flags(Flag.ANSWERED); - Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, FlagsUpdateMode.REMOVE); + Map<MailboxId, UpdatedFlags> flags = sut.setFlags(messageId, ImmutableList.<MailboxId>of(), newFlags, FlagsUpdateMode.REMOVE); assertThat(flags).isEmpty(); } @@ -559,7 +559,7 @@ public abstract class MessageIdMapperTest { MessageId messageId = message1.getMessageId(); Flags newFlags = new Flags(Flag.ANSWERED); - sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, FlagsUpdateMode.REMOVE); + sut.setFlags(messageId, ImmutableList.<MailboxId>of(), newFlags, FlagsUpdateMode.REMOVE); List<MailboxMessage> messages = sut.find(ImmutableList.of(messageId), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); @@ -592,7 +592,7 @@ public abstract class MessageIdMapperTest { MessageId messageId = message1.getMessageId(); Flags newFlags = new Flags(Flag.ANSWERED); - sut.setFlags(messageId, ImmutableList.<MailboxId> of(), newFlags, FlagsUpdateMode.REMOVE); + sut.setFlags(messageId, ImmutableList.<MailboxId>of(), newFlags, FlagsUpdateMode.REMOVE); List<MailboxMessage> messages = sut.find(ImmutableList.of(messageId), MessageMapper.FetchType.Body); assertThat(messages).hasSize(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index 3185ef7..5dc3105 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -102,7 +102,7 @@ public abstract class MessageMapperTest { private void initData() throws MailboxException { benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX")); - benwaWorkMailbox = createMailbox( MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work")); + benwaWorkMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work")); message1 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test1 \n\nBody1\n.\n", BODY_START, new PropertyBuilder()); message2 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test2 \n\nBody2\n.\n", BODY_START, new PropertyBuilder()); @@ -189,16 +189,16 @@ public abstract class MessageMapperTest { } @Test - public void messagesCanBeRetrievedInMailboxWithRangeTypeOne() throws MailboxException, IOException{ + public void messagesCanBeRetrievedInMailboxWithRangeTypeOne() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Full; - int limit =10; + int limit = 10; assertThat(messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, limit).next()) .isEqualToWithoutAttachment(message1, fetchType); } @Test - public void messagesCanBeRetrievedInMailboxWithRangeTypeRange() throws MailboxException, IOException{ + public void messagesCanBeRetrievedInMailboxWithRangeTypeRange() throws MailboxException, IOException { saveMessages(); Iterator<MailboxMessage> retrievedMessageIterator = messageMapper .findInMailbox(benwaInboxMailbox, MessageRange.range(message1.getUid(), message4.getUid()), MessageMapper.FetchType.Full, LIMIT); @@ -249,7 +249,7 @@ public abstract class MessageMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeMetadataShouldHaveAtLastMetadataDataLoaded() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeMetadataShouldHaveAtLastMetadataDataLoaded() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Metadata; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT); @@ -258,7 +258,7 @@ public abstract class MessageMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeHeaderShouldHaveHeaderDataLoaded() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeHeaderShouldHaveHeaderDataLoaded() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Headers; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT); @@ -267,7 +267,7 @@ public abstract class MessageMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeBodyShouldHaveBodyDataLoaded() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeBodyShouldHaveBodyDataLoaded() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Body; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT); @@ -276,7 +276,7 @@ public abstract class MessageMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeFullShouldHaveBodyDataLoaded() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeFullShouldHaveBodyDataLoaded() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = FetchType.Full; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(benwaInboxMailbox, MessageRange.one(message1.getUid()), fetchType, LIMIT); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java index 8978a56..42902d2 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java @@ -69,7 +69,7 @@ public abstract class MessageMoveTest { Assume.assumeNotNull(messageMapper); benwaInboxMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX")); - benwaWorkMailbox = createMailbox( MailboxPath.forUser("benwa", "INBOX"+DELIMITER+"work")); + benwaWorkMailbox = createMailbox(MailboxPath.forUser("benwa", "INBOX" + DELIMITER + "work")); message1 = createMessage(benwaInboxMailbox, mapperProvider.generateMessageId(), "Subject: Test1 \n\nBody1\n.\n", BODY_START, new PropertyBuilder()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java index 68b934c..dd11634 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageWithAttachmentMapperTest.java @@ -119,7 +119,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsLoadedWhenOneAttachment() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsLoadedWhenOneAttachment() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Full; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(attachmentsMailbox, MessageRange.one(messageWith1Attachment.getUid()), fetchType, LIMIT); @@ -127,7 +127,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsLoadedWhenTwoAttachments() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsLoadedWhenTwoAttachments() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Full; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(attachmentsMailbox, MessageRange.one(messageWith2Attachments.getUid()), fetchType, LIMIT); @@ -135,7 +135,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeBodyShouldHaveAttachmentsLoadedWhenOneAttachment() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeBodyShouldHaveAttachmentsLoadedWhenOneAttachment() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Body; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(attachmentsMailbox, MessageRange.one(messageWith1Attachment.getUid()), fetchType, LIMIT); @@ -143,7 +143,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeHeadersShouldHaveAttachmentsEmptyWhenOneAttachment() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeHeadersShouldHaveAttachmentsEmptyWhenOneAttachment() throws MailboxException, IOException { Assume.assumeTrue(mapperProvider.supportPartialAttachmentFetch()); saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Headers; @@ -152,7 +152,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeMetadataShouldHaveAttachmentsEmptyWhenOneAttachment() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeMetadataShouldHaveAttachmentsEmptyWhenOneAttachment() throws MailboxException, IOException { Assume.assumeTrue(mapperProvider.supportPartialAttachmentFetch()); saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Metadata; @@ -161,7 +161,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsEmptyWhenNoAttachment() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeFullShouldHaveAttachmentsEmptyWhenNoAttachment() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Full; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(attachmentsMailbox, MessageRange.one(messageWithoutAttachment.getUid()), fetchType, LIMIT); @@ -169,7 +169,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesCanBeRetrievedInMailboxWithRangeTypeOne() throws MailboxException, IOException{ + public void messagesCanBeRetrievedInMailboxWithRangeTypeOne() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Full; assertThat(messageMapper.findInMailbox(attachmentsMailbox, MessageRange.one(messageWith1Attachment.getUid()), fetchType, LIMIT).next()) @@ -177,7 +177,7 @@ public abstract class MessageWithAttachmentMapperTest { } @Test - public void messagesRetrievedUsingFetchTypeBodyShouldHaveBodyDataLoaded() throws MailboxException, IOException{ + public void messagesRetrievedUsingFetchTypeBodyShouldHaveBodyDataLoaded() throws MailboxException, IOException { saveMessages(); MessageMapper.FetchType fetchType = MessageMapper.FetchType.Body; Iterator<MailboxMessage> retrievedMessageIterator = messageMapper.findInMailbox(attachmentsMailbox, MessageRange.one(messageWith1Attachment.getUid()), fetchType, LIMIT); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java index 6d7b3c0..7745819 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssert.java @@ -36,14 +36,14 @@ public class MetadataMapAssert extends AbstractAssert<MetadataMapAssert, Map<Mes } public MetadataMapAssert hasSize(int expectedSize) { - if(actual.size() != expectedSize) { + if (actual.size() != expectedSize) { failWithMessage("Expecting size to be <%s> but is <%s>", expectedSize, actual.size()); } return this; } public MetadataMapAssert containsMetadataForMessages(MailboxMessage... messages) { - for(MailboxMessage message : messages) { + for (MailboxMessage message : messages) { if (! actual.get(message.getUid()).getUid().equals(message.getUid())) { failWithMessage("Expected UID stored in MessageMetadata to be <%s> but was <%s>", actual.get(message.getUid()).getUid(), message.getUid()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java index 8dcccff..b02fb8f 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java @@ -31,26 +31,26 @@ public class SearchUtilTest { @Test public void testSimpleSubject() { - String subject ="This is my subject"; + String subject = "This is my subject"; assertEquals(subject, SearchUtil.getBaseSubject(subject)); } @Test public void testReplaceSpacesAndTabsInSubject() { - String subject ="This is my\tsubject"; + String subject = "This is my\tsubject"; assertEquals("This is my subject", SearchUtil.getBaseSubject(subject)); } @Test public void testRemoveTrailingSpace() { - String subject ="This is my subject "; + String subject = "This is my subject "; assertEquals("This is my subject", SearchUtil.getBaseSubject(subject)); } @Test public void testRemoveTrailingFwd() { - String subject ="This is my subject (fwd)"; + String subject = "This is my subject (fwd)"; assertEquals("This is my subject", SearchUtil.getBaseSubject(subject)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java index b52dcd9..a90e1e1 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java @@ -80,14 +80,14 @@ public class MailboxCopierImpl implements MailboxCopier { if (LOGGER.isInfoEnabled()) { LOGGER.info("Found " + mailboxPathList.size() + " mailboxes in source mailbox manager."); - for (int i=0; i < mailboxPathList.size(); i++) { + for (int i = 0; i < mailboxPathList.size(); i++) { LOGGER.info("Mailbox#" + i + " path=" + mailboxPathList.get(i)); } } MailboxPath mailboxPath = null; - for (int i=0; i < mailboxPathList.size(); i++) { + for (int i = 0; i < mailboxPathList.size(); i++) { mailboxPath = mailboxPathList.get(i); @@ -114,7 +114,7 @@ public class MailboxCopierImpl implements MailboxCopier { dstMailboxManager.startProcessingRequest(dstMailboxSession); MessageManager dstMessageManager = dstMailboxManager.getMailbox(mailboxPath, dstMailboxSession); - int j=0; + int j = 0; Iterator<MessageResult> messageResultIterator = srcMessageManager.getMessages(MessageRange.all(), GROUP, srcMailboxSession); while (messageResultIterator.hasNext()) { @@ -131,12 +131,8 @@ public class MailboxCopierImpl implements MailboxCopier { } dstMailboxManager.endProcessingRequest(dstMailboxSession); - } - - else { - + } else { LOGGER.info("Destination mailbox {}/{} with path={} has a null or empty name", i, mailboxPathList.size(), mailboxPath); - } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java index d99cc6d..6e03ba7 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java @@ -122,7 +122,7 @@ public class ReIndexerImpl implements ReIndexer { if (pathToIndex.isPresent()) { try { reIndex(pathToIndex.get()); - } catch(Throwable e) { + } catch (Throwable e) { LOGGER.error("Error while proceeding to full reindexing on {}", pathToIndex.get(), e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java index bf839a5..09ef13f 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java @@ -103,8 +103,7 @@ public class IMAP168JpaMigrateCommand implements JpaMigrateCommand { if (secondDotIndex > 0) { userName = name.substring(0, secondDotIndex); mailboxName = name.substring(userName.length() + 1); - } - else { + } else { // We don't have a mailbox name... userName = name.substring(0); mailboxName = ""; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java index 236d43a..b4c5ddd 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java @@ -79,7 +79,7 @@ public class IMAP180JpaMigrateCommand implements JpaMigrateCommand { DelegatingResultList headerNameList = (DelegatingResultList) headerQuery.getResultList(); ResultList rl = headerNameList.getDelegate(); - for (int i=0; i < rl.size(); i++) { + for (int i = 0; i < rl.size(); i++) { Object[] results = (Object[]) rl.get(i); Long messageId = (Long) results[0]; Long headerId = (Long) results[1]; @@ -88,7 +88,7 @@ public class IMAP180JpaMigrateCommand implements JpaMigrateCommand { update.setParameter(1, messageId); update.setParameter(2, headerId); int result = update.executeUpdate(); - System.out.printf("ExecuteUpdate returned a result=" + result + " for header %d of %d\n", i+1, headerCount); + System.out.printf("ExecuteUpdate returned a result=" + result + " for header %d of %d\n", i + 1, headerCount); em.getTransaction().commit(); } @@ -127,7 +127,7 @@ public class IMAP180JpaMigrateCommand implements JpaMigrateCommand { DelegatingResultList propertyNameList = (DelegatingResultList) propertyQuery.getResultList(); ResultList rl = propertyNameList.getDelegate(); - for (int i=0; i < rl.size(); i++) { + for (int i = 0; i < rl.size(); i++) { Object[] results = (Object[]) rl.get(i); Long messageId = (Long) results[0]; Long propertyId = (Long) results[1]; @@ -136,7 +136,7 @@ public class IMAP180JpaMigrateCommand implements JpaMigrateCommand { update.setParameter(1, messageId); update.setParameter(2, propertyId); int result = update.executeUpdate(); - System.out.printf("ExecuteUpdate returned a result=" + result + " for property %d of %d\n", i+1, propertyCount); + System.out.printf("ExecuteUpdate returned a result=" + result + " for property %d of %d\n", i + 1, propertyCount); em.getTransaction().commit(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java index da2e59c..3829c3d 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java @@ -75,7 +75,7 @@ public class MailboxRegistrationTest { public void AddedEventsShouldNotBeReported() { TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId())); - MailboxListener.Event event = eventFactory.added(session, treeMap, MAILBOX, ImmutableMap.<MessageUid, MailboxMessage> of()); + MailboxListener.Event event = eventFactory.added(session, treeMap, MAILBOX, ImmutableMap.<MessageUid, MailboxMessage>of()); mailboxRegistration.event(event); assertThat(mailboxRegistration.getImpactingEvents(UID)).isEmpty(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java index d8e8141..73e4291 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java @@ -79,9 +79,8 @@ public final class FlowedMessageUtils { int actualQuoteDepth = 0; if (line != null && line.length() > 0) { - if (line.equals(RFC2646_SIGNATURE)) + if (line.equals(RFC2646_SIGNATURE)) { // signature handling (the previous line is not flowed) - { resultLineFlowed = false; } else if (line.charAt(0) == RFC2646_QUOTE) { // Quote @@ -102,9 +101,8 @@ public final class FlowedMessageUtils { } } - if (line.length() > 0 && line.charAt(0) == RFC2646_SPACE) + if (line.length() > 0 && line.charAt(0) == RFC2646_SPACE) { // Line space-stuffed - { line = line.substring(1); } @@ -141,9 +139,7 @@ public final class FlowedMessageUtils { line = line.substring(0, line.length() - 1); } resultLineFlowed = true; - } - - else { + } else { resultLineFlowed = false; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java b/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java index 8790a9c..f1a77e2 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java @@ -67,16 +67,16 @@ public class MailetUtil { String match = "Re:"; index = subject.indexOf(match, prefixLength); - while(index > -1) { + while (index > -1) { subject.replace(index, index + match.length(), "RE:"); index = subject.indexOf(match, prefixLength); } // Reduce them to one at the beginning - match ="RE:"; + match = "RE:"; int indexRE = subject.indexOf(match, prefixLength) + match.length(); index = subject.indexOf(match, indexRE); - while(index > 0) { + while (index > 0) { subject.delete(index, index + match.length()); index = subject.indexOf(match, indexRE); } @@ -84,7 +84,7 @@ public class MailetUtil { // Reduce blanks match = " "; index = subject.indexOf(match, prefixLength); - while(index > -1) { + while (index > -1) { subject.replace(index, index + match.length(), " "); index = subject.indexOf(match, prefixLength); } @@ -105,7 +105,7 @@ public class MailetUtil { if ("true".equalsIgnoreCase(value)) { return Optional.of(true); } - if ("false".equalsIgnoreCase(value)){ + if ("false".equalsIgnoreCase(value)) { return Optional.of(false); } return Optional.empty(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java index 0e1880f..5337448 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java @@ -53,7 +53,7 @@ public final class StringUtils { // When the number of trailing "\" is odd then there was no separator and this pattern is part of // the previous match. int depth = 1; - while (depth < array[i-1].length() && array[i-1].charAt(array[i-1].length() - 1 - depth) == '\\') { + while (depth < array[i - 1].length() && array[i - 1].charAt(array[i - 1].length() - 1 - depth) == '\\') { depth++; } escaped = depth % 2 == 1; @@ -100,7 +100,7 @@ public final class StringUtils { * or null when the text is null */ public static String capitalizeWords(String data) { - if (data==null) { + if (data == null) { return null; } StringBuilder res = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java index c9a645b..56ed750 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/AbstractDataContentHandler.java @@ -33,16 +33,14 @@ import javax.mail.MessagingException; /** * Abstract class providing common Data Handler behavior. */ -public abstract class AbstractDataContentHandler implements DataContentHandler -{ +public abstract class AbstractDataContentHandler implements DataContentHandler { private ActivationDataFlavor fieldDataFlavor; /** * Default Constructor */ - public AbstractDataContentHandler() - { + public AbstractDataContentHandler() { super(); } @@ -50,8 +48,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler * Update the current DataFlavor. * */ - protected void updateDataFlavor() - { + protected void updateDataFlavor() { setDataFlavor(computeDataFlavor()); } @@ -62,23 +59,18 @@ public abstract class AbstractDataContentHandler implements DataContentHandler */ protected abstract ActivationDataFlavor computeDataFlavor(); - protected void setDataFlavor(ActivationDataFlavor aDataFlavor) - { + protected void setDataFlavor(ActivationDataFlavor aDataFlavor) { fieldDataFlavor = aDataFlavor; } /** * @see javax.activation.DataContentHandler#getContent(javax.activation.DataSource) */ - public Object getContent(DataSource aDataSource) throws IOException - { + public Object getContent(DataSource aDataSource) throws IOException { Object content = null; - try - { + try { content = computeContent(aDataSource); - } - catch (MessagingException e) - { + } catch (MessagingException e) { // No-op } return content; @@ -99,8 +91,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler * javax.activation.DataSource) */ public Object getTransferData(DataFlavor aDataFlavor, DataSource aDataSource) - throws UnsupportedFlavorException, IOException - { + throws UnsupportedFlavorException, IOException { Object content = null; if (getDataFlavor().equals(aDataFlavor)) { content = getContent(aDataSource); @@ -111,8 +102,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler /** * @see javax.activation.DataContentHandler#getTransferDataFlavors() */ - public DataFlavor[] getTransferDataFlavors() - { + public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[]{getDataFlavor()}; } @@ -121,11 +111,9 @@ public abstract class AbstractDataContentHandler implements DataContentHandler * * @return Returns the dataFlavor, lazily initialised. */ - protected ActivationDataFlavor getDataFlavor() - { + protected ActivationDataFlavor getDataFlavor() { ActivationDataFlavor dataFlavor; - if (null == (dataFlavor = getDataFlavorBasic())) - { + if (null == (dataFlavor = getDataFlavorBasic())) { updateDataFlavor(); return getDataFlavor(); } @@ -137,8 +125,7 @@ public abstract class AbstractDataContentHandler implements DataContentHandler * * @return Returns the dataFlavor. */ - private ActivationDataFlavor getDataFlavorBasic() - { + private ActivationDataFlavor getDataFlavorBasic() { return fieldDataFlavor; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/mail/MimeMultipartReport.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/MimeMultipartReport.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/MimeMultipartReport.java index 15cde7e..8d548e1 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/MimeMultipartReport.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/MimeMultipartReport.java @@ -28,14 +28,12 @@ import javax.mail.internet.MimeMultipart; * Class <code>MimeMultipartReport</code> implements JavaMail support * for a MIME type of MimeMultipart with a subtype of report. */ -public class MimeMultipartReport extends MimeMultipart -{ +public class MimeMultipartReport extends MimeMultipart { /** * Default constructor */ - public MimeMultipartReport() - { + public MimeMultipartReport() { this("report"); } @@ -43,8 +41,7 @@ public class MimeMultipartReport extends MimeMultipart * Constructs a MimeMultipartReport of the given subtype. * @param subtype */ - public MimeMultipartReport(String subtype) - { + public MimeMultipartReport(String subtype) { super(subtype); } @@ -53,8 +50,7 @@ public class MimeMultipartReport extends MimeMultipart * @param aDataSource * @throws javax.mail.MessagingException */ - public MimeMultipartReport(DataSource aDataSource) throws MessagingException - { + public MimeMultipartReport(DataSource aDataSource) throws MessagingException { super(aDataSource); } @@ -63,8 +59,7 @@ public class MimeMultipartReport extends MimeMultipart * @param reportType * @throws MessagingException */ - public void setReportType(String reportType) throws MessagingException - { + public void setReportType(String reportType) throws MessagingException { ContentType contentType = new ContentType(getContentType()); contentType.setParameter("report-type", reportType); setContentType(contentType); @@ -74,8 +69,7 @@ public class MimeMultipartReport extends MimeMultipart * Sets the content type * @param aContentType */ - protected void setContentType(ContentType aContentType) - { + protected void setContentType(ContentType aContentType) { contentType = aContentType.toString(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java index 42a2715..adf35df 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/message_disposition_notification.java @@ -44,24 +44,19 @@ import javax.mail.internet.ParseException; * <dt>MIME subtype name</dt><dd>disposition-notification</dd> * </dl> */ -public class message_disposition_notification - extends - AbstractDataContentHandler -{ +public class message_disposition_notification extends AbstractDataContentHandler { /** * Default Constructor. */ - public message_disposition_notification() - { + public message_disposition_notification() { super(); } /** * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor() */ - protected ActivationDataFlavor computeDataFlavor() - { + protected ActivationDataFlavor computeDataFlavor() { return new ActivationDataFlavor(String.class, "message/disposition-notification", "Message String"); } @@ -70,14 +65,12 @@ public class message_disposition_notification * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource) */ protected Object computeContent(DataSource aDataSource) - throws MessagingException - { + throws MessagingException { String encoding = getCharacterSet(aDataSource.getContentType()); Reader reader = null; Writer writer = new StringWriter(2048); String content = null; - try - { + try { reader = new BufferedReader(new InputStreamReader(aDataSource .getInputStream(), encoding), 2048); while (reader.ready()) { @@ -85,34 +78,22 @@ public class message_disposition_notification } writer.flush(); content = writer.toString(); - } - catch (IllegalArgumentException e) - { + } catch (IllegalArgumentException e) { throw new MessagingException("Encoding = \"" + encoding + "\"", e); - } - catch (IOException e) - { + } catch (IOException e) { throw new MessagingException( "Exception obtaining content from DataSource", e); - } - finally - { - try - { + } finally { + try { writer.close(); - } - catch (IOException e1) - { + } catch (IOException e1) { // No-op } - try - { + try { if (reader != null) { reader.close(); } - } - catch (IOException e1) - { + } catch (IOException e1) { // No-op } } @@ -124,8 +105,7 @@ public class message_disposition_notification * java.lang.String, java.io.OutputStream) */ public void writeTo(Object aPart, String aMimeType, OutputStream aStream) - throws IOException - { + throws IOException { if (!(aPart instanceof String)) { throw new IOException("Type \"" + aPart.getClass().getName() + "\" is not supported."); @@ -133,32 +113,23 @@ public class message_disposition_notification String encoding = getCharacterSet(getDataFlavor().getMimeType()); Writer writer; - try - { + try { writer = new BufferedWriter(new OutputStreamWriter(aStream, encoding), 2048); - } - catch (IllegalArgumentException e) - { + } catch (IllegalArgumentException e) { throw new UnsupportedEncodingException(encoding); } writer.write((String) aPart); writer.flush(); } - protected String getCharacterSet(String aType) - { + protected String getCharacterSet(String aType) { String characterSet = null; - try - { + try { characterSet = new ContentType(aType).getParameter("charset"); - } - catch (ParseException e) - { + } catch (ParseException e) { // no-op - } - finally - { + } finally { if (null == characterSet) { characterSet = "us-ascii"; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java b/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java index 2daed88..39d9c80 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/mail/multipart_report.java @@ -34,21 +34,18 @@ import javax.mail.MessagingException; * <dt>MIME subtype name</dt><dd>report</dd> * </dl> */ -public class multipart_report extends AbstractDataContentHandler -{ +public class multipart_report extends AbstractDataContentHandler { /** * Default constructor. */ - public multipart_report() - { + public multipart_report() { super(); } /** * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeDataFlavor() */ - protected ActivationDataFlavor computeDataFlavor() - { + protected ActivationDataFlavor computeDataFlavor() { return new ActivationDataFlavor(MimeMultipartReport.class, "multipart/report", "Multipart Report"); } @@ -58,18 +55,14 @@ public class multipart_report extends AbstractDataContentHandler * java.lang.String, java.io.OutputStream) */ public void writeTo(Object aPart, String aMimeType, OutputStream aStream) - throws IOException - { + throws IOException { if (!(aPart instanceof MimeMultipartReport)) { throw new IOException("Type \"" + aPart.getClass().getName() + "\" is not supported."); } - try - { + try { ((MimeMultipartReport) aPart).writeTo(aStream); - } - catch (MessagingException e) - { + } catch (MessagingException e) { throw new IOException(e.getMessage()); } } @@ -78,8 +71,7 @@ public class multipart_report extends AbstractDataContentHandler * @see org.apache.mailet.base.mail.AbstractDataContentHandler#computeContent(javax.activation.DataSource) */ protected Object computeContent(DataSource aDataSource) - throws MessagingException - { + throws MessagingException { return new MimeMultipartReport(aDataSource); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java b/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java index 9f5b41a..ff88b4d 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/StringUtilsTest.java @@ -69,7 +69,7 @@ public class StringUtilsTest { @Test public void listToStringShouldReturnOnlyBracketsWhenListIsEmpty() { - String listToString = StringUtils.listToString(ImmutableList.<String> of()); + String listToString = StringUtils.listToString(ImmutableList.<String>of()); assertThat(listToString).isEqualTo("[]"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java index 31ef6f1..16e965a 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java @@ -89,7 +89,7 @@ public class MimeMessageBuilder { public MimeMultipart build() throws MessagingException { MimeMultipart multipart = new MimeMultipart(); List<BodyPart> bodyParts = this.bodyParts.build(); - for(BodyPart bodyPart : bodyParts) { + for (BodyPart bodyPart : bodyParts) { multipart.addBodyPart(bodyPart); } return multipart; @@ -180,7 +180,7 @@ public class MimeMessageBuilder { bodyPart.setDisposition(disposition.get()); } List<Header> headerList = headers.build(); - for(Header header: headerList) { + for (Header header: headerList) { bodyPart.addHeader(header.name, header.value); } return bodyPart; @@ -389,7 +389,7 @@ public class MimeMessageBuilder { mimeMessage.setRecipients(Message.RecipientType.BCC, bccAddresses.toArray(new InternetAddress[bccAddresses.size()])); } List<Header> headerList = headers.build(); - for(Header header: headerList) { + for (Header header: headerList) { mimeMessage.addHeader(header.name, header.value); } mimeMessage.saveChanges(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java index 57481f6..4d99712 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java @@ -77,7 +77,7 @@ public class KeyStoreHolder { } public KeyStoreHolder(String password) throws IOException, GeneralSecurityException { - this(System.getProperty("java.home")+"/lib/security/cacerts".replace('/', File.separatorChar), password, KeyStore.getDefaultType()); + this(System.getProperty("java.home") + "/lib/security/cacerts".replace('/', File.separatorChar), password, KeyStore.getDefaultType()); } public KeyStoreHolder(String keyStoreFileName, String keyStorePassword, String keyStoreType) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
