http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java index 33c9749..db3c5d4 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java @@ -34,7 +34,7 @@ import org.apache.james.mailbox.model.MailboxPath; public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> { - public DeleteProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public DeleteProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(DeleteRequest.class, next, mailboxManager, factory); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java index 102a7c2..dbd4028 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java @@ -46,13 +46,13 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp public final static String ENABLED_CAPABILITIES = "ENABLED_CAPABILITIES"; private final static List<String> CAPS = Collections.unmodifiableList(Arrays.asList(SUPPORTS_ENABLE)); - public EnableProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory, final List<PermitEnableCapabilityProcessor> capabilities) { + public EnableProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, List<PermitEnableCapabilityProcessor> capabilities) { this(next, mailboxManager, factory); EnableProcessor.capabilities.addAll(capabilities); } - public EnableProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public EnableProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(EnableRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java index 50024b5..f2b9b2b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.MailboxManager; public class ExamineProcessor extends AbstractSelectionProcessor<ExamineRequest> { - public ExamineProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory statusResponseFactory) { + public ExamineProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory statusResponseFactory) { super(ExamineRequest.class, next, mailboxManager, statusResponseFactory, true); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java index a524612..7f3fae9 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java @@ -48,7 +48,7 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i private final static List<String> UIDPLUS = Collections.unmodifiableList(Arrays.asList("UIDPLUS")); - public ExpungeProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public ExpungeProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(ExpungeRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java index 60842a6..6a86021 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java @@ -59,12 +59,12 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme private final TimeUnit heartbeatIntervalUnit; private final long heartbeatInterval; - public IdleProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public IdleProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { this(next, mailboxManager, factory, DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS, DEFAULT_HEARTBEAT_INTERVAL_UNIT, Executors.newScheduledThreadPool(DEFAULT_SCHEDULED_POOL_CORE_SIZE)); } - public IdleProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory, long heartbeatInterval, TimeUnit heartbeatIntervalUnit, ScheduledExecutorService heartbeatExecutor) { + public IdleProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, long heartbeatInterval, TimeUnit heartbeatIntervalUnit, ScheduledExecutorService heartbeatExecutor) { super(IdleRequest.class, next, mailboxManager, factory); this.heartbeatInterval = heartbeatInterval; this.heartbeatIntervalUnit = heartbeatIntervalUnit; @@ -72,7 +72,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme } - protected void doProcess(final IdleRequest message, final ImapSession session, final String tag, final ImapCommand command, final Responder responder) { + protected void doProcess(IdleRequest message, final ImapSession session, final String tag, final ImapCommand command, final Responder responder) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java index 3409acc..3a57e50 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java @@ -46,7 +46,7 @@ public class LSubProcessor extends AbstractSubscriptionProcessor<LsubRequest> { super(LsubRequest.class, next, mailboxManager, subscriptionManager, factory); } - private void listSubscriptions(ImapSession session, Responder responder, final String referenceName, final String mailboxName) throws SubscriptionException, MailboxException { + private void listSubscriptions(ImapSession session, Responder responder, String referenceName, String mailboxName) throws SubscriptionException, MailboxException { final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session); final Collection<String> mailboxes = getSubscriptionManager().subscriptions(mailboxSession); // If the mailboxName is fully qualified, ignore the reference name. @@ -67,12 +67,12 @@ public class LSubProcessor extends AbstractSubscriptionProcessor<LsubRequest> { final MailboxQuery expression = new MailboxQuery(basePath, CharsetUtil.decodeModifiedUTF7(mailboxName), mailboxSession.getPathDelimiter()); final Collection<String> mailboxResponses = new ArrayList<String>(); - for (final String mailbox : mailboxes) { + for (String mailbox : mailboxes) { respond(responder, expression, mailbox, true, mailboxes, mailboxResponses, mailboxSession.getPathDelimiter()); } } - private void respond(Responder responder, final MailboxQuery expression, final String mailboxName, final boolean originalSubscription, final Collection<String> mailboxes, final Collection<String> mailboxResponses, final char delimiter) { + private void respond(Responder responder, MailboxQuery expression, String mailboxName, boolean originalSubscription, Collection<String> mailboxes, Collection<String> mailboxResponses, char delimiter) { if (expression.isExpressionMatch(mailboxName)) { if (!mailboxResponses.contains(mailboxName)) { final LSubResponse response = new LSubResponse(mailboxName, !originalSubscription, delimiter); @@ -97,7 +97,7 @@ public class LSubProcessor extends AbstractSubscriptionProcessor<LsubRequest> { * @param referenceName * IMAP reference name, possibly null */ - private void respondWithHierarchyDelimiter(final Responder responder, final char delimiter) { + private void respondWithHierarchyDelimiter(Responder responder, char delimiter) { final LSubResponse response = new LSubResponse("", true, delimiter); responder.respond(response); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java index 5c56cf5..a6416bd 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java @@ -46,7 +46,7 @@ import org.apache.james.mailbox.model.MailboxQuery; public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { - public ListProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public ListProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(ListRequest.class, next, mailboxManager, factory); } @@ -87,7 +87,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { * @param command * @param responder */ - protected final void doProcess(final String referenceName, final String mailboxName, final ImapSession session, final String tag, ImapCommand command, final Responder responder, final MailboxTyper mailboxTyper) { + protected final void doProcess(String referenceName, String mailboxName, ImapSession session, String tag, ImapCommand command, Responder responder, MailboxTyper mailboxTyper) { try { // Should the namespace section be returned or not? final boolean isRelative; @@ -175,7 +175,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { results = getMailboxManager().search(new MailboxQuery(basePath, CharsetUtil.decodeModifiedUTF7(mailboxName), mailboxSession.getPathDelimiter()), mailboxSession); } - for (final MailboxMetaData metaData : results) { + for (MailboxMetaData metaData : results) { processResult(responder, isRelative, metaData, getMailboxType(session, mailboxTyper, metaData.getPath())); } @@ -188,7 +188,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { } } - void processResult(final Responder responder, final boolean relative, final MailboxMetaData listResult, final MailboxType mailboxType) { + void processResult(Responder responder, boolean relative, MailboxMetaData listResult, MailboxType mailboxType) { final char delimiter = listResult.getHierarchyDelimiter(); final String mailboxName = mailboxName(relative, listResult.getPath(), delimiter); @@ -235,7 +235,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> { return result; } - protected boolean isAcceptable(final ImapMessage message) { + protected boolean isAcceptable(ImapMessage message) { return ListRequest.class.equals(message.getClass()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java index 870e052..3e824e1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java @@ -37,7 +37,7 @@ import org.apache.james.mailbox.MailboxManager; public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implements CapabilityImplementingProcessor{ private final static List<String> LOGINDISABLED_CAPS = Collections.unmodifiableList(Arrays.asList("LOGINDISABLED")); - public LoginProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public LoginProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(LoginRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java index 5a25d9c..d6939cc 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java @@ -32,7 +32,7 @@ import org.apache.james.mailbox.exception.MailboxException; public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> { - public LogoutProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public LogoutProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(LogoutRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java index 302f51e..2666cc2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java @@ -25,7 +25,7 @@ public class MoveProcessor extends CopyProcessor implements CapabilityImplementi super(MoveRequest.class, next, mailboxManager, factory); } - protected List<MessageRange> process(final MailboxPath targetMailbox, + protected List<MessageRange> process(MailboxPath targetMailbox, final SelectedMailbox currentMailbox, final MailboxSession mailboxSession, final MailboxManager mailboxManager, MessageRange messageSet) http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java index 0da3e30..a103f03 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java @@ -66,7 +66,7 @@ public class NamespaceProcessor extends AbstractMailboxProcessor<NamespaceReques * not null * @return personal namespaces, not null */ - private List<NamespaceResponse.Namespace> buildPersonalNamespaces(final MailboxSession mailboxSession, ImapSession session) { + private List<NamespaceResponse.Namespace> buildPersonalNamespaces(MailboxSession mailboxSession, ImapSession session) { final List<NamespaceResponse.Namespace> personalSpaces = new ArrayList<NamespaceResponse.Namespace>(); String personal = ""; if (session.supportMultipleNamespaces()) { @@ -76,7 +76,7 @@ public class NamespaceProcessor extends AbstractMailboxProcessor<NamespaceReques return personalSpaces; } - private List<NamespaceResponse.Namespace> buildOtherUsersSpaces(final MailboxSession mailboxSession, ImapSession session) { + private List<NamespaceResponse.Namespace> buildOtherUsersSpaces(MailboxSession mailboxSession, ImapSession session) { final String otherUsersSpace = mailboxSession.getOtherUsersSpace(); final List<NamespaceResponse.Namespace> otherUsersSpaces; if (session.supportMultipleNamespaces() == false || otherUsersSpace == null) { @@ -88,7 +88,7 @@ public class NamespaceProcessor extends AbstractMailboxProcessor<NamespaceReques return otherUsersSpaces; } - private List<NamespaceResponse.Namespace> buildSharedNamespaces(final MailboxSession mailboxSession, ImapSession session) { + private List<NamespaceResponse.Namespace> buildSharedNamespaces(MailboxSession mailboxSession, ImapSession session) { List<NamespaceResponse.Namespace> sharedNamespaces = null; final Collection<String> sharedSpaces = mailboxSession.getSharedSpaces(); if (session.supportMultipleNamespaces() && !sharedSpaces.isEmpty()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java index a8e67dc..92fff73 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java @@ -28,7 +28,7 @@ import org.apache.james.mailbox.MailboxManager; public class NoopProcessor extends AbstractMailboxProcessor<NoopRequest> { - public NoopProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public NoopProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(NoopRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java index 78e1333..5cf5133 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java @@ -36,7 +36,7 @@ import org.apache.james.mailbox.model.MailboxPath; public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> { - public RenameProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public RenameProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(RenameRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java index e166e91..c3a1e87 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java @@ -67,7 +67,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp protected final static String SEARCH_MODSEQ = "SEARCH_MODSEQ"; private final static List<String> CAPS = Collections.unmodifiableList(Arrays.asList("WITHIN", "ESEARCH", "SEARCHRES")); - public SearchProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public SearchProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(SearchRequest.class, next, mailboxManager, factory); } @@ -216,7 +216,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp } } - private long[] toArray(final Collection<Long> results) { + private long[] toArray(Collection<Long> results) { final Iterator<Long> it = results.iterator(); final int length = results.size(); long[] ids = new long[length]; @@ -236,7 +236,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp * @return highestModSeq * @throws MailboxException */ - private Long findHighestModSeq(final MailboxSession session, MessageManager mailbox, List<MessageRange> ranges, final long currentHighest) throws MailboxException { + private Long findHighestModSeq(MailboxSession session, MessageManager mailbox, List<MessageRange> ranges, long currentHighest) throws MailboxException { Long highestModSeq = null; // Reverse loop over the ranges as its more likely that we find a match at the end @@ -258,7 +258,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp } - private SearchQuery toQuery(final SearchKey key, final ImapSession session) throws MessageRangeException { + private SearchQuery toQuery(SearchKey key, ImapSession session) throws MessageRangeException { final SearchQuery result = new SearchQuery(); final SelectedMailbox selected = session.getSelected(); if (selected != null) { @@ -269,7 +269,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp return result; } - private SearchQuery.Criterion toCriterion(final SearchKey key, final ImapSession session) throws MessageRangeException { + private SearchQuery.Criterion toCriterion(SearchKey key, ImapSession session) throws MessageRangeException { final int type = key.getType(); final DayMonthYear date = key.getDate(); switch (type) { @@ -389,7 +389,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp * @return crit * @throws MessageRangeException */ - private Criterion sequence(IdRange[] sequenceNumbers, final ImapSession session, boolean msn) throws MessageRangeException { + private Criterion sequence(IdRange[] sequenceNumbers, ImapSession session, boolean msn) throws MessageRangeException { final List<SearchQuery.NumericRange> ranges = new ArrayList<SearchQuery.NumericRange>(); final SelectedMailbox selected = session.getSelected(); boolean useUids = !msn; @@ -397,7 +397,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp // First of check if we have any messages in the mailbox // if not we don't need to go through all of this if (selected.existsCount() > 0) { - for (final IdRange range : sequenceNumbers) { + for (IdRange range : sequenceNumbers) { long lowVal = range.getLowVal(); long highVal = range.getHighVal(); if (useUids) { @@ -456,7 +456,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp return SearchQuery.uid(ranges.toArray(new SearchQuery.NumericRange[0])); } - private Criterion or(List<SearchKey> keys, final ImapSession session) throws MessageRangeException { + private Criterion or(List<SearchKey> keys, ImapSession session) throws MessageRangeException { final SearchKey keyOne = keys.get(0); final SearchKey keyTwo = keys.get(1); final Criterion criterionOne = toCriterion(keyOne, session); @@ -464,16 +464,16 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp return SearchQuery.or(criterionOne, criterionTwo); } - private Criterion not(List<SearchKey> keys, final ImapSession session) throws MessageRangeException { + private Criterion not(List<SearchKey> keys, ImapSession session) throws MessageRangeException { final SearchKey key = keys.get(0); final Criterion criterion = toCriterion(key, session); return SearchQuery.not(criterion); } - private Criterion and(List<SearchKey> keys, final ImapSession session) throws MessageRangeException { + private Criterion and(List<SearchKey> keys, ImapSession session) throws MessageRangeException { final int size = keys.size(); final List<Criterion> criteria = new ArrayList<Criterion>(size); - for (final SearchKey key : keys) { + for (SearchKey key : keys) { final Criterion criterion = toCriterion(key, session); criteria.add(criterion); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/SelectProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SelectProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SelectProcessor.java index 9e63e73..f17536b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SelectProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SelectProcessor.java @@ -26,7 +26,7 @@ import org.apache.james.mailbox.MailboxManager; public class SelectProcessor extends AbstractSelectionProcessor<SelectRequest> { - public SelectProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory statusResponseFactory) { + public SelectProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory statusResponseFactory) { super(SelectRequest.class, next, mailboxManager, statusResponseFactory, false); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java index 5e66569..86e1c80 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java @@ -37,7 +37,7 @@ public class StartTLSProcessor extends AbstractChainedProcessor<StartTLSRequest> private final static List<String> STARTTLS_CAP = Collections.unmodifiableList(Arrays.asList(ImapConstants.SUPPORTS_STARTTLS)); private final StatusResponseFactory factory; - public StartTLSProcessor(final ImapProcessor next, final StatusResponseFactory factory) { + public StartTLSProcessor(ImapProcessor next, StatusResponseFactory factory) { super(StartTLSRequest.class, next); this.factory = factory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java index 01566a7..2488270 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { - public StatusProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public StatusProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(StatusRequest.class, next, mailboxManager, factory); } @@ -94,7 +94,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } } - private Long unseen(final StatusDataItems statusDataItems, final MessageManager.MetaData metaData) throws MailboxException { + private Long unseen(StatusDataItems statusDataItems, MessageManager.MetaData metaData) throws MailboxException { final Long unseen; if (statusDataItems.isUnseen()) { unseen = metaData.getUnseenCount(); @@ -104,7 +104,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { return unseen; } - private Long uidValidity(final StatusDataItems statusDataItems, final MessageManager.MetaData metaData) throws MailboxException { + private Long uidValidity(StatusDataItems statusDataItems, MessageManager.MetaData metaData) throws MailboxException { final Long uidValidity; if (statusDataItems.isUidValidity()) { uidValidity = metaData.getUidValidity(); @@ -115,7 +115,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } - private Long highestModSeq(final StatusDataItems statusDataItems, final MessageManager.MetaData metaData) throws MailboxException { + private Long highestModSeq(StatusDataItems statusDataItems, MessageManager.MetaData metaData) throws MailboxException { final Long highestModSeq; if (statusDataItems.isHighestModSeq()) { highestModSeq = metaData.getHighestModSeq(); @@ -126,7 +126,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { } - private Long uidNext(final StatusDataItems statusDataItems, final MessageManager.MetaData metaData) throws MailboxException { + private Long uidNext(StatusDataItems statusDataItems, MessageManager.MetaData metaData) throws MailboxException { final Long uidNext; if (statusDataItems.isUidNext()) { uidNext = metaData.getUidNext(); @@ -136,7 +136,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { return uidNext; } - private Long recent(final StatusDataItems statusDataItems, final MessageManager.MetaData metaData) throws MailboxException { + private Long recent(StatusDataItems statusDataItems, MessageManager.MetaData metaData) throws MailboxException { final Long recent; if (statusDataItems.isRecent()) { recent = metaData.countRecent(); @@ -146,7 +146,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> { return recent; } - private Long messages(final StatusDataItems statusDataItems, final MessageManager.MetaData metaData) throws MailboxException { + private Long messages(StatusDataItems statusDataItems, MessageManager.MetaData metaData) throws MailboxException { final Long messages; if (statusDataItems.isMessages()) { messages = metaData.getMessageCount(); http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 dbf8adf..efe162f 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 @@ -61,7 +61,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> { */ private final static ImapCommand CONDSTORE_COMMAND = ImapCommand.selectedStateCommand("Conditional STORE"); - public StoreProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public StoreProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(StoreRequest.class, next, mailboxManager, factory); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java index d86eb3b..9f3db77 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java @@ -36,7 +36,7 @@ public class SystemMessageProcessor extends AbstractChainedProcessor<SystemMessa private final MailboxManager mailboxManager; - public SystemMessageProcessor(ImapProcessor next, final MailboxManager mailboxManager) { + public SystemMessageProcessor(ImapProcessor next, MailboxManager mailboxManager) { super(SystemMessage.class, next); this.mailboxManager = mailboxManager; } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java index bdc731f..2d0d142 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/XListProcessor.java @@ -45,7 +45,7 @@ public class XListProcessor extends ListProcessor implements CapabilityImplement private final MailboxTyper mailboxTyper; // some interface - public XListProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory, final MailboxTyper mailboxTyper) { + public XListProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, MailboxTyper mailboxTyper) { super(next, mailboxManager, factory); this.mailboxTyper = mailboxTyper; } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java index 6be982f..fa9116d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractChainedProcessor.java @@ -34,7 +34,7 @@ abstract public class AbstractChainedProcessor<M extends ImapMessage> implements * @param next * next <code>ImapProcessor</code> in the chain, not null */ - public AbstractChainedProcessor(Class<M> acceptableClass, final ImapProcessor next) { + public AbstractChainedProcessor(Class<M> acceptableClass, ImapProcessor next) { this.next = next; this.acceptableClass = acceptableClass; } @@ -62,7 +62,7 @@ abstract public class AbstractChainedProcessor<M extends ImapMessage> implements * <code>ImapMessage</code>, not null * @return true if the given message is processable by this processable */ - protected boolean isAcceptable(final ImapMessage message) { + protected boolean isAcceptable(ImapMessage message) { return acceptableClass.isInstance(message); } @@ -77,5 +77,5 @@ abstract public class AbstractChainedProcessor<M extends ImapMessage> implements * @param session * <code>ImapSession</code>, not null */ - abstract protected void doProcess(final M acceptableMessage, final Responder responder, final ImapSession session); + abstract protected void doProcess(M acceptableMessage, Responder responder, ImapSession session); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java index 8691f8f..f47085f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java @@ -25,7 +25,7 @@ import org.apache.james.imap.api.process.ImapSession; public class ImapResponseMessageProcessor extends AbstractChainedProcessor<ImapResponseMessage> { - public ImapResponseMessageProcessor(final ImapProcessor next) { + public ImapResponseMessageProcessor(ImapProcessor next) { super(ImapResponseMessage.class, next); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java index 28c1b9b..f9a14a5 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java @@ -91,7 +91,7 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{ private int highestMsn = 0; - public SelectedMailboxImpl(final MailboxManager mailboxManager, final ImapSession session, final MailboxPath path) throws MailboxException { + public SelectedMailboxImpl(MailboxManager mailboxManager, ImapSession session, MailboxPath path) throws MailboxException { this.session = session; this.sessionId = ImapSessionUtils.getMailboxSession(session).getSessionId(); this.mailboxManager = mailboxManager; @@ -145,11 +145,11 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{ * * @param uid */ - private void expunge(final long uid) { + private void expunge(long uid) { final int msn = msn(uid); remove(msn, uid); final List<Integer> renumberMsns = new ArrayList<Integer>(msnToUid.tailMap(msn + 1).keySet()); - for (final Integer msnInteger : renumberMsns) { + for (Integer msnInteger : renumberMsns) { int aMsn = msnInteger.intValue(); long aUid = uid(aMsn); remove(aMsn, aUid); @@ -271,7 +271,7 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{ } private void checkExpungedRecents() { - for (final long uid : expungedUids()) { + for (long uid : expungedUids()) { removeRecent(uid); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java index 8608e39..527bef3 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/AddressImpl.java @@ -33,7 +33,7 @@ final class AddressImpl implements FetchResponse.Envelope.Address { private final String personalName; - public AddressImpl(final String atDomainList, final String hostName, final String mailboxName, final String personalName) { + public AddressImpl(String atDomainList, String hostName, String mailboxName, String personalName) { super(); this.atDomainList = atDomainList; this.hostName = hostName; http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java index c34508a..fef9c65 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java @@ -34,7 +34,7 @@ class ContentBodyElement implements BodyElement { protected final Content content; - public ContentBodyElement(final String name, final Content content) { + public ContentBodyElement(String name, Content content) { super(); this.name = name; this.content = content; http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/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 6b2cc9e..6b02a7c 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 @@ -46,12 +46,12 @@ import org.slf4j.Logger; public final class EnvelopeBuilder { private final Logger logger; - public EnvelopeBuilder(final Logger logger) { + public EnvelopeBuilder(Logger logger) { super(); this.logger = logger; } - public FetchResponse.Envelope buildEnvelope(final Headers headers) throws MailboxException { + public FetchResponse.Envelope buildEnvelope(Headers headers) throws MailboxException { final String date = headerValue(headers, ImapConstants.RFC822_DATE); final String subject = headerValue(headers, ImapConstants.RFC822_SUBJECT); final FetchResponse.Envelope.Address[] fromAddresses = buildAddresses(headers, ImapConstants.RFC822_FROM); @@ -65,7 +65,7 @@ public final class EnvelopeBuilder { return new EnvelopeImpl(date, subject, fromAddresses, senderAddresses, replyToAddresses, toAddresses, ccAddresses, bccAddresses, inReplyTo, messageId); } - private String headerValue(final Headers message, final String headerName) throws MailboxException { + private String headerValue(Headers message, String headerName) throws MailboxException { final MessageResult.Header header = MessageResultUtils.getMatching(headerName, message.headers()); final String result; if (header == null) { @@ -91,7 +91,7 @@ public final class EnvelopeBuilder { return result; } - private FetchResponse.Envelope.Address[] buildAddresses(final Headers message, final String headerName, final FetchResponse.Envelope.Address[] defaults) throws MailboxException { + private FetchResponse.Envelope.Address[] buildAddresses(Headers message, String headerName, FetchResponse.Envelope.Address[] defaults) throws MailboxException { final FetchResponse.Envelope.Address[] results; final FetchResponse.Envelope.Address[] addresses = buildAddresses(message, headerName); if (addresses == null) { @@ -111,7 +111,7 @@ public final class EnvelopeBuilder { * @return addresses * @throws MailboxException */ - private FetchResponse.Envelope.Address[] buildAddresses(final Headers message, final String headerName) throws MailboxException { + private FetchResponse.Envelope.Address[] buildAddresses(Headers message, String headerName) throws MailboxException { final MessageResult.Header header = MessageResultUtils.getMatching(headerName, message.headers()); FetchResponse.Envelope.Address[] results; if (header == null) { @@ -157,7 +157,7 @@ public final class EnvelopeBuilder { return results; } - private FetchResponse.Envelope.Address buildMailboxAddress(final org.apache.james.mime4j.dom.address.Mailbox mailbox) { + private FetchResponse.Envelope.Address buildMailboxAddress(org.apache.james.mime4j.dom.address.Mailbox mailbox) { // Encode the mailbox name // See IMAP-266 String name = mailbox.getName(); @@ -177,7 +177,7 @@ public final class EnvelopeBuilder { return buildMailboxAddress(name, atDomainList, localPart, domain); } - private void addAddresses(final Group group, final List<FetchResponse.Envelope.Address> addresses) { + private void addAddresses(Group group, List<FetchResponse.Envelope.Address> addresses) { final String groupName = group.getName(); final FetchResponse.Envelope.Address start = startGroup(groupName); addresses.add(start); http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java index 8b27fec..dc25a2c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeImpl.java @@ -46,7 +46,7 @@ final class EnvelopeImpl implements FetchResponse.Envelope { private final Address[] to; - public EnvelopeImpl(final String date, final String subject, final Address[] from, final Address[] sender, final Address[] replyTo, final Address[] to, final Address[] cc, final Address[] bcc, final String inReplyTo, final String messageId) { + public EnvelopeImpl(String date, String subject, Address[] from, Address[] sender, Address[] replyTo, Address[] to, Address[] cc, Address[] bcc, String inReplyTo, String messageId) { super(); this.bcc = bcc; this.cc = cc; http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java index 328d5a2..7ac9941 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java @@ -52,7 +52,7 @@ import org.apache.james.mailbox.model.MessageResultIterator; public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { - public FetchProcessor(final ImapProcessor next, final MailboxManager mailboxManager, final StatusResponseFactory factory) { + public FetchProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory) { super(FetchRequest.class, next, mailboxManager, factory); } @@ -63,7 +63,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { * org.apache.james.imap.api.ImapCommand, * org.apache.james.imap.api.process.ImapProcessor.Responder) */ - protected void doProcess(FetchRequest request, final ImapSession session, String tag, ImapCommand command, final Responder responder) { + protected void doProcess(FetchRequest request, ImapSession session, String tag, ImapCommand command, Responder responder) { final boolean useUids = request.isUseUids(); final IdRange[] idSet = request.getIdSet(); final FetchData fetch = request.getFetch(); @@ -151,7 +151,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { * @param responder * @throws MailboxException */ - protected void processMessageRanges(final ImapSession session, final MessageManager mailbox, final List<MessageRange> ranges, final FetchData fetch, final boolean useUids, final MailboxSession mailboxSession, final Responder responder) throws MailboxException { + protected void processMessageRanges(ImapSession session, MessageManager mailbox, List<MessageRange> ranges, FetchData fetch, boolean useUids, MailboxSession mailboxSession, Responder responder) throws MailboxException { final FetchResponseBuilder builder = new FetchResponseBuilder(new EnvelopeBuilder(session.getLog())); FetchGroup resultToFetch = getFetchGroup(fetch); @@ -205,7 +205,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { Collection<BodyFetchElement> bodyElements = fetch.getBodyElements(); if (bodyElements != null) { - for (final BodyFetchElement element : bodyElements) { + for (BodyFetchElement element : bodyElements) { final int sectionType = element.getSectionType(); final int[] path = element.getPath(); final boolean isBase = (path == null || path.length == 0); @@ -237,7 +237,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> { return result; } - private void addContent(FetchGroupImpl result, final int[] path, final boolean isBase, final int content) { + private void addContent(FetchGroupImpl result, int[] path, boolean isBase, int content) { if (isBase) { result.or(content); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java index 42a3e45..55d6a71 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java @@ -69,7 +69,7 @@ public final class FetchResponseBuilder { private FetchResponse.Structure bodystructure; - public FetchResponseBuilder(final EnvelopeBuilder envelopeBuilder) { + public FetchResponseBuilder(EnvelopeBuilder envelopeBuilder) { super(); this.envelopeBuilder = envelopeBuilder; } @@ -196,7 +196,7 @@ public final class FetchResponseBuilder { return build(); } - private FetchResponse.Envelope buildEnvelope(final MessageResult result) throws MailboxException { + private FetchResponse.Envelope buildEnvelope(MessageResult result) throws MailboxException { return envelopeBuilder.buildEnvelope(result.getHeaders()); } @@ -208,7 +208,7 @@ public final class FetchResponseBuilder { this.internalDate = internalDate; } - private FetchResponse.BodyElement bodyFetch(final MessageResult messageResult, BodyFetchElement fetchElement) throws MailboxException { + private FetchResponse.BodyElement bodyFetch(MessageResult messageResult, BodyFetchElement fetchElement) throws MailboxException { final Long firstOctet = fetchElement.getFirstOctet(); final Long numberOfOctets = fetchElement.getNumberOfOctets(); @@ -222,7 +222,7 @@ public final class FetchResponseBuilder { } - private FetchResponse.BodyElement bodyContent(final MessageResult messageResult, final String name, final int specifier, final int[] path, final Collection<String> names, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement bodyContent(MessageResult messageResult, String name, int specifier, int[] path, Collection<String> names, boolean isBase) throws MailboxException { final FetchResponse.BodyElement fullResult; switch (specifier) { @@ -256,7 +256,7 @@ public final class FetchResponseBuilder { return fullResult; } - private FetchResponse.BodyElement wrapIfPartialFetch(final Long firstOctet, final Long numberOfOctets, final FetchResponse.BodyElement fullResult) { + private FetchResponse.BodyElement wrapIfPartialFetch(Long firstOctet, Long numberOfOctets, FetchResponse.BodyElement fullResult) { final FetchResponse.BodyElement result; if (firstOctet == null) { result = fullResult; @@ -276,7 +276,7 @@ public final class FetchResponseBuilder { return result; } - private FetchResponse.BodyElement text(final MessageResult messageResult, String name, final int[] path, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement text(MessageResult messageResult, String name, int[] path, boolean isBase) throws MailboxException { final FetchResponse.BodyElement result; Content body; if (isBase) { @@ -296,7 +296,7 @@ public final class FetchResponseBuilder { return result; } - private FetchResponse.BodyElement mimeHeaders(final MessageResult messageResult, String name, final int[] path, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement mimeHeaders(MessageResult messageResult, String name, int[] path, boolean isBase) throws MailboxException { final FetchResponse.BodyElement result; final Iterator<MessageResult.Header> headers = getMimeHeaders(messageResult, path, isBase); List<MessageResult.Header> lines = MessageResultUtils.getAll(headers); @@ -304,7 +304,7 @@ public final class FetchResponseBuilder { return result; } - private HeaderBodyElement headerBodyElement(final MessageResult messageResult, String name, List<MessageResult.Header> lines, final int[] path, final boolean isBase) throws MailboxException { + private HeaderBodyElement headerBodyElement(MessageResult messageResult, String name, List<MessageResult.Header> lines, int[] path, boolean isBase) throws MailboxException { final HeaderBodyElement result = new HeaderBodyElement(name, lines); // if the size is 2 we had found not header and just want to write the empty line with CLRF terminated // so check if there is a content for it. If not we MUST NOT write the empty line in any case @@ -331,7 +331,7 @@ public final class FetchResponseBuilder { } return result; } - private FetchResponse.BodyElement headers(final MessageResult messageResult, String name, final int[] path, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement headers(MessageResult messageResult, String name, int[] path, boolean isBase) throws MailboxException { if (isBase) { // if its base we can just return the raw headers without parsing // them. See MAILBOX-311 and IMAP-? @@ -354,20 +354,20 @@ public final class FetchResponseBuilder { } } - private FetchResponse.BodyElement fieldsNot(final MessageResult messageResult, String name, final int[] path, Collection<String> names, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement fieldsNot(MessageResult messageResult, String name, int[] path, Collection<String> names, boolean isBase) throws MailboxException { final Iterator<MessageResult.Header> headers = getHeaders(messageResult, path, isBase); List<MessageResult.Header> lines = MessageResultUtils.getNotMatching(names, headers); return headerBodyElement(messageResult, name, lines, path, isBase); } - private FetchResponse.BodyElement fields(final MessageResult messageResult, String name, final int[] path, Collection<String> names, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement fields(MessageResult messageResult, String name, int[] path, Collection<String> names, boolean isBase) throws MailboxException { final Iterator<MessageResult.Header> headers = getHeaders(messageResult, path, isBase); List<MessageResult.Header> lines = MessageResultUtils.getMatching(names, headers); return headerBodyElement(messageResult, name, lines, path, isBase); } - private Iterator<MessageResult.Header> getHeaders(final MessageResult messageResult, final int[] path, final boolean isBase) throws MailboxException { + private Iterator<MessageResult.Header> getHeaders(MessageResult messageResult, int[] path, boolean isBase) throws MailboxException { final Iterator<MessageResult.Header> headers; if (isBase) { headers = messageResult.getHeaders().headers(); @@ -378,12 +378,12 @@ public final class FetchResponseBuilder { return headers; } - private Iterator<MessageResult.Header> getMimeHeaders(final MessageResult messageResult, final int[] path, final boolean isBase) throws MailboxException { + private Iterator<MessageResult.Header> getMimeHeaders(MessageResult messageResult, int[] path, boolean isBase) throws MailboxException { MessageResult.MimePath mimePath = new MimePathImpl(path); return messageResult.iterateMimeHeaders(mimePath); } - private FetchResponse.BodyElement content(final MessageResult messageResult, String name, final int[] path, final boolean isBase) throws MailboxException { + private FetchResponse.BodyElement content(MessageResult messageResult, String name, int[] path, boolean isBase) throws MailboxException { final FetchResponse.BodyElement result; Content full; if (isBase) { http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java index d26dbff..699728d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java @@ -34,7 +34,7 @@ import org.apache.james.mailbox.model.MessageResult; */ public class HeaderBodyElement extends MimeBodyElement { - public HeaderBodyElement(final String name, final List<MessageResult.Header> headers) throws MailboxException { + public HeaderBodyElement(String name, List<MessageResult.Header> headers) throws MailboxException { super(name, headers); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java index 2c0892f..411f6dc 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java @@ -41,7 +41,7 @@ public class MessageResultUtils { * * @throws MessagingException */ - public static List<MessageResult.Header> getAll(final Iterator<MessageResult.Header> iterator) { + public static List<MessageResult.Header> getAll(Iterator<MessageResult.Header> iterator) { final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(); if (iterator != null) { while (iterator.hasNext()) { @@ -63,14 +63,14 @@ public class MessageResultUtils { * their natural order * @throws MessagingException */ - public static List<MessageResult.Header> getMatching(final String[] names, final Iterator<MessageResult.Header> iterator) throws MailboxException { + public static List<MessageResult.Header> getMatching(String[] names, Iterator<MessageResult.Header> iterator) throws MailboxException { final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(20); if (iterator != null) { while (iterator.hasNext()) { MessageResult.Header header = iterator.next(); final String headerName = header.getName(); if (headerName != null) { - for (final String name : names) { + for (String name : names) { if (headerName.equalsIgnoreCase(name)) { results.add(header); break; @@ -94,11 +94,11 @@ public class MessageResultUtils { * their natural order * @throws MessagingException */ - public static List<MessageResult.Header> getMatching(final Collection<String> names, final Iterator<MessageResult.Header> iterator) throws MailboxException { + public static List<MessageResult.Header> getMatching(Collection<String> names, Iterator<MessageResult.Header> iterator) throws MailboxException { return matching(names, iterator, false); } - private static List<MessageResult.Header> matching(final Collection<String> names, final Iterator<MessageResult.Header> iterator, boolean not) throws MailboxException { + private static List<MessageResult.Header> matching(Collection<String> names, Iterator<MessageResult.Header> iterator, boolean not) throws MailboxException { final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(names.size()); if (iterator != null) { while (iterator.hasNext()) { @@ -113,11 +113,11 @@ public class MessageResultUtils { return results; } - private static boolean contains(final Collection<String> names, MessageResult.Header header) throws MailboxException { + private static boolean contains(Collection<String> names, MessageResult.Header header) throws MailboxException { boolean match = false; final String headerName = header.getName(); if (headerName != null) { - for (final String name : names) { + for (String name : names) { if (name.equalsIgnoreCase(headerName)) { match = true; break; @@ -139,7 +139,7 @@ public class MessageResultUtils { * their natural order * @throws MessagingException */ - public static List<MessageResult.Header> getNotMatching(final Collection<String> names, final Iterator<MessageResult.Header> iterator) throws MailboxException { + public static List<MessageResult.Header> getNotMatching(Collection<String> names, Iterator<MessageResult.Header> iterator) throws MailboxException { return matching(names, iterator, true); } @@ -155,7 +155,7 @@ public class MessageResultUtils { * exist * @throws MessagingException */ - public static MessageResult.Header getMatching(final String name, final Iterator<MessageResult.Header> iterator) throws MailboxException { + public static MessageResult.Header getMatching(String name, Iterator<MessageResult.Header> iterator) throws MailboxException { MessageResult.Header result = null; if (name != null) { while (iterator.hasNext()) { @@ -182,7 +182,7 @@ public class MessageResultUtils { * their natural order * @throws MessagingException */ - public static List<MessageResult.Header> getNotMatching(final String[] names, final Iterator<MessageResult.Header> iterator) throws MailboxException { + public static List<MessageResult.Header> getNotMatching(String[] names, Iterator<MessageResult.Header> iterator) throws MailboxException { final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(20); if (iterator != null) { while (iterator.hasNext()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java index a2bd19d..2287f6a 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java @@ -44,7 +44,7 @@ public class MimeBodyElement implements BodyElement { private static final Charset US_ASCII = Charset.forName("US-ASCII"); - public MimeBodyElement(final String name, final List<MessageResult.Header> headers) throws MailboxException { + public MimeBodyElement(String name, List<MessageResult.Header> headers) throws MailboxException { super(); this.name = name; this.headers = headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java index 53d4d4a..5ff54fa 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java @@ -55,7 +55,7 @@ final class MimeDescriptorStructure implements FetchResponse.Structure { private final Envelope envelope; - public MimeDescriptorStructure(final boolean allowExtensions, MimeDescriptor descriptor, EnvelopeBuilder builder) throws MailboxException { + public MimeDescriptorStructure(boolean allowExtensions, MimeDescriptor descriptor, EnvelopeBuilder builder) throws MailboxException { super(); this.descriptor = descriptor; parameters = createParameters(descriptor); @@ -78,7 +78,7 @@ final class MimeDescriptorStructure implements FetchResponse.Structure { } } - private static List<Structure> createParts(final boolean allowExtensions, final MimeDescriptor descriptor, final EnvelopeBuilder builder) throws MailboxException { + private static List<Structure> createParts(boolean allowExtensions, MimeDescriptor descriptor, EnvelopeBuilder builder) throws MailboxException { final List<Structure> results = new ArrayList<Structure>(); for (Iterator<MimeDescriptor> it = descriptor.parts(); it.hasNext();) { final MimeDescriptor partDescriptor = it.next(); http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java index befe298..9bb6a7c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java @@ -29,7 +29,7 @@ import org.apache.james.mailbox.model.MessageResult; final class MimePathImpl implements MessageResult.MimePath { private final int[] positions; - public MimePathImpl(final int[] positions) { + public MimePathImpl(int[] positions) { super(); this.positions = positions; } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java index 3583d7f..50ed566 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElement.java @@ -38,7 +38,7 @@ final class PartialFetchBodyElement implements BodyElement { private final String name; - public PartialFetchBodyElement(final BodyElement delegate, final long firstOctet, final long numberOfOctets) { + public PartialFetchBodyElement(BodyElement delegate, long firstOctet, long numberOfOctets) { super(); this.delegate = delegate; this.firstOctet = firstOctet; http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java index 55a2ccd..25335d6 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java @@ -41,19 +41,19 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; */ public class DefaultImapProcessorFactory { - public static ImapProcessor createDefaultProcessor(final MailboxManager mailboxManager, final SubscriptionManager subscriptionManager, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) { + public static ImapProcessor createDefaultProcessor(MailboxManager mailboxManager, SubscriptionManager subscriptionManager, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) { return createXListSupportingProcessor(mailboxManager, subscriptionManager, null, quotaManager, quotaRootResolver, IdleProcessor.DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS, new HashSet<String>()); } - public static ImapProcessor createDefaultProcessor(final MailboxManager mailboxManager, final SubscriptionManager subscriptionManager, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, long idleKeepAlive) { + public static ImapProcessor createDefaultProcessor(MailboxManager mailboxManager, SubscriptionManager subscriptionManager, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, long idleKeepAlive) { return createXListSupportingProcessor(mailboxManager, subscriptionManager, null, quotaManager, quotaRootResolver, idleKeepAlive, new HashSet<String>()); } - public static ImapProcessor createXListSupportingProcessor(final MailboxManager mailboxManager, final SubscriptionManager subscriptionManager, MailboxTyper mailboxTyper, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) { + public static ImapProcessor createXListSupportingProcessor(MailboxManager mailboxManager, SubscriptionManager subscriptionManager, MailboxTyper mailboxTyper, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) { return createXListSupportingProcessor(mailboxManager, subscriptionManager, mailboxTyper, quotaManager, quotaRootResolver, IdleProcessor.DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS, new HashSet<String>()); } - public static ImapProcessor createXListSupportingProcessor(final MailboxManager mailboxManager, final SubscriptionManager subscriptionManager, MailboxTyper mailboxTyper, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, long idleKeepAlive, Set<String> disabledCaps) { + public static ImapProcessor createXListSupportingProcessor(MailboxManager mailboxManager, SubscriptionManager subscriptionManager, MailboxTyper mailboxTyper, QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, long idleKeepAlive, Set<String> disabledCaps) { final StatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory(); final UnknownRequestProcessor unknownRequestImapProcessor = new UnknownRequestProcessor(statusResponseFactory); final ImapProcessor imap4rev1Chain = DefaultProcessorChain.createDefaultChain(unknownRequestImapProcessor, mailboxManager, subscriptionManager, statusResponseFactory, mailboxTyper, quotaManager, quotaRootResolver, idleKeepAlive, TimeUnit.SECONDS, disabledCaps); http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java index dc4cfae..9766785 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/DecodingException.java @@ -58,7 +58,7 @@ public class DecodingException extends IOException { * @param s * specific description suitable for logging, not null */ - public DecodingException(final HumanReadableText key, final String s) { + public DecodingException(HumanReadableText key, String s) { super(s); this.key = key; } @@ -73,7 +73,7 @@ public class DecodingException extends IOException { * @param t * cause, not null */ - public DecodingException(final HumanReadableText key, final String s, final Throwable t) { + public DecodingException(HumanReadableText key, String s, Throwable t) { super(s); this.key = key; this.t = t; http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java index 6039cdc..8606274 100644 --- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/utils/DecoderUtils.java @@ -64,7 +64,7 @@ public final class DecoderUtils { private static final int ALL_MONTH_BITS = JAN_BIT | FEB_BIT | MAR_BIT | APR_BIT | MAY_BIT | JUN_BIT | JUL_BIT | AUG_BIT | SEP_BIT | OCT_BIT | NOV_BIT | DEC_BIT; - public static void setFlag(final String flagString, final Flags flags) throws DecodingException{ + public static void setFlag(String flagString, Flags flags) throws DecodingException{ if (flagString.equalsIgnoreCase(MessageFlags.ANSWERED_ALL_CAPS)) { flags.add(Flags.Flag.ANSWERED); } else if (flagString.equalsIgnoreCase(MessageFlags.DELETED_ALL_CAPS)) { @@ -102,41 +102,41 @@ public final class DecoderUtils { */ public static Date decodeDateTime(CharSequence chars) throws DecodingException { if (isDateTime(chars)) { - final char dayHigh = chars.charAt(0); - final char dayLow = chars.charAt(1); - final int day = decodeFixedDay(dayHigh, dayLow); - - final char monthFirstChar = chars.charAt(3); - final char monthSecondChar = chars.charAt(4); - final char monthThirdChar = chars.charAt(5); - final int month = decodeMonth(monthFirstChar, monthSecondChar, monthThirdChar); - - final char milleniumChar = chars.charAt(7); - final char centuryChar = chars.charAt(8); - final char decadeChar = chars.charAt(9); - final char yearChar = chars.charAt(10); - final int year = decodeYear(milleniumChar, centuryChar, decadeChar, yearChar); - - final char zoneDeterminent = chars.charAt(21); - final char zoneDigitOne = chars.charAt(22); - final char zoneDigitTwo = chars.charAt(23); - final char zoneDigitThree = chars.charAt(24); - final char zoneDigitFour = chars.charAt(25); - final int offset = decodeZone(zoneDeterminent, zoneDigitOne, zoneDigitTwo, zoneDigitThree, zoneDigitFour); - - final char hourHigh = chars.charAt(12); - final char hourLow = chars.charAt(13); - final int hour = applyHourOffset(offset, decodeNumber(hourHigh, hourLow)); - - final char minuteHigh = chars.charAt(15); - final char minuteLow = chars.charAt(16); - final int minute = applyMinuteOffset(offset, decodeNumber(minuteHigh, minuteLow)); - - final char secondHigh = chars.charAt(18); - final char secondLow = chars.charAt(19); - final int second = decodeNumber(secondHigh, secondLow); - - final GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT"), Locale.US); + char dayHigh = chars.charAt(0); + char dayLow = chars.charAt(1); + int day = decodeFixedDay(dayHigh, dayLow); + + char monthFirstChar = chars.charAt(3); + char monthSecondChar = chars.charAt(4); + char monthThirdChar = chars.charAt(5); + int month = decodeMonth(monthFirstChar, monthSecondChar, monthThirdChar); + + char milleniumChar = chars.charAt(7); + char centuryChar = chars.charAt(8); + char decadeChar = chars.charAt(9); + char yearChar = chars.charAt(10); + int year = decodeYear(milleniumChar, centuryChar, decadeChar, yearChar); + + char zoneDeterminent = chars.charAt(21); + char zoneDigitOne = chars.charAt(22); + char zoneDigitTwo = chars.charAt(23); + char zoneDigitThree = chars.charAt(24); + char zoneDigitFour = chars.charAt(25); + int offset = decodeZone(zoneDeterminent, zoneDigitOne, zoneDigitTwo, zoneDigitThree, zoneDigitFour); + + char hourHigh = chars.charAt(12); + char hourLow = chars.charAt(13); + int hour = applyHourOffset(offset, decodeNumber(hourHigh, hourLow)); + + char minuteHigh = chars.charAt(15); + char minuteLow = chars.charAt(16); + int minute = applyMinuteOffset(offset, decodeNumber(minuteHigh, minuteLow)); + + char secondHigh = chars.charAt(18); + char secondLow = chars.charAt(19); + int second = decodeNumber(secondHigh, secondLow); + + GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT"), Locale.US); calendar.clear(); calendar.set(year, month, day, hour, minute, second); return calendar.getTime(); @@ -154,7 +154,7 @@ public final class DecoderUtils { } private static boolean isDateTime(CharSequence chars) { - final boolean result; + boolean result; if (chars == null) { result = false; } else if (chars.length() < 20) { @@ -166,15 +166,15 @@ public final class DecoderUtils { return result; } - private static int applyMinuteOffset(final int offset, final int minutes) { + private static int applyMinuteOffset(int offset, int minutes) { return minutes - ((Math.abs(offset) % 100) * (offset == 0 ? 0 : offset > 0 ? 1 : -1)); } - private static int applyHourOffset(final int offset, final int hours) { + private static int applyHourOffset(int offset, int hours) { return hours - (offset / 100); } - public static int decodeNumber(final char high, final char low) throws DecodingException { + public static int decodeNumber(char high, char low) throws DecodingException { return (10 * decodeDigit(high)) + decodeDigit(low); } @@ -182,7 +182,7 @@ public final class DecoderUtils { if (isInvalidZone(zoneDeterminent, zoneDigitOne, zoneDigitTwo, zoneDigitThree, zoneDigitFour)) { throw createTimeZoneException(zoneDeterminent, zoneDigitOne, zoneDigitTwo, zoneDigitThree, zoneDigitFour); } - final int sign; + int sign; if (zoneDeterminent == '+') { sign = 1; } else if (zoneDeterminent == '-') { @@ -232,7 +232,7 @@ public final class DecoderUtils { * @return {@link Calendar} year * @throws DecodingException */ - public static int decodeYear(final char milleniumChar, final char centuryChar, final char decadeChar, final char yearChar) throws DecodingException { + public static int decodeYear(char milleniumChar, char centuryChar, char decadeChar, char yearChar) throws DecodingException { return (decodeDigit(milleniumChar) * 1000) + (decodeDigit(centuryChar) * 100) + (decodeDigit(decadeChar) * 10) + decodeDigit(yearChar); } @@ -248,7 +248,7 @@ public final class DecoderUtils { * @return {@link Calendar} month (<code>JAN</code>=0) * @throws DecodingException */ - public static int decodeMonth(final char monthFirstChar, final char monthSecondChar, final char monthThirdChar) throws DecodingException { + public static int decodeMonth(char monthFirstChar, char monthSecondChar, char monthThirdChar) throws DecodingException { final int result; // Bitwise magic! Eliminate possibility by three switches int possibleMonths = ALL_MONTH_BITS; @@ -406,7 +406,7 @@ public final class DecoderUtils { return result; } - public static int decodeFixedDay(final char dayHigh, final char dayLow) throws DecodingException { + public static int decodeFixedDay(char dayHigh, char dayLow) throws DecodingException { int result = decodeDigit(dayLow); switch (dayHigh) { case '0': http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java index 6058715..ef30873 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; */ public final class ImapRequestStreamHandler extends AbstractImapRequestHandler { - public ImapRequestStreamHandler(final ImapDecoder decoder, final ImapProcessor processor, final ImapEncoder encoder) { + public ImapRequestStreamHandler(ImapDecoder decoder, ImapProcessor processor, ImapEncoder encoder) { super(decoder, processor, encoder); } http://git-wip-us.apache.org/repos/asf/james-project/blob/e57e8cc8/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java index ea959e4..dd868f4 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java @@ -93,8 +93,8 @@ public class FetchCommandParserPartialFetchTest { } } - private void check(String input, final IdRange[] idSet, - final boolean useUids, final FetchData data, final String tag) throws Exception { + private void check(String input, IdRange[] idSet, + boolean useUids, FetchData data, String tag) throws Exception { ImapRequestLineReader reader = new ImapRequestStreamLineReader( new ByteArrayInputStream(input.getBytes("US-ASCII")), new ByteArrayOutputStream()); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
