This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 647969b02c7ba790ebf3e7fa120332ba0b5d7104 Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Wed Apr 29 10:35:37 2020 +0700 [Refactoring] Move Authenticator from mailbox-store to mailbox-api --- .../org/apache/james/mailbox}/Authenticator.java | 2 +- .../cassandra/CassandraMailboxManagerProvider.java | 2 +- .../cassandra/CassandraTestSystemFixture.java | 2 +- .../CassandraMailboxManagerAttachmentTest.java | 2 +- .../mailbox/jpa/JpaMailboxManagerProvider.java | 2 +- .../maildir/MaildirMailboxManagerProvider.java | 2 +- .../manager/InMemoryIntegrationResources.java | 2 +- .../mailbox/spring/AnonymousAuthenticator.java | 62 +++++++++++----------- .../james/mailbox/store/FakeAuthenticator.java | 1 + .../james/mailbox/store/SessionProviderImpl.java | 1 + .../apache/james/mpt/host/JamesImapHostSystem.java | 2 +- .../modules/mailbox/CassandraMailboxModule.java | 2 +- .../james/modules/mailbox/JPAMailboxModule.java | 2 +- .../james/modules/mailbox/MemoryMailboxModule.java | 2 +- .../mailbox/store/UserRepositoryAuthenticator.java | 2 +- src/site/xdoc/mailbox/mailbox-spring.xml | 2 +- 16 files changed, 46 insertions(+), 44 deletions(-) diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java b/mailbox/api/src/main/java/org/apache/james/mailbox/Authenticator.java similarity index 97% rename from mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java rename to mailbox/api/src/main/java/org/apache/james/mailbox/Authenticator.java index 1dd7857..e9173c3 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/Authenticator.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/Authenticator.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store; +package org.apache.james.mailbox; import org.apache.james.core.Username; import org.apache.james.mailbox.exception.MailboxException; diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java index f2bdb06..855fa37 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java @@ -21,6 +21,7 @@ package org.apache.james.mailbox.cassandra; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.AttachmentContentLoader; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; @@ -37,7 +38,6 @@ import org.apache.james.mailbox.events.MemoryEventDeadLetters; import org.apache.james.mailbox.events.delivery.InVmEventDelivery; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.quota.QuotaRootResolver; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.MailboxManagerConfiguration; import org.apache.james.mailbox.store.NoMailboxPathLocker; diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java index d87463f..1e92852 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock; import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.mailbox.AttachmentContentLoader; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; @@ -39,7 +40,6 @@ import org.apache.james.mailbox.events.delivery.InVmEventDelivery; import org.apache.james.mailbox.quota.CurrentQuotaManager; import org.apache.james.mailbox.quota.MaxQuotaManager; import org.apache.james.mailbox.quota.QuotaManager; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.MailboxManagerConfiguration; import org.apache.james.mailbox.store.NoMailboxPathLocker; diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java index 9ea857c..1e7207c 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import org.apache.james.backends.cassandra.CassandraClusterExtension; import org.apache.james.mailbox.AttachmentContentLoader; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; @@ -36,7 +37,6 @@ import org.apache.james.mailbox.events.InVMEventBus; import org.apache.james.mailbox.events.MemoryEventDeadLetters; import org.apache.james.mailbox.events.delivery.InVmEventDelivery; import org.apache.james.mailbox.store.AbstractMailboxManagerAttachmentTest; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.MailboxManagerConfiguration; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java index 8c23ea2..3bbb723 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java @@ -22,6 +22,7 @@ package org.apache.james.mailbox.jpa; import javax.persistence.EntityManagerFactory; import org.apache.james.backends.jpa.JpaTestCluster; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; @@ -33,7 +34,6 @@ import org.apache.james.mailbox.events.delivery.InVmEventDelivery; import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider; import org.apache.james.mailbox.jpa.mail.JPAUidProvider; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.SessionProviderImpl; import org.apache.james.mailbox.store.StoreMailboxAnnotationManager; diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java index 6c02820..1724101 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerProvider.java @@ -21,6 +21,7 @@ package org.apache.james.mailbox.maildir; import java.io.File; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; @@ -29,7 +30,6 @@ import org.apache.james.mailbox.events.EventBusTestFixture; import org.apache.james.mailbox.events.InVMEventBus; import org.apache.james.mailbox.events.MemoryEventDeadLetters; import org.apache.james.mailbox.events.delivery.InVmEventDelivery; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.MailboxManagerConfiguration; diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java index b2027a1..d1c32c4 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java @@ -24,6 +24,7 @@ import java.util.Optional; import java.util.function.Function; import org.apache.james.mailbox.AttachmentContentLoader; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.SessionProvider; import org.apache.james.mailbox.acl.GroupMembershipResolver; @@ -47,7 +48,6 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.quota.QuotaManager; import org.apache.james.mailbox.quota.QuotaRootResolver; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.FakeAuthenticator; import org.apache.james.mailbox.store.FakeAuthorizator; diff --git a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java index 4b99c0f..2daf54d 100644 --- a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java +++ b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/AnonymousAuthenticator.java @@ -1,31 +1,31 @@ -/**************************************************************** - * 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.mailbox.spring; - -import org.apache.james.core.Username; -import org.apache.james.mailbox.store.Authenticator; - -public class AnonymousAuthenticator implements Authenticator { - - @Override - public boolean isAuthentic(Username userid, CharSequence passwd) { - return true; - } - -} +/**************************************************************** + * 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.mailbox.spring; + +import org.apache.james.core.Username; +import org.apache.james.mailbox.Authenticator; + +public class AnonymousAuthenticator implements Authenticator { + + @Override + public boolean isAuthentic(Username userid, CharSequence passwd) { + return true; + } + +} diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java index a5eefda..a65a02f 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.james.core.Username; +import org.apache.james.mailbox.Authenticator; public class FakeAuthenticator implements Authenticator { diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java index 4ced852..b454b5b 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SessionProviderImpl.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import javax.inject.Inject; import org.apache.james.core.Username; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSessionIdGenerator; import org.apache.james.mailbox.SessionProvider; diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java index 2abd31d..4f10fc1 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java @@ -33,11 +33,11 @@ import org.apache.james.imap.decode.ImapDecoder; import org.apache.james.imap.decode.main.ImapRequestStreamHandler; import org.apache.james.imap.encode.FakeImapSession; import org.apache.james.imap.encode.ImapEncoder; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mpt.api.Continuation; import org.apache.james.mpt.api.ImapHostSystem; diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java index 03f864e..cd36137 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java @@ -27,6 +27,7 @@ import org.apache.james.adapter.mailbox.store.UserRepositoryAuthorizator; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.mailbox.AttachmentContentLoader; import org.apache.james.mailbox.AttachmentManager; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxPathLocker; @@ -74,7 +75,6 @@ import org.apache.james.mailbox.indexer.MessageIdReIndexer; import org.apache.james.mailbox.indexer.ReIndexer; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.NoMailboxPathLocker; diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java index 3a9dd02..c8e6520 100644 --- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java +++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java @@ -25,6 +25,7 @@ import javax.inject.Singleton; import org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator; import org.apache.james.adapter.mailbox.store.UserRepositoryAuthorizator; import org.apache.james.mailbox.AttachmentContentLoader; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxPathLocker; import org.apache.james.mailbox.SessionProvider; @@ -43,7 +44,6 @@ import org.apache.james.mailbox.jpa.mail.JPAUidProvider; import org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.MailboxManagerConfiguration; diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java index 5433f94..d76a379 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java @@ -27,6 +27,7 @@ import org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator; import org.apache.james.adapter.mailbox.store.UserRepositoryAuthorizator; import org.apache.james.mailbox.AttachmentContentLoader; import org.apache.james.mailbox.AttachmentManager; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxPathLocker; @@ -44,7 +45,6 @@ import org.apache.james.mailbox.inmemory.mail.InMemoryModSeqProvider; import org.apache.james.mailbox.inmemory.mail.InMemoryUidProvider; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.Authorizator; import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.MailboxManagerConfiguration; diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java index f8b35bd..ffd5704 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java @@ -22,8 +22,8 @@ package org.apache.james.adapter.mailbox.store; import javax.inject.Inject; import org.apache.james.core.Username; +import org.apache.james.mailbox.Authenticator; import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.store.Authenticator; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; diff --git a/src/site/xdoc/mailbox/mailbox-spring.xml b/src/site/xdoc/mailbox/mailbox-spring.xml index 3e37778..950df43 100644 --- a/src/site/xdoc/mailbox/mailbox-spring.xml +++ b/src/site/xdoc/mailbox/mailbox-spring.xml @@ -33,7 +33,7 @@ <p>The module is small. It contains just two classes:</p> <ul> <li>SpringMailbox - this loads the spring-mailbox.xml </li> - <li>AnonymousAuthenticator - provides a dummy org.apache.james.mailbox.store.Authenticator</li> + <li>AnonymousAuthenticator - provides a dummy org.apache.james.mailbox.Authenticator</li> </ul> <p>SpringMailbox class is used to load the spring application context from <em>spring-mailbox.xml</em> and provides a method to get beans declared in that context. --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org