http://git-wip-us.apache.org/repos/asf/james-project/blob/46e26b8d/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java index e162961..54bae07 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/JmapMDN.java @@ -142,7 +142,7 @@ public class JmapMDN { public Message generateMDNMessage(Message originalMessage, MailboxSession mailboxSession) throws ParseException, IOException, InvalidOriginMessageForMDNException { - User user = mailboxSession.getUser().getCoreUser(); + User user = mailboxSession.getUser(); return MDN.builder() .report(generateReport(originalMessage, mailboxSession)) @@ -183,9 +183,9 @@ public class JmapMDN { } return MDNReport.builder() .dispositionField(generateDisposition()) - .originalRecipientField(mailboxSession.getUser().getUserName()) + .originalRecipientField(mailboxSession.getUser().asString()) .originalMessageIdField(originalMessage.getMessageId()) - .finalRecipientField(mailboxSession.getUser().getUserName()) + .finalRecipientField(mailboxSession.getUser().asString()) .reportingUserAgentField(getReportingUA()) .build(); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/46e26b8d/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java index a423928..c0cc6b2 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java @@ -99,7 +99,7 @@ public class Rights { } public static Username fromSession(MailboxSession mailboxSession) { - return new Username(mailboxSession.getUser().getUserName()); + return new Username(mailboxSession.getUser().asString()); } private final String value; http://git-wip-us.apache.org/repos/asf/james-project/blob/46e26b8d/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java index 54b5bb7..4a1df42 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java @@ -137,12 +137,12 @@ public class PostDequeueDecorator extends MailQueueItemDecorator { } private MailboxId getSentMailboxId(MailboxSession session) throws MailboxRoleNotFoundException, MailboxException { - return systemMailboxesProvider.findMailbox(Role.SENT, session.getUser().getCoreUser()) + return systemMailboxesProvider.findMailbox(Role.SENT, session.getUser()) .getId(); } private MailboxId getOutboxMailboxId(MailboxSession session) throws MailboxRoleNotFoundException, MailboxException { - return systemMailboxesProvider.findMailbox(Role.OUTBOX, session.getUser().getCoreUser()) + return systemMailboxesProvider.findMailbox(Role.OUTBOX, session.getUser()) .getId(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/46e26b8d/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java index a8b845f..ac0e6df 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java @@ -35,6 +35,7 @@ import javax.mail.Flags; import javax.mail.Flags.Flag; import org.apache.commons.lang.NotImplementedException; +import org.apache.james.core.User; import org.apache.james.jmap.model.ClientId; import org.apache.james.jmap.model.GetMessagesRequest; import org.apache.james.jmap.model.GetMessagesResponse; @@ -82,36 +83,14 @@ import com.jayway.jsonpath.JsonPath; public class GetMessagesMethodTest { private static final String FORWARDED = "forwarded"; + private static final User ROBERT = User.fromUsername("robert"); + private MessageIdManager messageIdManager; private org.apache.james.mime4j.dom.Message messageContent1; private org.apache.james.mime4j.dom.Message messageContent2; private org.apache.james.mime4j.dom.Message messageContent3; - - private static class User implements org.apache.james.mailbox.MailboxSession.User { - final String username; - final String password; - - public User(String username, String password) { - this.username = username; - this.password = password; - } - - @Override - public String getUserName() { - return username; - } - - @Override - public boolean isSameUser(String username) { - return this.username.equalsIgnoreCase(username); - } - } - - private static final User ROBERT = new User("robert", "secret"); - private StoreMailboxManager mailboxManager; private GetMessagesMethod testee; - private MailboxSession session; private MailboxPath inboxPath; private MailboxPath customMailboxPath; @@ -130,7 +109,7 @@ public class GetMessagesMethodTest { GroupMembershipResolver groupMembershipResolver = inMemoryIntegrationResources.createGroupMembershipResolver(); mailboxManager = inMemoryIntegrationResources.createMailboxManager(groupMembershipResolver); - session = new MockMailboxSession(ROBERT.username); + session = new MockMailboxSession(ROBERT.asString()); inboxPath = MailboxPath.inbox(session); customMailboxPath = new MailboxPath(inboxPath, "custom"); mailboxManager.createMailbox(inboxPath, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/46e26b8d/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetVacationResponseMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetVacationResponseMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetVacationResponseMethodTest.java index a9082c7..e3b4752 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetVacationResponseMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetVacationResponseMethodTest.java @@ -28,6 +28,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; +import org.apache.james.core.User; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.api.vacation.VacationRepository; @@ -53,7 +54,7 @@ public class GetVacationResponseMethodTest { private GetVacationResponseMethod testee; private VacationRepository vacationRepository; private MailboxSession mailboxSession; - private MailboxSession.User user; + private User user; private ZonedDateTimeProvider zonedDateTimeProvider; @Before @@ -61,7 +62,7 @@ public class GetVacationResponseMethodTest { zonedDateTimeProvider = mock(ZonedDateTimeProvider.class); vacationRepository = mock(VacationRepository.class); mailboxSession = mock(MailboxSession.class); - user = mock(MailboxSession.User.class); + user = User.fromUsername(USERNAME); testee = new GetVacationResponseMethod(vacationRepository, zonedDateTimeProvider, new DefaultMetricFactory()); when(zonedDateTimeProvider.get()).thenReturn(DATE_2014); @@ -99,7 +100,6 @@ public class GetVacationResponseMethodTest { .build(); when(vacationRepository.retrieveVacation(AccountId.fromString(USERNAME))).thenReturn(CompletableFuture.completedFuture(vacation)); when(mailboxSession.getUser()).thenReturn(user); - when(user.getUserName()).thenReturn(USERNAME); when(zonedDateTimeProvider.get()).thenReturn(DATE_2015); GetVacationRequest getVacationRequest = GetVacationRequest.builder().build(); @@ -132,7 +132,6 @@ public class GetVacationResponseMethodTest { .build(); when(vacationRepository.retrieveVacation(AccountId.fromString(USERNAME))).thenReturn(CompletableFuture.completedFuture(vacation)); when(mailboxSession.getUser()).thenReturn(user); - when(user.getUserName()).thenReturn(USERNAME); when(zonedDateTimeProvider.get()).thenReturn(DATE_2014); GetVacationRequest getVacationRequest = GetVacationRequest.builder().build(); @@ -167,7 +166,6 @@ public class GetVacationResponseMethodTest { .build(); when(vacationRepository.retrieveVacation(AccountId.fromString(USERNAME))).thenReturn(CompletableFuture.completedFuture(vacation)); when(mailboxSession.getUser()).thenReturn(user); - when(user.getUserName()).thenReturn(USERNAME); when(zonedDateTimeProvider.get()).thenReturn(DATE_2016); GetVacationRequest getVacationRequest = GetVacationRequest.builder().build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/46e26b8d/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetVacationResponseMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetVacationResponseMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetVacationResponseMethodTest.java index 595567a..beb249f 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetVacationResponseMethodTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetVacationResponseMethodTest.java @@ -27,12 +27,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.List; -import java.util.Locale; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; +import org.apache.james.core.User; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.NotificationRegistry; import org.apache.james.jmap.api.vacation.Vacation; @@ -52,32 +51,11 @@ import org.junit.Test; import com.google.common.collect.ImmutableMap; public class SetVacationResponseMethodTest { - - public static final String WRONG_ID = "WrongId"; - public static final String TEXT_BODY = "Text body"; - public static final String USERNAME = "username"; - public static final MailboxSession.User USER = new MailboxSession.User() { - @Override - public String getUserName() { - return USERNAME; - } - - @Override - public String getPassword() { - return null; - } - - @Override - public List<Locale> getLocalePreferences() { - return null; - } - - @Override - public boolean isSameUser(String username) { - return USERNAME.equalsIgnoreCase(username); - } - }; - public static final String SUBJECT = "subject"; + private static final String WRONG_ID = "WrongId"; + private static final String TEXT_BODY = "Text body"; + private static final String USERNAME = "username"; + private static final User USER = User.fromUsername(USERNAME); + private static final String SUBJECT = "subject"; private SetVacationResponseMethod testee; private VacationRepository vacationRepository; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
