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 37011e6e3cfe9301cabb3841bc26de83608ed1de Author: Benoit Tellier <[email protected]> AuthorDate: Fri Mar 20 10:04:41 2020 +0700 JAMES-3113 UsersRepository::getUsername --- .../java/org/apache/james/transport/mailets/AbstractSign.java | 2 +- .../main/java/org/apache/james/user/api/UsersRepository.java | 2 +- .../james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java | 4 ++-- .../org/apache/james/user/lib/AbstractUsersRepositoryTest.java | 6 +++--- .../org/apache/james/mailetcontainer/impl/LocalResources.java | 2 +- .../java/org/apache/james/transport/mailets/SpamAssassin.java | 2 +- .../org/apache/james/transport/mailets/ToSenderFolder.java | 2 +- .../apache/james/transport/mailets/WithStorageDirective.java | 2 +- .../james/transport/mailets/delivery/SimpleMailStore.java | 2 +- .../apache/james/transport/mailets/jsieve/ResourceLocator.java | 2 +- .../james/transport/mailets/jsieve/delivery/SievePoster.java | 2 +- .../java/org/apache/james/transport/matchers/IsOverQuota.java | 2 +- .../apache/james/transport/mailets/ResourceLocatorTest.java | 4 ++-- .../james/transport/mailets/delivery/LocalDeliveryTest.java | 6 +++--- .../james/transport/mailets/delivery/SieveIntegrationTest.java | 10 +++++----- .../james/transport/mailets/delivery/SimpleMailStoreTest.java | 6 +++--- .../transport/mailets/delivery/ToRecipientFolderTest.java | 8 ++++---- .../org/apache/james/transport/matchers/IsOverQuotaTest.java | 8 ++++---- .../main/java/org/apache/james/fetchmail/MessageProcessor.java | 2 +- .../james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java | 2 +- .../org/apache/james/jmap/mailet/filter/JMAPFiltering.java | 2 +- .../lmtpserver/hook/MailboxDeliverToRecipientHandler.java | 2 +- .../smtpserver/SenderAuthIdentifyVerificationRcptHook.java | 2 +- .../org/apache/james/smtpserver/fastfail/ValidRcptHandler.java | 2 +- .../java/org/apache/james/webadmin/routes/AliasRoutes.java | 2 +- .../java/org/apache/james/webadmin/routes/ForwardRoutes.java | 2 +- .../java/org/apache/james/webadmin/routes/GroupsRoutes.java | 2 +- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java index 3a3b6f3..e19cc89 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java @@ -610,7 +610,7 @@ public abstract class AbstractSign extends GenericMailet { private Username getUsername(MailAddress mailAddress) { try { - return usersRepository.getUser(mailAddress); + return usersRepository.getUsername(mailAddress); } catch (UsersRepositoryException e) { throw new RuntimeException(e); } diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java index dae2654..0f8809e 100644 --- a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java +++ b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java @@ -134,7 +134,7 @@ public interface UsersRepository { * * @return Username used by James for this mailAddress */ - default Username getUser(MailAddress mailAddress) throws UsersRepositoryException { + default Username getUsername(MailAddress mailAddress) throws UsersRepositoryException { if (supportVirtualHosting()) { return Username.of(mailAddress.asString()); } else { diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java index 6b22f32..8d0fd20 100644 --- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java +++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java @@ -202,13 +202,13 @@ class ReadOnlyUsersLDAPRepositoryTest { @Test void containsWithGetUserShouldBeTrue() throws Exception { ReadOnlyUsersLDAPRepository ldapRepository = startUsersRepository(ldapRepositoryConfiguration(ldapContainer)); - assertThat(ldapRepository.contains(ldapRepository.getUser(JAMES_USER_MAIL.asMailAddress()))).isTrue(); + assertThat(ldapRepository.contains(ldapRepository.getUsername(JAMES_USER_MAIL.asMailAddress()))).isTrue(); } @Test void containsWithGetUserShouldBeTrueWithVirtualHosting() throws Exception { ReadOnlyUsersLDAPRepository ldapRepository = startUsersRepository(ldapRepositoryConfigurationWithVirtualHosting(ldapContainer)); - assertThat(ldapRepository.contains(ldapRepository.getUser(JAMES_USER_MAIL.asMailAddress()))).isTrue(); + assertThat(ldapRepository.contains(ldapRepository.getUsername(JAMES_USER_MAIL.asMailAddress()))).isTrue(); } private ReadOnlyUsersLDAPRepository startUsersRepository(HierarchicalConfiguration<ImmutableNode> ldapRepositoryConfiguration) throws Exception { diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java index 09ec685..a5f056c 100644 --- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java @@ -236,7 +236,7 @@ public abstract class AbstractUsersRepositoryTest { @Test void getUserShouldBeCaseInsentive() throws Exception { - assertThat(usersRepository.getUser(user1CaseVariation.asMailAddress())) + assertThat(usersRepository.getUsername(user1CaseVariation.asMailAddress())) .isEqualTo(user1); } @@ -457,7 +457,7 @@ public abstract class AbstractUsersRepositoryTest { // Some implementations do not support changing virtual hosting value Assumptions.assumeTrue(usersRepository.supportVirtualHosting()); - assertThat(usersRepository.getUser(new MailAddress("local@domain"))).isEqualTo(Username.of("local@domain")); + assertThat(usersRepository.getUsername(new MailAddress("local@domain"))).isEqualTo(Username.of("local@domain")); } @Test @@ -467,7 +467,7 @@ public abstract class AbstractUsersRepositoryTest { // Some implementations do not support changing virtual hosting value Assumptions.assumeFalse(usersRepository.supportVirtualHosting()); - assertThat(usersRepository.getUser(new MailAddress("local@domain"))).isEqualTo(Username.of("local")); + assertThat(usersRepository.getUsername(new MailAddress("local@domain"))).isEqualTo(Username.of("local")); } @Test diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java index 9332ee3..9e76c1b 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/LocalResources.java @@ -91,7 +91,7 @@ class LocalResources { } private boolean isLocaluser(MailAddress mailAddress) throws UsersRepositoryException { - return localUsers.contains(localUsers.getUser(mailAddress)); + return localUsers.contains(localUsers.getUsername(mailAddress)); } private boolean isLocalAlias(MailAddress mailAddress) throws UsersRepositoryException, RecipientRewriteTable.ErrorMappingException, RecipientRewriteTableException { diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java index e5959b4..4216832 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java @@ -107,7 +107,7 @@ public class SpamAssassin extends GenericMailet { } private void querySpamAssassin(Mail mail, MimeMessage message, SpamAssassinInvoker sa, MailAddress recipient) throws MessagingException, UsersRepositoryException { - SpamAssassinResult result = sa.scanMail(message, usersRepository.getUser(recipient)); + SpamAssassinResult result = sa.scanMail(message, usersRepository.getUsername(recipient)); // Add headers per recipient to mail object for (Attribute attribute : result.getHeadersAsAttributes()) { diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java index d682065..dab2eac 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java @@ -92,7 +92,7 @@ public class ToSenderFolder extends GenericMailet { private Username retrieveUser(MailAddress sender) throws MessagingException { try { - return usersRepository.getUser(sender); + return usersRepository.getUsername(sender); } catch (UsersRepositoryException e) { throw new MessagingException(e.getMessage()); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java index 0bfc866..178b51a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java @@ -81,7 +81,7 @@ public class WithStorageDirective extends GenericMailet { public ThrowingConsumer<MailAddress> addStorageDirective(Mail mail) { return recipient -> { - AttributeName attributeNameForUser = AttributeName.of(MailStore.DELIVERY_PATH_PREFIX + usersRepository.getUser(recipient).asString()); + AttributeName attributeNameForUser = AttributeName.of(MailStore.DELIVERY_PATH_PREFIX + usersRepository.getUsername(recipient).asString()); mail.setAttribute(new Attribute(attributeNameForUser, targetFolderName)); }; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java index ce6391e..f1f0ed5 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java @@ -110,7 +110,7 @@ public class SimpleMailStore implements MailStore { private Username computeUsername(MailAddress recipient) { try { - return usersRepository.getUser(recipient); + return usersRepository.getUsername(recipient); } catch (UsersRepositoryException e) { LOGGER.warn("Unable to retrieve username for {}", recipient.asPrettyString(), e); return Username.of(recipient.asString()); diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java index be292f8..fd2648c 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java @@ -68,7 +68,7 @@ public class ResourceLocator { private Username retrieveUsername(MailAddress mailAddress) { try { - return usersRepository.getUser(mailAddress); + return usersRepository.getUsername(mailAddress); } catch (UsersRepositoryException e) { return Username.fromMailAddress(mailAddress); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java index 23e7bd0..7e19c29 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java @@ -90,7 +90,7 @@ public class SievePoster implements Poster { String user = url.substring(startOfUser, endOfUser).toLowerCase(Locale.US); // Check if we should use the full email address as username try { - return usersRepository.getUser(new MailAddress(user, host)); + return usersRepository.getUsername(new MailAddress(user, host)); } catch (UsersRepositoryException e) { throw new MessagingException("Unable to accessUsersRepository", e); } diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java index 3ea1148..921e227 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java @@ -72,7 +72,7 @@ public class IsOverQuota extends GenericMatcher { try { List<MailAddress> result = new ArrayList<>(); for (MailAddress mailAddress : mail.getRecipients()) { - Username userName = usersRepository.getUser(mailAddress); + Username userName = usersRepository.getUsername(mailAddress); MailboxPath mailboxPath = MailboxPath.inbox(userName); QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(mailboxPath); diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java index 270f161..8aebfe4 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java @@ -55,7 +55,7 @@ public class ResourceLocatorTest { @Test(expected = ScriptNotFoundException.class) public void resourceLocatorImplShouldPropagateScriptNotFound() throws Exception { when(sieveRepository.getActive(USERNAME)).thenThrow(new ScriptNotFoundException()); - when(usersRepository.getUser(mailAddress)).thenReturn(Username.of(RECEIVER_LOCALHOST)); + when(usersRepository.getUsername(mailAddress)).thenReturn(Username.of(RECEIVER_LOCALHOST)); resourceLocator.get(mailAddress); } @@ -64,7 +64,7 @@ public class ResourceLocatorTest { public void resourceLocatorImplShouldWork() throws Exception { InputStream inputStream = new ByteArrayInputStream(new byte[0]); when(sieveRepository.getActive(USERNAME)).thenReturn(inputStream); - when(usersRepository.getUser(mailAddress)).thenReturn(Username.of(RECEIVER_LOCALHOST)); + when(usersRepository.getUsername(mailAddress)).thenReturn(Username.of(RECEIVER_LOCALHOST)); assertThat(resourceLocator.get(mailAddress).getScriptContent()).isEqualTo(inputStream); } diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java index ccbb2d2..9c546ed 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java @@ -85,7 +85,7 @@ public class LocalDeliveryTest { MessageManager messageManager = mock(MessageManager.class); when(usersRepository.supportVirtualHosting()).thenReturn(true); - when(usersRepository.getUser(new MailAddress(username.asString()))).thenReturn(username); + when(usersRepository.getUsername(new MailAddress(username.asString()))).thenReturn(username); when(mailboxManager.getMailbox(eq(inbox), any(MailboxSession.class))).thenReturn(messageManager); when(session.getUser()).thenReturn(username); @@ -105,8 +105,8 @@ public class LocalDeliveryTest { MailboxPath inbox = MailboxPath.inbox(username); MessageManager messageManager = mock(MessageManager.class); when(usersRepository.supportVirtualHosting()).thenReturn(false); - when(usersRepository.getUser(new MailAddress("receiver@localhost"))).thenReturn(username); - when(usersRepository.getUser(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(username); + when(usersRepository.getUsername(new MailAddress("receiver@localhost"))).thenReturn(username); + when(usersRepository.getUsername(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(username); when(mailboxManager.getMailbox(eq(inbox), any(MailboxSession.class))).thenReturn(messageManager); when(session.getUser()).thenReturn(username); diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java index a7a0aea..ee72e3a 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java @@ -92,7 +92,7 @@ public class SieveIntegrationTest { @Test public void serviceShouldNotModifyEmailWhenErrorRetrievingScript() throws Exception { when(usersRepository.supportVirtualHosting()).thenReturn(true); - when(usersRepository.getUser(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(Username.of(RECEIVER_DOMAIN_COM)); + when(usersRepository.getUsername(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(Username.of(RECEIVER_DOMAIN_COM)); when(resourceLocator.get(new MailAddress(RECEIVER_DOMAIN_COM))).thenThrow(new ScriptNotFoundException()); FakeMail mail = createMail(); @@ -106,7 +106,7 @@ public class SieveIntegrationTest { public void mailShouldBeWellDeliveredByDefaultToUserWhenVirtualHostingIsTurnedOn() throws Exception { prepareTestUsingScript("org/apache/james/transport/mailets/delivery/keep.script"); when(usersRepository.supportVirtualHosting()).thenReturn(true); - when(usersRepository.getUser(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(Username.of(RECEIVER_DOMAIN_COM)); + when(usersRepository.getUsername(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(Username.of(RECEIVER_DOMAIN_COM)); FakeMail mail = createMail(); testee.service(mail); @@ -118,7 +118,7 @@ public class SieveIntegrationTest { public void mailShouldBeWellDeliveredByDefaultToUserWhenvirtualHostingIsTurnedOff() throws Exception { prepareTestUsingScript("org/apache/james/transport/mailets/delivery/keep.script"); when(usersRepository.supportVirtualHosting()).thenReturn(false); - when(usersRepository.getUser(new MailAddress("receiver@localhost"))).thenReturn(Username.of("receiver")); + when(usersRepository.getUsername(new MailAddress("receiver@localhost"))).thenReturn(Username.of("receiver")); FakeMail mail = createMail(); testee.service(mail); @@ -959,8 +959,8 @@ public class SieveIntegrationTest { private void prepareTestUsingScriptAndDates(String script, ZonedDateTime scriptCreationDate, ZonedDateTime scriptExecutionDate) throws Exception { when(usersRepository.supportVirtualHosting()).thenReturn(false); - when(usersRepository.getUser(new MailAddress(LOCAL_PART + "@localhost"))).thenReturn(Username.of(LOCAL_PART)); - when(usersRepository.getUser(new MailAddress(LOCAL_PART + "@domain.com"))).thenReturn(Username.of(LOCAL_PART)); + when(usersRepository.getUsername(new MailAddress(LOCAL_PART + "@localhost"))).thenReturn(Username.of(LOCAL_PART)); + when(usersRepository.getUsername(new MailAddress(LOCAL_PART + "@domain.com"))).thenReturn(Username.of(LOCAL_PART)); when(resourceLocator.get(new MailAddress(RECEIVER_DOMAIN_COM))).thenReturn(new ResourceLocator.UserSieveInformation(scriptCreationDate, scriptExecutionDate, ClassLoader.getSystemResourceAsStream(script))); diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java index 00ca494..3155b6e 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java @@ -67,7 +67,7 @@ public class SimpleMailStoreTest { @Test public void storeMailShouldUseFullMailAddressWhenSupportsVirtualHosting() throws Exception { MailAddress recipient = MailAddressFixture.OTHER_AT_JAMES; - when(usersRepository.getUser(recipient)).thenReturn(Username.of(recipient.asString())); + when(usersRepository.getUsername(recipient)).thenReturn(Username.of(recipient.asString())); FakeMail mail = FakeMail.builder() .name("name") .mimeMessage(mimeMessage) @@ -80,7 +80,7 @@ public class SimpleMailStoreTest { @Test public void storeMailShouldUseLocalPartWhenSupportsVirtualHosting() throws Exception { MailAddress recipient = MailAddressFixture.OTHER_AT_JAMES; - when(usersRepository.getUser(recipient)).thenReturn(Username.of(recipient.getLocalPart())); + when(usersRepository.getUsername(recipient)).thenReturn(Username.of(recipient.getLocalPart())); FakeMail mail = FakeMail.builder() .name("name") .mimeMessage(mimeMessage) @@ -93,7 +93,7 @@ public class SimpleMailStoreTest { @Test public void storeMailShouldUseFullMailAddressWhenErrorReadingUsersRepository() throws Exception { MailAddress recipient = MailAddressFixture.OTHER_AT_JAMES; - when(usersRepository.getUser(recipient)).thenThrow(new UsersRepositoryException("Any message")); + when(usersRepository.getUsername(recipient)).thenThrow(new UsersRepositoryException("Any message")); FakeMail mail = FakeMail.builder() .name("name") .mimeMessage(mimeMessage) diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java index 6b3b249..00c6d9b 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java @@ -127,7 +127,7 @@ public class ToRecipientFolderTest { @Test public void folderParameterShouldIndicateDestinationFolder() throws Exception { when(usersRepository.supportVirtualHosting()).thenReturn(true); - when(usersRepository.getUser(new MailAddress(USER))).thenReturn(USERNAME); + when(usersRepository.getUsername(new MailAddress(USER))).thenReturn(USERNAME); when(mailboxManager.getMailbox(eq(JUNK_VIRTUAL_HOSTING), any(MailboxSession.class))).thenReturn(messageManager); testee.init(FakeMailetConfig.builder() @@ -143,7 +143,7 @@ public class ToRecipientFolderTest { @Test public void folderParameterShouldBeInboxByDefault() throws Exception { when(usersRepository.supportVirtualHosting()).thenReturn(true); - when(usersRepository.getUser(new MailAddress(USER))).thenReturn(USERNAME); + when(usersRepository.getUsername(new MailAddress(USER))).thenReturn(USERNAME); when(mailboxManager.getMailbox(eq(INBOX), any(MailboxSession.class))).thenReturn(messageManager); testee.init(FakeMailetConfig.builder() @@ -158,8 +158,8 @@ public class ToRecipientFolderTest { @Test public void folderParameterShouldWorkWhenVirtualHostingIsTurnedOff() throws Exception { when(usersRepository.supportVirtualHosting()).thenReturn(false); - when(usersRepository.getUser(new MailAddress(USER_LOCAL_PART + "@localhost"))).thenReturn(USERNAME_LOCAL_PART); - when(usersRepository.getUser(new MailAddress(USER))).thenReturn(USERNAME_LOCAL_PART); + when(usersRepository.getUsername(new MailAddress(USER_LOCAL_PART + "@localhost"))).thenReturn(USERNAME_LOCAL_PART); + when(usersRepository.getUsername(new MailAddress(USER))).thenReturn(USERNAME_LOCAL_PART); when(mailboxManager.getMailbox(eq(JUNK), any(MailboxSession.class))).thenReturn(messageManager); when(session.getUser()).thenReturn(Username.of(USER_LOCAL_PART)); diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java index b96a68c..34b39b0 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java @@ -59,8 +59,8 @@ public class IsOverQuotaTest { testee.init(FakeMatcherConfig.builder().matcherName("IsOverQuota").build()); - when(usersRepository.getUser(MailAddressFixture.ANY_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.ANY_AT_JAMES.getLocalPart())); - when(usersRepository.getUser(MailAddressFixture.OTHER_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.OTHER_AT_JAMES.getLocalPart())); + when(usersRepository.getUsername(MailAddressFixture.ANY_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.ANY_AT_JAMES.getLocalPart())); + when(usersRepository.getUsername(MailAddressFixture.OTHER_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.OTHER_AT_JAMES.getLocalPart())); } @Test @@ -148,8 +148,8 @@ public class IsOverQuotaTest { @Test public void matchShouldSupportVirtualHosting() throws Exception { - when(usersRepository.getUser(MailAddressFixture.ANY_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.ANY_AT_JAMES.asString())); - when(usersRepository.getUser(MailAddressFixture.OTHER_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.OTHER_AT_JAMES.asString())); + when(usersRepository.getUsername(MailAddressFixture.ANY_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.ANY_AT_JAMES.asString())); + when(usersRepository.getUsername(MailAddressFixture.OTHER_AT_JAMES)).thenReturn(Username.of(MailAddressFixture.OTHER_AT_JAMES.asString())); Username username = Username.of(MailAddressFixture.ANY_AT_JAMES.asString()); QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(username)); maxQuotaManager.setMaxStorage(quotaRoot, QuotaSizeLimit.size(100)); diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java index 49c374b..e16a8d8 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java @@ -842,7 +842,7 @@ public class MessageProcessor extends ProcessorAbstract { // the recipient in respect of this // See JAMES-1135 return isLocalServer(recipient) - && getLocalUsers().contains(getLocalUsers().getUser(recipient)); + && getLocalUsers().contains(getLocalUsers().getUsername(recipient)); } /** diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java index 30fc5ef..1679fd9 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/ExtractMDNOriginalJMAPMessageId.java @@ -102,7 +102,7 @@ public class ExtractMDNOriginalJMAPMessageId extends GenericMailet { private Optional<MessageId> findMessageIdForRFC822MessageId(String messageId, MailAddress recipient) { LOGGER.debug("Searching message {} for recipient {}", messageId, recipient.asPrettyString()); try { - MailboxSession session = mailboxManager.createSystemSession(usersRepository.getUser(recipient)); + MailboxSession session = mailboxManager.createSystemSession(usersRepository.getUsername(recipient)); int limit = 1; MultimailboxesSearchQuery searchByRFC822MessageId = MultimailboxesSearchQuery .from(new SearchQuery(SearchQuery.mimeMessageID(messageId))) diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java index 85a09bc..0a0d58f 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java @@ -88,7 +88,7 @@ public class JMAPFiltering extends GenericMailet { private Optional<Username> retrieveUser(MailAddress recipient) { try { - return Optional.ofNullable(usersRepository.getUser(recipient)); + return Optional.ofNullable(usersRepository.getUsername(recipient)); } catch (UsersRepositoryException e) { logger.error("cannot retrieve user " + recipient.asString(), e); return Optional.empty(); diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java index 15419ef..e1bc470 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java @@ -63,7 +63,7 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook @Override public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) { try { - Username username = users.getUser(recipient); + Username username = users.getUsername(recipient); MailboxSession mailboxSession = mailboxManager.createSystemSession(username); MailboxPath inbox = MailboxPath.inbox(mailboxSession); diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java index 63d98c7..cf6924c 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java @@ -70,7 +70,7 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId @Override protected Username getUser(MailAddress mailAddress) { try { - return users.getUser(mailAddress); + return users.getUsername(mailAddress); } catch (UsersRepositoryException e) { throw new RuntimeException(e); } diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java index dbc20e1..c6bcd73 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java @@ -65,7 +65,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc @Override protected boolean isValidRecipient(SMTPSession session, MailAddress recipient) { try { - Username username = users.getUser(recipient); + Username username = users.getUsername(recipient); if (users.contains(username)) { return true; diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java index 8905b3b..39d82b6 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java @@ -184,7 +184,7 @@ public class AliasRoutes implements Routes { } private void ensureUserDoesNotExist(MailAddress mailAddress) throws UsersRepositoryException { - Username username = usersRepository.getUser(mailAddress); + Username username = usersRepository.getUsername(mailAddress); if (usersRepository.contains(username)) { throw ErrorResponder.builder() diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java index 34908d7..c5cc581 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java @@ -173,7 +173,7 @@ public class ForwardRoutes implements Routes { } private void ensureUserExist(MailAddress mailAddress) throws UsersRepositoryException { - if (!usersRepository.contains(usersRepository.getUser(mailAddress))) { + if (!usersRepository.contains(usersRepository.getUsername(mailAddress))) { throw ErrorResponder.builder() .statusCode(HttpStatus.NOT_FOUND_404) .type(ErrorType.INVALID_ARGUMENT) diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java index d0fc4e9..87de8c9 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java @@ -168,7 +168,7 @@ public class GroupsRoutes implements Routes { } private void ensureNotShadowingAnotherAddress(MailAddress groupAddress) throws UsersRepositoryException { - if (usersRepository.contains(usersRepository.getUser(groupAddress))) { + if (usersRepository.contains(usersRepository.getUsername(groupAddress))) { throw ErrorResponder.builder() .statusCode(HttpStatus.CONFLICT_409) .type(ErrorType.INVALID_ARGUMENT) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
