You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/06/14 05:44:39 UTC
[4/5] james-project git commit: JAMES-2055 Activate or not CONDSTORE
in capabilities
JAMES-2055 Activate or not CONDSTORE in capabilities
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1fa2d62f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1fa2d62f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1fa2d62f
Branch: refs/heads/master
Commit: 1fa2d62f2ec2017d50e6acac34ee38277cc5d9d0
Parents: 281805d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Jun 12 14:03:40 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jun 14 12:43:37 2017 +0700
----------------------------------------------------------------------
.../imap/processor/CapabilityProcessor.java | 8 +++
.../imap/processor/CapabilityProcessorTest.java | 63 ++++++++++++++++++++
2 files changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1fa2d62f/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 00e056d..828c442 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
@@ -83,6 +83,14 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ
super.configure(imapConfiguration);
disabledCaps.addAll(imapConfiguration.getDisabledCaps());
+ if (shouldDisableCondstore(imapConfiguration)) {
+ disabledCaps.add(SUPPORTS_CONDSTORE);
+ }
+ }
+
+ private boolean shouldDisableCondstore(ImapConfiguration imapConfiguration) {
+ return !imapConfiguration.isCondstoreEnable()
+ && !disabledCaps.contains(SUPPORTS_CONDSTORE);
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/1fa2d62f/protocols/imap/src/test/java/org/apache/james/imap/processor/CapabilityProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/CapabilityProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/CapabilityProcessorTest.java
new file mode 100644
index 0000000..cfebddf
--- /dev/null
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/CapabilityProcessorTest.java
@@ -0,0 +1,63 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.imap.processor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Set;
+
+import org.apache.james.imap.api.ImapConfiguration;
+import org.apache.james.imap.api.ImapConstants;
+import org.apache.james.imap.api.message.response.StatusResponseFactory;
+import org.apache.james.imap.api.process.ImapProcessor;
+import org.apache.james.imap.processor.base.UnknownRequestProcessor;
+import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.metrics.api.MetricFactory;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CapabilityProcessorTest {
+
+ private CapabilityProcessor testee;
+
+ @Before
+ public void setup() {
+ StatusResponseFactory statusResponseFactory = null;
+ ImapProcessor imapProcessor = new UnknownRequestProcessor(statusResponseFactory);
+ MailboxManager mailboxManager = null;
+ MetricFactory metricFactory = null;
+ testee = new CapabilityProcessor(imapProcessor, mailboxManager, statusResponseFactory, metricFactory);
+ }
+
+ @Test
+ public void condstoreShouldBeSupportedWhenSelectedFor() {
+ testee.configure(ImapConfiguration.builder().isCondstoreEnable(true).build());
+
+ Set<String> supportedCapabilities = testee.getSupportedCapabilities(null);
+ assertThat(supportedCapabilities).contains(ImapConstants.SUPPORTS_CONDSTORE);
+ }
+
+ @Test
+ public void condstoreShouldBeNotSupportedByDefault() {
+ testee.configure(ImapConfiguration.builder().build());
+
+ Set<String> supportedCapabilities = testee.getSupportedCapabilities(null);
+ assertThat(supportedCapabilities).doesNotContain(ImapConstants.SUPPORTS_CONDSTORE);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org