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 2019/03/08 01:13:50 UTC
[james-project] 06/14: JAMES-2665 MailRepositoryConfiguration
should expose a default protocol
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 22128af0a78941533e8b0f7e57c7c0ad03874c3b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Mar 4 15:01:41 2019 +0700
JAMES-2665 MailRepositoryConfiguration should expose a default protocol
This is needed because the default protocol to be used depends directly of
the configuration provided by the admin, and vary depending of products.
Hence we need to dynamically retrieve it.
Note that we can introduce a specific configuration field later in mailrepositorystore.xml
later on to avoid implicit knowledge of how to configure the default protocol.
---
.../memory/MailRepositoryStoreConfiguration.java | 7 ++
.../MailRepositoryStoreConfigurationTest.java | 74 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfiguration.java b/server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfiguration.java
index eeaf71c..1294df6 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfiguration.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfiguration.java
@@ -21,6 +21,7 @@ package org.apache.james.mailrepository.memory;
import java.util.Arrays;
import java.util.List;
+import java.util.Optional;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.mailrepository.api.Protocol;
@@ -104,4 +105,10 @@ public class MailRepositoryStoreConfiguration {
public List<Item> getItems() {
return items;
}
+
+ public Optional<Protocol> defaultProtocol() {
+ return items.stream()
+ .flatMap(item -> item.getProtocols().stream())
+ .findFirst();
+ }
}
diff --git a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java
new file mode 100644
index 0000000..c2959ff
--- /dev/null
+++ b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MailRepositoryStoreConfigurationTest.java
@@ -0,0 +1,74 @@
+/****************************************************************
+ * 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.mailrepository.memory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.mailrepository.api.Protocol;
+import org.junit.jupiter.api.Test;
+
+import com.google.common.collect.ImmutableList;
+
+public class MailRepositoryStoreConfigurationTest {
+ @Test
+ void defaultProtocolShouldReturnEmptyWhenEmpty() {
+ MailRepositoryStoreConfiguration configuration = new MailRepositoryStoreConfiguration(ImmutableList.of());
+
+ assertThat(configuration.defaultProtocol()).isEmpty();
+ }
+
+ @Test
+ void defaultProtocolShouldReturnEmptyWhenEmptyItems() {
+ MailRepositoryStoreConfiguration configuration = new MailRepositoryStoreConfiguration(ImmutableList.of(
+ new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(),
+ "class.fqdn",
+ new HierarchicalConfiguration())));
+
+ assertThat(configuration.defaultProtocol()).isEmpty();
+ }
+
+ @Test
+ void defaultProtocolShouldReturnFirstConfiguredProtocol() {
+ MailRepositoryStoreConfiguration configuration = new MailRepositoryStoreConfiguration(ImmutableList.of(
+ new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(new Protocol("1"), new Protocol("2")),
+ "class.fqdn",
+ new HierarchicalConfiguration())));
+
+ assertThat(configuration.defaultProtocol()).contains(new Protocol("1"));
+ }
+
+ @Test
+ void defaultProtocolShouldSkipItemsWithNoProtocols() {
+ MailRepositoryStoreConfiguration configuration = new MailRepositoryStoreConfiguration(ImmutableList.of(
+ new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(),
+ "class.fqdn",
+ new HierarchicalConfiguration()),
+ new MailRepositoryStoreConfiguration.Item(
+ ImmutableList.of(new Protocol("1")),
+ "class.fqdn",
+ new HierarchicalConfiguration())));
+
+ assertThat(configuration.defaultProtocol()).contains(new Protocol("1"));
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org