JAMES-2055 Remove static methods
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/02737f5b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/02737f5b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/02737f5b Branch: refs/heads/master Commit: 02737f5b5c23924ffb7566a4ce13533654e86e5b Parents: 1003748 Author: Antoine Duprat <[email protected]> Authored: Mon Jun 12 11:55:35 2017 +0200 Committer: benwa <[email protected]> Committed: Wed Jun 14 12:43:21 2017 +0700 ---------------------------------------------------------------------- .../james/imap/processor/CapabilityProcessor.java | 9 +++++---- .../james/imap/processor/DefaultProcessorChain.java | 2 +- .../apache/james/imap/processor/EnableProcessor.java | 12 +++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/02737f5b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java index ac1c7c8..00e056d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java @@ -25,6 +25,7 @@ import static org.apache.james.imap.api.ImapConstants.SUPPORTS_LITERAL_PLUS; import static org.apache.james.imap.api.ImapConstants.SUPPORTS_RFC3348; import static org.apache.james.imap.api.ImapConstants.UTF8; import static org.apache.james.imap.api.ImapConstants.VERSION; + import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -60,13 +61,13 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ CAPS = Collections.unmodifiableList(caps); } - private static final List<CapabilityImplementingProcessor> capabilities = new ArrayList<CapabilityImplementingProcessor>(); - private static final Set<String> disabledCaps = new HashSet<String>(); + private final List<CapabilityImplementingProcessor> capabilities = new ArrayList<CapabilityImplementingProcessor>(); + private final Set<String> disabledCaps = new HashSet<String>(); public CapabilityProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, List<CapabilityImplementingProcessor> capabilities, MetricFactory metricFactory) { this(next, mailboxManager, factory, metricFactory); - CapabilityProcessor.capabilities.addAll(capabilities); + capabilities.addAll(capabilities); } @@ -122,7 +123,7 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ * @param session * @return supported */ - public static Set<String> getSupportedCapabilities(ImapSession session) { + public Set<String> getSupportedCapabilities(ImapSession session) { Set<String> caps = new HashSet<String>(); for (CapabilityImplementingProcessor capability : capabilities) { caps.addAll(capability.getImplementedCapabilities(session)); http://git-wip-us.apache.org/repos/asf/james-project/blob/02737f5b/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java index 322de09..93946ae 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java @@ -104,7 +104,7 @@ public class DefaultProcessorChain { final ListRightsProcessor listRightsProcessor = new ListRightsProcessor(deleteACLProcessor, mailboxManager, statusResponseFactory, metricFactory); final MyRightsProcessor myRightsProcessor = new MyRightsProcessor(listRightsProcessor, mailboxManager, statusResponseFactory, metricFactory); - final EnableProcessor enableProcessor = new EnableProcessor(myRightsProcessor, mailboxManager, statusResponseFactory, metricFactory); + final EnableProcessor enableProcessor = new EnableProcessor(myRightsProcessor, mailboxManager, statusResponseFactory, metricFactory, capabilityProcessor); final GetQuotaProcessor getQuotaProcessor = new GetQuotaProcessor(enableProcessor, mailboxManager, statusResponseFactory, quotaManager, quotaRootResolver, metricFactory); final SetQuotaProcessor setQuotaProcessor = new SetQuotaProcessor(getQuotaProcessor, mailboxManager, statusResponseFactory, metricFactory); http://git-wip-us.apache.org/repos/asf/james-project/blob/02737f5b/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 46b479c..b07af73 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,17 +46,19 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp private final static List<PermitEnableCapabilityProcessor> capabilities = new ArrayList<PermitEnableCapabilityProcessor>(); public final static String ENABLED_CAPABILITIES = "ENABLED_CAPABILITIES"; private final static List<String> CAPS = Collections.unmodifiableList(Arrays.asList(SUPPORTS_ENABLE)); + private final CapabilityProcessor capabilityProcessor; public EnableProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, List<PermitEnableCapabilityProcessor> capabilities, - MetricFactory metricFactory) { - this(next, mailboxManager, factory, metricFactory); + MetricFactory metricFactory, CapabilityProcessor capabilityProcessor) { + this(next, mailboxManager, factory, metricFactory, capabilityProcessor); EnableProcessor.capabilities.addAll(capabilities); } public EnableProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, - MetricFactory metricFactory) { + MetricFactory metricFactory, CapabilityProcessor capabilityProcessor) { super(EnableRequest.class, next, mailboxManager, factory, metricFactory); + this.capabilityProcessor = capabilityProcessor; } @@ -83,12 +85,12 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp } } - public static Set<String> enable(ImapRequest request, Responder responder, ImapSession session, Iterator<String> caps) throws EnableException { + public Set<String> enable(ImapRequest request, Responder responder, ImapSession session, Iterator<String> caps) throws EnableException { Set<String> enabledCaps = new HashSet<String>(); while(caps.hasNext()) { String cap = caps.next(); // Check if the CAPABILITY is supported at all - if (CapabilityProcessor.getSupportedCapabilities(session).contains(cap)) { + if (capabilityProcessor.getSupportedCapabilities(session).contains(cap)) { for (PermitEnableCapabilityProcessor enableProcessor : capabilities) { if (enableProcessor.getPermitEnableCapabilities(session).contains(cap)) { enableProcessor.enable(request, responder, session, cap); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
