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 20179d37a4c7c16255e504d2f2e1c7a2e199e169 Author: Tran Tien Duc <[email protected]> AuthorDate: Mon Aug 19 11:35:35 2019 +0700 JAMES-2855 DefaultConfigurationBuilder is not available anymore Use BaseHierarchicalConfiguration --- .../smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java | 4 ++-- .../james/mpt/smtp/CassandraSmtpTestRuleFactory.java | 4 ++-- .../modules/data/CassandraMailRepositoryModule.java | 4 ++-- .../apache/james/DefaultCassandraJamesServerTest.java | 4 ++-- .../james/modules/data/JPAMailRepositoryModule.java | 4 ++-- .../james/modules/mailbox/ListenersConfiguration.java | 13 +++++++------ .../james/modules/mailbox/MailboxListenerFactory.java | 5 +++-- .../mailbox/PreDeletionHookConfigurationTest.java | 11 ++++++----- .../james/modules/server/CamelMailetContainerModule.java | 9 +++++---- .../java/org/apache/james/MemoryJamesServerMain.java | 4 ++-- .../org/apache/james/modules/data/MemoryDataModule.java | 6 +++--- .../org/apache/james/DefaultMemoryJamesServerTest.java | 4 ++-- .../MailRepositoryStoreBeanFactory.java | 10 +++++----- .../cassandra/CassandraRecipientRewriteTableV6Test.java | 4 ++-- .../cassandra/CassandraRecipientRewriteTableV7Test.java | 4 ++-- .../apache/james/rrt/cassandra/CassandraStepdefs.java | 4 ++-- .../james/mailrepository/FileMailRepositoryTest.java | 16 ++++++++-------- .../james/rrt/file/XMLRecipientRewriteTableTest.java | 7 ++++--- .../apache/james/user/file/UsersFileRepositoryTest.java | 4 ++-- .../james/mailrepository/jdbc/JDBCMailRepository.java | 8 ++++---- .../mailrepository/jdbc/JDBCMailRepositoryTest.java | 4 ++-- .../james/rrt/jdbc/JDBCRecipientRewriteTableTest.java | 4 ++-- .../java/org/apache/james/rrt/jdbc/JDBCStepdefs.java | 4 ++-- .../james/user/jdbc/DefaultUsersJdbcRepositoryTest.java | 4 ++-- .../james/user/jdbc/JamesUsersJdbcRepositoryTest.java | 4 ++-- .../apache/james/user/jpa/JpaUsersRepositoryTest.java | 4 ++-- .../memory/MailRepositoryStoreConfiguration.java | 5 +++-- .../memory/MailRepositoryStoreConfigurationTest.java | 10 +++++----- .../memory/MemoryMailRepositoryStoreTest.java | 6 +++--- .../org/apache/james/rrt/memory/InMemoryStepdefs.java | 4 ++-- .../rrt/memory/MemoryRecipientRewriteTableTest.java | 4 ++-- .../james/mailetcontainer/impl/MailetConfigImpl.java | 9 +++++---- .../transport/mailets/ToSenderDomainRepositoryTest.java | 4 ++-- .../apache/james/imapserver/netty/IMAPServerTest.java | 7 ++++--- .../apache/james/pop3server/POP3TestConfiguration.java | 4 ++-- .../java/org/apache/james/smtpserver/SMTPServerTest.java | 4 ++-- .../apache/james/smtpserver/SMTPTestConfiguration.java | 4 ++-- .../apache/james/webadmin/routes/AliasRoutesTest.java | 4 ++-- .../apache/james/webadmin/routes/ForwardRoutesTest.java | 4 ++-- .../vault/routes/DeletedMessagesVaultRoutesTest.java | 4 ++-- .../webadmin/routes/MailRepositoriesRoutesTest.java | 6 +++--- .../james/webadmin/service/ReprocessingServiceTest.java | 4 ++-- 42 files changed, 122 insertions(+), 114 deletions(-) diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java index 43c6f25..ed8fd35 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/CassandraRabbitMQAwsS3SmtpTestRuleFactory.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mpt.smtp; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.CassandraJamesServerMain; import org.apache.james.CleanupTasksPerformer; import org.apache.james.GuiceJamesServer; @@ -56,7 +56,7 @@ public final class CassandraRabbitMQAwsS3SmtpTestRuleFactory { SmtpTestRule.SMTP_PROTOCOL_MODULE, binder -> binder.bind(MailQueueItemDecoratorFactory.class).to(RawMailQueueItemDecoratorFactory.class), binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) - .toInstance(DefaultConfigurationBuilder::new)) + .toInstance(BaseHierarchicalConfiguration::new)) .overrideWith( new RabbitMQModule(), new BlobStoreChoosingModule()) diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRuleFactory.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRuleFactory.java index 4b62952..f8f95ff 100644 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRuleFactory.java +++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpTestRuleFactory.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mpt.smtp; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.CassandraJamesServerMain; import org.apache.james.GuiceJamesServer; import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration; @@ -49,7 +49,7 @@ public final class CassandraSmtpTestRuleFactory { SmtpTestRule.SMTP_PROTOCOL_MODULE, binder -> binder.bind(MailQueueItemDecoratorFactory.class).to(RawMailQueueItemDecoratorFactory.class), binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) - .toInstance(DefaultConfigurationBuilder::new)) + .toInstance(BaseHierarchicalConfiguration::new)) .overrideWith( binder -> binder.bind(ClusterConfiguration.class).toInstance( ClusterConfiguration.builder() diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java index 4472a53..3c8830b 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraMailRepositoryModule.java @@ -19,7 +19,7 @@ package org.apache.james.modules.data; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.mailrepository.api.MailRepositoryProvider; import org.apache.james.mailrepository.api.MailRepositoryUrlStore; @@ -46,7 +46,7 @@ public class CassandraMailRepositoryModule extends AbstractModule { private static final MailRepositoryStoreConfiguration.Item CASSANDRA_MAILREPOSITORY_DEFAULT_DECLARATION = new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("cassandra")), CassandraMailRepository.class.getName(), - new HierarchicalConfiguration()); + new BaseHierarchicalConfiguration()); @Override protected void configure() { diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java index aa850d0..2d48146 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DefaultCassandraJamesServerTest.java @@ -22,7 +22,7 @@ package org.apache.james; import static org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; @@ -44,7 +44,7 @@ class DefaultCassandraJamesServerTest { .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) - .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new HierarchicalConfiguration()))) + .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new BaseHierarchicalConfiguration()))) .build(); @Test diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java index 7bcfc4f..51c6587 100644 --- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java +++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAMailRepositoryModule.java @@ -19,7 +19,7 @@ package org.apache.james.modules.data; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.mailrepository.api.MailRepositoryUrlStore; import org.apache.james.mailrepository.api.Protocol; import org.apache.james.mailrepository.file.FileMailRepository; @@ -35,7 +35,7 @@ public class JPAMailRepositoryModule extends AbstractModule { private static final MailRepositoryStoreConfiguration.Item FILE_MAILREPOSITORY_DEFAULT_DECLARATION = new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("file")), FileMailRepository.class.getName(), - new HierarchicalConfiguration()); + new BaseHierarchicalConfiguration()); @Override protected void configure() { diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ListenersConfiguration.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ListenersConfiguration.java index b499a1a..dc6849d 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ListenersConfiguration.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/ListenersConfiguration.java @@ -20,7 +20,7 @@ package org.apache.james.modules.mailbox; import java.util.List; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; import com.github.steveash.guavate.Guavate; import com.google.common.annotations.VisibleForTesting; @@ -28,11 +28,12 @@ import com.google.common.annotations.VisibleForTesting; public class ListenersConfiguration { public static ListenersConfiguration from(HierarchicalConfiguration configuration) { - return new ListenersConfiguration( - configuration.configurationsAt("listener") - .stream() - .map(ListenerConfiguration::from) - .collect(Guavate.toImmutableList())); + List<HierarchicalConfiguration> listeners = configuration.configurationsAt("listener"); + + return new ListenersConfiguration(listeners + .stream() + .map(ListenerConfiguration::from) + .collect(Guavate.toImmutableList())); } private final List<ListenerConfiguration> listenersConfiguration; diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/MailboxListenerFactory.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/MailboxListenerFactory.java index 7f90b92..e7988db 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/MailboxListenerFactory.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/MailboxListenerFactory.java @@ -22,7 +22,8 @@ import java.util.Optional; import javax.inject.Inject; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; import org.apache.james.mailbox.events.MailboxListener; import com.google.common.base.Preconditions; @@ -74,7 +75,7 @@ public class MailboxListenerFactory { binder -> binder.bind(MailboxListener.ExecutionMode.class) .toInstance(executionMode.orElse(MailboxListener.ExecutionMode.SYNCHRONOUS)), binder -> binder.bind(HierarchicalConfiguration.class) - .toInstance(configuration.orElse(new HierarchicalConfiguration()))) + .toInstance(configuration.orElse(new BaseHierarchicalConfiguration()))) .getInstance(clazz.get()); } } diff --git a/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/PreDeletionHookConfigurationTest.java b/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/PreDeletionHookConfigurationTest.java index 355eab1..85af9a2 100644 --- a/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/PreDeletionHookConfigurationTest.java +++ b/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/PreDeletionHookConfigurationTest.java @@ -22,8 +22,9 @@ package org.apache.james.modules.mailbox; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; @@ -37,7 +38,7 @@ class PreDeletionHookConfigurationTest { @Test void fromShouldThrowWhenClassNameIsMissing() { - HierarchicalConfiguration configuration = new HierarchicalConfiguration(); + HierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); assertThatThrownBy(() -> PreDeletionHookConfiguration.from(configuration)) .isInstanceOf(ConfigurationException.class); @@ -45,7 +46,7 @@ class PreDeletionHookConfigurationTest { @Test void fromShouldThrowWhenClassNameIsEmpty() { - HierarchicalConfiguration configuration = new HierarchicalConfiguration(); + HierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); configuration.addProperty("class", ""); assertThatThrownBy(() -> PreDeletionHookConfiguration.from(configuration)) @@ -54,7 +55,7 @@ class PreDeletionHookConfigurationTest { @Test void fromShouldReturnValueWithCorrectClassName() throws ConfigurationException { - HierarchicalConfiguration configuration = new HierarchicalConfiguration(); + HierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); String className = "a.class"; configuration.addProperty("class", className); diff --git a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java index b75a99b..e04d95b 100644 --- a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java +++ b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java @@ -26,8 +26,9 @@ import java.util.function.Predicate; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.lifecycle.api.Startable; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.mailetcontainer.api.MailetLoader; @@ -132,7 +133,7 @@ public class CamelMailetContainerModule extends AbstractModule { .configurationAt("spooler"); } catch (Exception e) { LOGGER.warn("Could not locate configuration for James Spooler. Assuming empty configuration for this component."); - return new HierarchicalConfiguration(); + return new BaseHierarchicalConfiguration(); } } @@ -168,7 +169,7 @@ public class CamelMailetContainerModule extends AbstractModule { .configurationAt("context"); } catch (Exception e) { LOGGER.warn("Could not locate configuration for Mailet context. Assuming empty configuration for this component."); - return new HierarchicalConfiguration(); + return new BaseHierarchicalConfiguration(); } } diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java index 191cf83..3402607 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java @@ -21,7 +21,7 @@ package org.apache.james; import java.util.Optional; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.jwt.JwtConfiguration; import org.apache.james.modules.BlobExportMechanismModule; import org.apache.james.modules.BlobMemoryModule; @@ -113,7 +113,7 @@ public class MemoryJamesServerMain { new SMTPServerModule(), new RawPostDequeueDecoratorModule(), binder -> binder.bind(CamelMailetContainerModule.DefaultProcessorsConfigurationSupplier.class) - .toInstance(DefaultConfigurationBuilder::new)); + .toInstance(BaseHierarchicalConfiguration::new)); public static final Module SMTP_AND_IMAP_MODULE = Modules.combine( diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java index d6f47bb..d24b762 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java @@ -21,8 +21,8 @@ package org.apache.james.modules.data; import java.util.List; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.dlp.api.DLPConfigurationStore; import org.apache.james.dlp.eventsourcing.EventSourcingDLPConfigurationStore; import org.apache.james.domainlist.api.DomainList; @@ -56,7 +56,7 @@ public class MemoryDataModule extends AbstractModule { private static final MailRepositoryStoreConfiguration.Item MEMORY_MAILREPOSITORY_DEFAULT_DECLARATION = new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("memory")), MemoryMailRepository.class.getName(), - new HierarchicalConfiguration()); + new BaseHierarchicalConfiguration()); @Override protected void configure() { diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java index c1ad2eb..11af21d 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/DefaultMemoryJamesServerTest.java @@ -21,7 +21,7 @@ package org.apache.james; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.PDFTextExtractor; import org.apache.james.modules.TestJMAPServerModule; @@ -41,7 +41,7 @@ class DefaultMemoryJamesServerTest { .overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES)) .overrideWith(binder -> binder.bind(TextExtractor.class).to(PDFTextExtractor.class)) .overrideWith(binder -> binder.bind(PropertiesProvider.class).to(FailingPropertiesProvider.class)) - .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new HierarchicalConfiguration()))) + .overrideWith(binder -> binder.bind(ConfigurationProvider.class).toInstance((s, l) -> new BaseHierarchicalConfiguration()))) .build(); @Test diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java index d14a198..8367662 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java @@ -27,10 +27,10 @@ import java.util.stream.Stream; import javax.annotation.PostConstruct; import org.apache.commons.collections4.map.ReferenceMap; -import org.apache.commons.configuration.CombinedConfiguration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.CombinedConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.container.spring.bean.factory.AbstractBeanFactory; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.mailrepository.api.MailRepository; @@ -184,7 +184,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen if (defConf != null) { config.addConfiguration(defConf); } - DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); + HierarchicalConfiguration builder = new BaseHierarchicalConfiguration(); builder.addProperty("[@destinationURL]", destination.asString()); config.addConfiguration(builder); diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java index acab7bf..41386ef 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV6Test.java @@ -19,7 +19,7 @@ package org.apache.james.rrt.cassandra; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -70,7 +70,7 @@ public class CassandraRecipientRewriteTableV6Test extends AbstractRecipientRewri new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), new CassandraMappingsSourcesDAO(cassandra.getConf()), cassandraSchemaVersionDAO); - rrt.configure(new DefaultConfigurationBuilder()); + rrt.configure(new BaseHierarchicalConfiguration()); cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V6); diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java index 77af537..381809f 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTableV7Test.java @@ -19,7 +19,7 @@ package org.apache.james.rrt.cassandra; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -70,7 +70,7 @@ public class CassandraRecipientRewriteTableV7Test extends AbstractRecipientRewri new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), new CassandraMappingsSourcesDAO(cassandra.getConf()), cassandraSchemaVersionDAO); - rrt.configure(new DefaultConfigurationBuilder()); + rrt.configure(new BaseHierarchicalConfiguration()); cassandraSchemaVersionDAO.updateVersion(SCHEMA_VERSION_V7); diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java index ddc4481..a32812f 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/CassandraStepdefs.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.rrt.cassandra; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraRule; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -64,7 +64,7 @@ public class CassandraStepdefs { new CassandraRecipientRewriteTableDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), new CassandraMappingsSourcesDAO(cassandra.getConf()), new CassandraSchemaVersionDAO(cassandra.getConf())); - rrt.configure(new DefaultConfigurationBuilder()); + rrt.configure(new BaseHierarchicalConfiguration()); rrt.setDomainList(RecipientRewriteTableFixture.domainListForCucumberTests()); return rrt; } diff --git a/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java index a2a69aa..ec5a39c 100644 --- a/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java @@ -19,7 +19,7 @@ package org.apache.james.mailrepository; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.file.FileMailRepository; @@ -43,13 +43,13 @@ public class FileMailRepositoryTest { mailRepository.init(); } - protected DefaultConfigurationBuilder getConfiguration() { - DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder(); + protected BaseHierarchicalConfiguration getConfiguration() { + BaseHierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); configuration.addProperty("[@destinationURL]", "file://target/var/mailRepository"); return withConfigurationOptions(configuration); } - protected abstract DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration); + protected abstract BaseHierarchicalConfiguration withConfigurationOptions(BaseHierarchicalConfiguration configuration); @AfterEach void tearDown() { @@ -67,7 +67,7 @@ public class FileMailRepositoryTest { public class DefaultFileMailRepositoryTest extends GenericFileMailRepositoryTest { @Override - protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { + protected BaseHierarchicalConfiguration withConfigurationOptions(BaseHierarchicalConfiguration configuration) { configuration.addProperty("[@FIFO]", "false"); configuration.addProperty("[@CACHEKEYS]", "true"); return configuration; @@ -79,7 +79,7 @@ public class FileMailRepositoryTest { public class NoCacheFileMailRepositoryTest extends GenericFileMailRepositoryTest { @Override - protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { + protected BaseHierarchicalConfiguration withConfigurationOptions(BaseHierarchicalConfiguration configuration) { configuration.addProperty("[@FIFO]", "false"); configuration.addProperty("[@CACHEKEYS]", "false"); return configuration; @@ -91,7 +91,7 @@ public class FileMailRepositoryTest { public class FifoFileMailRepositoryTest extends GenericFileMailRepositoryTest { @Override - protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { + protected BaseHierarchicalConfiguration withConfigurationOptions(BaseHierarchicalConfiguration configuration) { configuration.addProperty("[@FIFO]", "true"); configuration.addProperty("[@CACHEKEYS]", "true"); return configuration; @@ -103,7 +103,7 @@ public class FileMailRepositoryTest { public class FifoNoCacheFileMailRepositoryTest extends GenericFileMailRepositoryTest { @Override - protected DefaultConfigurationBuilder withConfigurationOptions(DefaultConfigurationBuilder configuration) { + protected BaseHierarchicalConfiguration withConfigurationOptions(BaseHierarchicalConfiguration configuration) { configuration.addProperty("[@FIFO]", "true"); configuration.addProperty("[@CACHEKEYS]", "false"); return configuration; diff --git a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java index 57fd85b..4b3f4d4 100644 --- a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java @@ -21,7 +21,8 @@ package org.apache.james.rrt.file; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest; @@ -37,12 +38,12 @@ import org.junit.Test; public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest { - private final DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); + private final BaseHierarchicalConfiguration defaultConfiguration = new BaseHierarchicalConfiguration(); @Override @Before public void setUp() throws Exception { - defaultConfiguration.setDelimiterParsingDisabled(true); + defaultConfiguration.setListDelimiterHandler(new DisabledListDelimiterHandler()); super.setUp(); } diff --git a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java index 9de69af..ea03978 100644 --- a/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.io.FileUtils; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.lifecycle.api.LifecycleUtil; @@ -82,7 +82,7 @@ public class UsersFileRepositoryTest extends AbstractUsersRepositoryTest { }; - DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder("test"); + BaseHierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); configuration.addProperty("destination.[@URL]", "file://target/var/users"); // Configure with ignoreCase = false, we need some more work to support true configuration.addProperty("ignoreCase", "false"); diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java index 9ba9395..7f71324 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java @@ -48,9 +48,9 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import javax.sql.DataSource; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.lang3.SerializationUtils; import org.apache.james.core.MailAddress; import org.apache.james.filesystem.api.FileSystem; @@ -245,7 +245,7 @@ public class JDBCMailRepository extends AbstractMailRepository { if (filestore != null) { // prepare Configurations for stream repositories - DefaultConfigurationBuilder streamConfiguration = new DefaultConfigurationBuilder(); + HierarchicalConfiguration streamConfiguration = new BaseHierarchicalConfiguration(); streamConfiguration.addProperty("[@destinationURL]", filestore); diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java index 59a06b1..ae72802 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import javax.sql.DataSource; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.dbcp.BasicDataSource; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; @@ -44,7 +44,7 @@ public class JDBCMailRepositoryTest implements MailRepositoryContract { DataSource datasource = getDataSource(); mailRepository = new JDBCMailRepository(); - DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); + BaseHierarchicalConfiguration defaultConfiguration = new BaseHierarchicalConfiguration(); defaultConfiguration.addProperty("[@destinationURL]", "db://maildb/mr/testrepo"); defaultConfiguration.addProperty("sqlFile", "file://conf/sqlResources.xml"); defaultConfiguration.addProperty("[@type]", "MAIL"); diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java index a1acea8..eb47663 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.rrt.jdbc; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.dbcp.BasicDataSource; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; @@ -47,7 +47,7 @@ public class JDBCRecipientRewriteTableTest extends AbstractRecipientRewriteTable JDBCRecipientRewriteTable localVirtualUserTable = new JDBCRecipientRewriteTable(); localVirtualUserTable.setDataSource(getDataSource()); localVirtualUserTable.setFileSystem(new MockFileSystem()); - DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); + BaseHierarchicalConfiguration defaultConfiguration = new BaseHierarchicalConfiguration(); defaultConfiguration.addProperty("[@destinationURL]", "db://maildb/RecipientRewriteTable"); defaultConfiguration.addProperty("sqlFile", "file://conf/sqlResources.xml"); localVirtualUserTable.configure(defaultConfiguration); diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java index c6ae828..b09158f 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java @@ -20,7 +20,7 @@ package org.apache.james.rrt.jdbc; import java.util.UUID; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.dbcp.BasicDataSource; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; @@ -48,7 +48,7 @@ public class JDBCStepdefs { JDBCRecipientRewriteTable localVirtualUserTable = new JDBCRecipientRewriteTable(); localVirtualUserTable.setDataSource(getDataSource()); localVirtualUserTable.setFileSystem(new MockFileSystem()); - DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); + BaseHierarchicalConfiguration defaultConfiguration = new BaseHierarchicalConfiguration(); defaultConfiguration.addProperty("[@destinationURL]", "db://maildb/RecipientRewriteTable"); defaultConfiguration.addProperty("sqlFile", "file://conf/sqlResources.xml"); localVirtualUserTable.configure(defaultConfiguration); diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java index be785fe..d73d0ec 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java @@ -23,7 +23,7 @@ import java.util.Iterator; import javax.sql.DataSource; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.dbcp.BasicDataSource; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; @@ -73,7 +73,7 @@ public class DefaultUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryT res.setDatasource(dataSource); - DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder(); + BaseHierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); configuration.addProperty("[@destinationURL]", "db://maildb/" + tableString); configuration.addProperty("sqlFile", "file://conf/sqlResources.xml"); res.configure(configuration); diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java index 66e9fd4..f5d003d 100644 --- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java +++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java @@ -23,7 +23,7 @@ import java.util.Iterator; import javax.sql.DataSource; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.dbcp.BasicDataSource; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; @@ -72,7 +72,7 @@ public class JamesUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTes res.setFileSystem(new MockFileSystem()); DataSource dataSource = getDataSource(); res.setDatasource(dataSource); - DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder(); + BaseHierarchicalConfiguration configuration = new BaseHierarchicalConfiguration(); configuration.addProperty("[@destinationURL]", "db://maildb/" + tableString); configuration.addProperty("sqlFile", "file://conf/sqlResources.xml"); res.configure(configuration); diff --git a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java index 6a0d1d6..acdf0a1 100644 --- a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java +++ b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.user.jpa; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.backends.jpa.JpaTestCluster; import org.apache.james.user.jpa.model.JPAUser; import org.apache.james.user.lib.AbstractUsersRepository; @@ -47,7 +47,7 @@ public class JpaUsersRepositoryTest extends AbstractUsersRepositoryTest { protected AbstractUsersRepository getUsersRepository() throws Exception { JPAUsersRepository repos = new JPAUsersRepository(); repos.setEntityManagerFactory(JPA_TEST_CLUSTER.getEntityManagerFactory()); - repos.configure(new DefaultConfigurationBuilder()); + repos.configure(new BaseHierarchicalConfiguration()); return repos; } } 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 0a6db81..c31db6b 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 @@ -23,7 +23,8 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; import org.apache.james.mailrepository.api.Protocol; import org.apache.james.util.OptionalUtils; import org.slf4j.Logger; @@ -114,7 +115,7 @@ public class MailRepositoryStoreConfiguration { if (configuration.getKeys("config").hasNext()) { return configuration.configurationAt("config"); } - return new HierarchicalConfiguration(); + return new BaseHierarchicalConfiguration(); } 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 index 4f9dd4a..8559e97 100644 --- 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 @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.mailrepository.api.Protocol; import org.junit.jupiter.api.Test; @@ -43,7 +43,7 @@ class MailRepositoryStoreConfigurationTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(), "class.fqdn", - new HierarchicalConfiguration()))); + new BaseHierarchicalConfiguration()))); assertThat(defaultProtocol).isEmpty(); } @@ -54,7 +54,7 @@ class MailRepositoryStoreConfigurationTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("1"), new Protocol("2")), "class.fqdn", - new HierarchicalConfiguration()))); + new BaseHierarchicalConfiguration()))); assertThat(defaultProtocol).contains(new Protocol("1")); } @@ -65,11 +65,11 @@ class MailRepositoryStoreConfigurationTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(), "class.fqdn", - new HierarchicalConfiguration()), + new BaseHierarchicalConfiguration()), new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("1")), "class.fqdn", - new HierarchicalConfiguration()))); + new BaseHierarchicalConfiguration()))); assertThat(defaultProtocol).contains(new Protocol("1")); } diff --git a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java index 13aa40b..007547e 100644 --- a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java +++ b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java @@ -24,8 +24,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryPath; @@ -109,7 +109,7 @@ public class MemoryMailRepositoryStoreTest { @Test public void configureShouldNotThrowOnEmptyConfiguration() throws Exception { - MailRepositoryStoreConfiguration configuration = MailRepositoryStoreConfiguration.parse(new HierarchicalConfiguration()); + MailRepositoryStoreConfiguration configuration = MailRepositoryStoreConfiguration.parse(new BaseHierarchicalConfiguration()); repositoryStore = new MemoryMailRepositoryStore(urlStore, Sets.newHashSet( new MemoryMailRepositoryProvider()), configuration); diff --git a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java index e1f9f92..c3176a8 100644 --- a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java +++ b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java @@ -19,7 +19,7 @@ package org.apache.james.rrt.memory; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; import org.apache.james.rrt.lib.RecipientRewriteTableFixture; import org.apache.james.rrt.lib.RewriteTablesStepdefs; @@ -41,7 +41,7 @@ public class InMemoryStepdefs { private AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception { MemoryRecipientRewriteTable rrt = new MemoryRecipientRewriteTable(); - rrt.configure(new DefaultConfigurationBuilder()); + rrt.configure(new BaseHierarchicalConfiguration()); rrt.setDomainList(RecipientRewriteTableFixture.domainListForCucumberTests()); return rrt; } diff --git a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java index 0d32f1d..da7853f 100644 --- a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java +++ b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTableTest.java @@ -19,7 +19,7 @@ package org.apache.james.rrt.memory; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest; import org.junit.After; @@ -42,7 +42,7 @@ public class MemoryRecipientRewriteTableTest extends AbstractRecipientRewriteTab @Override protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception { AbstractRecipientRewriteTable rrt = new MemoryRecipientRewriteTable(); - rrt.configure(new DefaultConfigurationBuilder()); + rrt.configure(new BaseHierarchicalConfiguration()); return rrt; } } diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java index ed40f79..db29116 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java @@ -24,8 +24,9 @@ import java.util.Iterator; import java.util.List; import java.util.regex.Pattern; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler; import org.apache.mailet.MailetConfig; import org.apache.mailet.MailetContext; @@ -122,10 +123,10 @@ public class MailetConfigImpl implements MailetConfig { * the new Configuration for the mailet */ public void setConfiguration(Configuration newConfiguration) { - DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); + BaseHierarchicalConfiguration builder = new BaseHierarchicalConfiguration(); // Disable the delimiter parsing. See JAMES-1232 - builder.setDelimiterParsingDisabled(true); + builder.setListDelimiterHandler(new DisabledListDelimiterHandler()); Iterator<String> keys = newConfiguration.getKeys(); while (keys.hasNext()) { String key = keys.next(); diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java index ff63a10..34e5a02 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.when; import javax.mail.MessagingException; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryStore; import org.apache.james.mailrepository.api.MailRepositoryUrl; @@ -73,7 +73,7 @@ class ToSenderDomainRepositoryTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("memory")), MemoryMailRepository.class.getName(), - new HierarchicalConfiguration())); + new BaseHierarchicalConfiguration())); mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, Sets.newHashSet(new MemoryMailRepositoryProvider()), configuration); mailRepositoryStore.init(); diff --git a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java index 8c4cbfd..9ccf483 100644 --- a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java +++ b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java @@ -23,7 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.TimeUnit; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; +import org.apache.commons.configuration2.HierarchicalConfiguration; import org.apache.james.imap.api.ImapConfiguration; import org.junit.Rule; import org.junit.Test; @@ -37,7 +38,7 @@ public class IMAPServerTest { @Test public void getImapConfigurationShouldReturnDefaultValuesWhenEmpty() throws Exception { - ImapConfiguration imapConfiguration = IMAPServer.getImapConfiguration(new DefaultConfigurationBuilder()); + ImapConfiguration imapConfiguration = IMAPServer.getImapConfiguration(new BaseHierarchicalConfiguration()); ImapConfiguration expectImapConfiguration = ImapConfiguration.builder() .enableIdle(ImapConfiguration.DEFAULT_ENABLE_IDLE) @@ -51,7 +52,7 @@ public class IMAPServerTest { @Test public void getImapConfigurationShouldReturnSetValue() throws Exception { - DefaultConfigurationBuilder configurationBuilder = new DefaultConfigurationBuilder(); + HierarchicalConfiguration configurationBuilder = new BaseHierarchicalConfiguration(); configurationBuilder.addProperty("enableIdle", "false"); configurationBuilder.addProperty("idleTimeInterval", "1"); configurationBuilder.addProperty("idleTimeIntervalUnit", "MINUTES"); diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java index 4128280..5c575db 100644 --- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java +++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java @@ -19,10 +19,10 @@ package org.apache.james.pop3server; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.pop3server.core.CoreCmdHandlerLoader; -public class POP3TestConfiguration extends DefaultConfigurationBuilder { +public class POP3TestConfiguration extends BaseHierarchicalConfiguration { public void init() { addProperty("[@enabled]", true); diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index 8fddc5c..406f888 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -39,7 +39,7 @@ import java.util.List; import javax.mail.internet.MimeMessage; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.commons.net.ProtocolCommandEvent; import org.apache.commons.net.ProtocolCommandListener; import org.apache.commons.net.smtp.SMTPClient; @@ -208,7 +208,7 @@ public class SMTPServerTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("memory")), MemoryMailRepository.class.getName(), - new HierarchicalConfiguration())); + new BaseHierarchicalConfiguration())); mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, Sets.newHashSet(new MemoryMailRepositoryProvider()), configuration); mailRepositoryStore.init(); diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java index fa2831d..1899ac8 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java @@ -19,14 +19,14 @@ package org.apache.james.smtpserver; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.smtpserver.fastfail.DNSRBLHandler; import org.apache.james.smtpserver.fastfail.MaxRcptHandler; import org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler; import org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler; import org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler; -public class SMTPTestConfiguration extends DefaultConfigurationBuilder { +public class SMTPTestConfiguration extends BaseHierarchicalConfiguration { private int maxMessageSizeKB = 0; private String authorizedAddresses = "127.0.0.0/8"; diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java index 0ee03d1..2ecac4c 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/AliasRoutesTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.spy; import java.util.List; import java.util.Map; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.core.Domain; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; @@ -117,7 +117,7 @@ class AliasRoutesTest { usersRepository = MemoryUsersRepository.withVirtualHosting(); usersRepository.setDomainList(domainList); - usersRepository.configure(new DefaultConfigurationBuilder()); + usersRepository.configure(new BaseHierarchicalConfiguration()); usersRepository.addUser(BOB, BOB_PASSWORD); usersRepository.addUser(BOB_WITH_SLASH, BOB_WITH_SLASH_PASSWORD); diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java index 9b49f06..e92c665 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.spy; import java.util.List; import java.util.Map; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.core.Domain; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; @@ -116,7 +116,7 @@ class ForwardRoutesTest { usersRepository = MemoryUsersRepository.withVirtualHosting(); usersRepository.setDomainList(domainList); - usersRepository.configure(new DefaultConfigurationBuilder()); + usersRepository.configure(new BaseHierarchicalConfiguration()); usersRepository.addUser(BOB, BOB_PASSWORD); usersRepository.addUser(ALICE, ALICE_PASSWORD); diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java index 5ec3b58..3f948f5 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java @@ -71,7 +71,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.blob.api.BlobId; import org.apache.james.blob.api.BucketName; import org.apache.james.blob.api.HashBlobId; @@ -211,7 +211,7 @@ class DeletedMessagesVaultRoutesTest { MemoryUsersRepository usersRepository = MemoryUsersRepository.withVirtualHosting(); usersRepository.setDomainList(domainList); - usersRepository.configure(new DefaultConfigurationBuilder()); + usersRepository.configure(new BaseHierarchicalConfiguration()); usersRepository.addUser(USER.asString(), "userPassword"); diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index 31c1ada..05c713c 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java @@ -45,7 +45,7 @@ import java.util.List; import javax.mail.internet.MimeMessage; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.core.MailAddress; import org.apache.james.core.builder.MimeMessageBuilder; import org.apache.james.core.builder.MimeMessageBuilder.BodyPartBuilder; @@ -1770,11 +1770,11 @@ public class MailRepositoriesRoutesTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("memory")), MemoryMailRepository.class.getName(), - new HierarchicalConfiguration()), + new BaseHierarchicalConfiguration()), new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("other")), MemoryMailRepository.class.getName(), - new HierarchicalConfiguration())); + new BaseHierarchicalConfiguration())); mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, Sets.newHashSet(new MemoryMailRepositoryProvider()), configuration); mailRepositoryStore.init(); diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java index 988a943..e78b819 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.configuration2.BaseHierarchicalConfiguration; import org.apache.james.mailrepository.api.MailKey; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryPath; @@ -185,7 +185,7 @@ public class ReprocessingServiceTest { new MailRepositoryStoreConfiguration.Item( ImmutableList.of(new Protocol("memory")), MemoryMailRepository.class.getName(), - new HierarchicalConfiguration())); + new BaseHierarchicalConfiguration())); MemoryMailRepositoryStore mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, Sets.newHashSet(new MemoryMailRepositoryProvider()), configuration); mailRepositoryStore.init(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
