You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/24 03:46:39 UTC
[14/38] james-project git commit: JAMES-2114 Remove LOGGER from
mailboxSession API
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
index 6b00796..d7991ed 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
@@ -119,7 +119,7 @@ abstract public class AbstractStorageQuota extends AbstractQuotaMatcher {
catch (UsersRepositoryException e) {
throw new MessagingException("Unable to access UsersRepository", e);
}
- session = manager.createSystemSession(username, getMailetContext().getLogger());
+ session = manager.createSystemSession(username);
manager.startProcessingRequest(session);
// get all mailboxes for the user to calculate the size
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java
----------------------------------------------------------------------
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 d63b015..b977e22 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
@@ -38,8 +38,6 @@ import org.apache.james.user.api.UsersRepositoryException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.GenericMatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* This matcher will check if the incoming email will make recipients exceed their quotas.
@@ -57,7 +55,6 @@ import org.slf4j.LoggerFactory;
*/
public class IsOverQuota extends GenericMatcher {
- private static final Logger LOGGER = LoggerFactory.getLogger(IsOverQuota.class);
private static final int SINGLE_EMAIL = 1;
private final QuotaRootResolver quotaRootResolver;
@@ -79,7 +76,7 @@ public class IsOverQuota extends GenericMatcher {
List<MailAddress> result = new ArrayList<>();
for (MailAddress mailAddress : mail.getRecipients()) {
String userName = usersRepository.getUser(mailAddress);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(userName, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(userName);
MailboxPath mailboxPath = MailboxPath.inbox(mailboxSession);
QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(mailboxPath);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
----------------------------------------------------------------------
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 808ac9c..644be9f 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
@@ -77,7 +77,7 @@ public class LocalDeliveryTest {
MailboxSession session = mock(MailboxSession.class);
when(session.getPathDelimiter()).thenReturn('.');
try {
- when(mailboxManager.createSystemSession(any(String.class), any(Logger.class))).thenReturn(session);
+ when(mailboxManager.createSystemSession(any(String.class))).thenReturn(session);
} catch (MailboxException e) {
throw Throwables.propagate(e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
index c83ddc5..d85e826 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
@@ -20,7 +20,6 @@
package org.apache.james.transport.mailets.delivery;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -40,11 +39,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MailboxAppenderTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(MailboxAppenderTest.class);
public static final String USER = "user";
public static final String FOLDER = "folder";
@@ -70,9 +66,9 @@ public class MailboxAppenderTest {
integrationResources = new InMemoryIntegrationResources();
integrationResources.init();
mailboxManager = new ManagerTestResources(integrationResources).getMailboxManager();
- testee = new MailboxAppender(mailboxManager, mock(Logger.class));
+ testee = new MailboxAppender(mailboxManager);
- session = mailboxManager.createSystemSession("TEST", LOGGER);
+ session = mailboxManager.createSystemSession("TEST");
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
----------------------------------------------------------------------
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 aed6d04..7b8f15e 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
@@ -89,7 +89,7 @@ public class ToRecipientFolderTest {
MailboxSession session = mock(MailboxSession.class);
when(session.getPathDelimiter()).thenReturn('.');
try {
- when(mailboxManager.createSystemSession(any(String.class), any(Logger.class))).thenReturn(session);
+ when(mailboxManager.createSystemSession(any(String.class))).thenReturn(session);
} catch (MailboxException e) {
throw Throwables.propagate(e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java
----------------------------------------------------------------------
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 eeb8ccd..5acf65f 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
@@ -48,12 +48,8 @@ import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class IsOverQuotaTest {
-
- public static final Logger LOGGER = LoggerFactory.getLogger(IsOverQuotaTest.class);
private IsOverQuota testee;
private InMemoryPerUserMaxQuotaManager maxQuotaManager;
private DefaultQuotaRootResolver quotaRootResolver;
@@ -148,7 +144,7 @@ public class IsOverQuotaTest {
@Test
public void matchShouldNotIncludeRecipientNotOverQuota() throws Exception {
String username = MailAddressFixture.ANY_AT_JAMES.getLocalPart();
- QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(mailboxManager.createSystemSession(username, LOGGER)));
+ QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(mailboxManager.createSystemSession(username)));
maxQuotaManager.setMaxStorage(quotaRoot, 100);
FakeMail fakeMail=FakeMail.builder()
@@ -166,7 +162,7 @@ public class IsOverQuotaTest {
when(usersRepository.getUser(MailAddressFixture.ANY_AT_JAMES)).thenReturn(MailAddressFixture.ANY_AT_JAMES.asString());
when(usersRepository.getUser(MailAddressFixture.OTHER_AT_JAMES)).thenReturn(MailAddressFixture.OTHER_AT_JAMES.asString());
String username = MailAddressFixture.ANY_AT_JAMES.asString();
- QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(mailboxManager.createSystemSession(username, LOGGER)));
+ QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(mailboxManager.createSystemSession(username)));
maxQuotaManager.setMaxStorage(quotaRoot, 100);
FakeMail fakeMail=FakeMail.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
index 57d903a..17598ca 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
@@ -63,7 +63,7 @@ public class AccessTokenAuthenticationStrategy implements AuthenticationStrategy
if (username.isPresent()) {
try {
- return mailboxManager.createSystemSession(username.get(), LOG);
+ return mailboxManager.createSystemSession(username.get());
} catch (MailboxException e) {
throw new MailboxSessionCreationException(e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java
index e405604..f9ef530 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java
@@ -81,7 +81,7 @@ public class DefaultMailboxesProvisioningFilter implements Filter {
}
private void createDefaultMailboxes(User user) throws MailboxException {
- MailboxSession session = mailboxManager.createSystemSession(user.getUserName(), LOGGER);
+ MailboxSession session = mailboxManager.createSystemSession(user.getUserName());
DefaultMailboxes.DEFAULT_MAILBOXES.stream()
.map(toMailboxPath(session))
.filter(mailboxPath -> mailboxDoesntExist(mailboxPath, session))
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/main/java/org/apache/james/jmap/JWTAuthenticationStrategy.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JWTAuthenticationStrategy.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JWTAuthenticationStrategy.java
index 2e155df..4611ca6 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JWTAuthenticationStrategy.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JWTAuthenticationStrategy.java
@@ -30,14 +30,11 @@ import org.apache.james.jwt.JwtTokenVerifier;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
public class JWTAuthenticationStrategy implements AuthenticationStrategy {
- private static final Logger LOG = LoggerFactory.getLogger(JWTAuthenticationStrategy.class);
@VisibleForTesting static final String AUTHORIZATION_HEADER_PREFIX = "Bearer ";
private final JwtTokenVerifier tokenManager;
private final MailboxManager mailboxManager;
@@ -61,7 +58,7 @@ public class JWTAuthenticationStrategy implements AuthenticationStrategy {
Stream<MailboxSession> mailboxSessionStream = userLoginStream
.map(l -> {
try {
- return mailboxManager.createSystemSession(l, LOG);
+ return mailboxManager.createSystemSession(l);
} catch (MailboxException e) {
throw new MailboxSessionCreationException(e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/main/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategy.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategy.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategy.java
index 6101834..ef2ddca 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategy.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategy.java
@@ -32,14 +32,10 @@ import org.apache.james.jmap.utils.DownloadPath;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
public class QueryParameterAccessTokenAuthenticationStrategy implements AuthenticationStrategy {
-
- private static final Logger LOG = LoggerFactory.getLogger(QueryParameterAccessTokenAuthenticationStrategy.class);
private static final String AUTHENTICATION_PARAMETER = "access_token";
private final SimpleTokenManager tokenManager;
@@ -64,7 +60,7 @@ public class QueryParameterAccessTokenAuthenticationStrategy implements Authenti
private MailboxSession createSystemSession(String username) {
try {
- return mailboxManager.createSystemSession(username, LOG);
+ return mailboxManager.createSystemSession(username);
} catch (MailboxException e) {
throw new MailboxSessionCreationException(e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/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 ab42ce3..b8e9853 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
@@ -77,7 +77,7 @@ public class PostDequeueDecorator extends MailQueueItemDecorator {
String username = (String) getMail().getAttribute(MailMetadata.MAIL_METADATA_USERNAME_ATTRIBUTE);
if (getMail().getAttribute(IS_DELIVERED) == null) {
try {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(username, LOG);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
moveFromOutboxToSent(messageId, mailboxSession);
getMail().setAttribute(IS_DELIVERED, IS_DELIVERED);
} catch (MailShouldBeInOutboxException e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/AccessTokenAuthenticationStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AccessTokenAuthenticationStrategyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/AccessTokenAuthenticationStrategyTest.java
index b1c71b6..4ddf582 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AccessTokenAuthenticationStrategyTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/AccessTokenAuthenticationStrategyTest.java
@@ -20,7 +20,6 @@ package org.apache.james.jmap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -41,7 +40,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
public class AccessTokenAuthenticationStrategyTest {
@@ -84,7 +82,7 @@ public class AccessTokenAuthenticationStrategyTest {
String username = "123456789";
MailboxSession fakeMailboxSession = mock(MailboxSession.class);
- when(mockedMailboxManager.createSystemSession(eq(username), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(eq(username)))
.thenReturn(fakeMailboxSession);
UUID authHeader = UUID.randomUUID();
@@ -101,7 +99,7 @@ public class AccessTokenAuthenticationStrategyTest {
@Test
public void createMailboxSessionShouldThrowWhenMailboxExceptionHasOccurred() throws Exception {
String username = "username";
- when(mockedMailboxManager.createSystemSession(eq(username), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(eq(username)))
.thenThrow(new MailboxException());
UUID authHeader = UUID.randomUUID();
@@ -122,7 +120,7 @@ public class AccessTokenAuthenticationStrategyTest {
String username = "123456789";
MailboxSession fakeMailboxSession = mock(MailboxSession.class);
- when(mockedMailboxManager.createSystemSession(eq(username), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(eq(username)))
.thenReturn(fakeMailboxSession);
UUID authHeader = UUID.randomUUID();
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
index fdcdf96..5a572de 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java
@@ -45,7 +45,6 @@ import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.Test;
-import org.slf4j.Logger;
import com.google.common.base.Optional;
import com.google.testing.threadtester.AnnotatedTestRunner;
@@ -179,12 +178,12 @@ public class DefaultMailboxesProvisioningFilterThreadTest {
}
@Override
- public MailboxSession createSystemSession(String userName, Logger log) throws BadCredentialsException, MailboxException {
+ public MailboxSession createSystemSession(String userName) throws BadCredentialsException, MailboxException {
return mailboxSession;
}
@Override
- public MailboxSession login(String userid, String passwd, Logger log) throws BadCredentialsException, MailboxException {
+ public MailboxSession login(String userid, String passwd) throws BadCredentialsException, MailboxException {
return null;
}
@@ -269,7 +268,7 @@ public class DefaultMailboxesProvisioningFilterThreadTest {
}
@Override
- public MailboxSession loginAsOtherUser(String adminUserId, String passwd, String realUserId, Logger log) throws BadCredentialsException, MailboxException {
+ public MailboxSession loginAsOtherUser(String adminUserId, String passwd, String realUserId) throws BadCredentialsException, MailboxException {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/JWTAuthenticationStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JWTAuthenticationStrategyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JWTAuthenticationStrategyTest.java
index 530fac4..88b4239 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JWTAuthenticationStrategyTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JWTAuthenticationStrategyTest.java
@@ -20,7 +20,6 @@ package org.apache.james.jmap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -38,7 +37,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
public class JWTAuthenticationStrategyTest {
@@ -78,7 +76,7 @@ public class JWTAuthenticationStrategyTest {
when(stubTokenVerifier.verify(validAuthHeader)).thenReturn(false);
when(stubTokenVerifier.extractLogin(validAuthHeader)).thenReturn(username);
- when(mockedMailboxManager.createSystemSession(eq(username), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(eq(username)))
.thenReturn(fakeMailboxSession);
when(mockAuthenticationExtractor.authHeaders(request))
.thenReturn(Stream.of(fakeAuthHeaderWithPrefix));
@@ -105,7 +103,7 @@ public class JWTAuthenticationStrategyTest {
when(stubTokenVerifier.verify(validAuthHeader)).thenReturn(true);
when(stubTokenVerifier.extractLogin(validAuthHeader)).thenReturn(username);
- when(mockedMailboxManager.createSystemSession(eq(username), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(eq(username)))
.thenThrow(new MailboxException());
when(mockAuthenticationExtractor.authHeaders(request))
.thenReturn(Stream.of(fakeAuthHeaderWithPrefix));
@@ -123,7 +121,7 @@ public class JWTAuthenticationStrategyTest {
when(stubTokenVerifier.verify(validAuthHeader)).thenReturn(true);
when(stubTokenVerifier.extractLogin(validAuthHeader)).thenReturn(username);
- when(mockedMailboxManager.createSystemSession(eq(username), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(eq(username)))
.thenReturn(fakeMailboxSession);
when(mockAuthenticationExtractor.authHeaders(request))
.thenReturn(Stream.of(fakeAuthHeaderWithPrefix));
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategyTest.java
index a04d75d..58ada90 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategyTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/QueryParameterAccessTokenAuthenticationStrategyTest.java
@@ -19,8 +19,6 @@
package org.apache.james.jmap;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,7 +32,6 @@ import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
public class QueryParameterAccessTokenAuthenticationStrategyTest {
@@ -77,7 +74,7 @@ public class QueryParameterAccessTokenAuthenticationStrategyTest {
@Test
public void createMailboxSessionShouldThrowWhenMailboxExceptionHasOccurred() throws Exception {
- when(mockedMailboxManager.createSystemSession(eq(USERNAME), any(Logger.class)))
+ when(mockedMailboxManager.createSystemSession(USERNAME))
.thenThrow(new MailboxException());
when(request.getParameter("access_token"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
index d69825a..7c5d380 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
@@ -51,14 +51,11 @@ import org.apache.james.metrics.logger.DefaultMetricFactory;
import org.assertj.core.groups.Tuple;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
public class GetMailboxesMethodTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(GetMailboxesMethodTest.class);
private static final String USERNAME = "username@domain.tld";
private static final String USERNAME2 = "username2@domain.tld";
@@ -83,7 +80,7 @@ public class GetMailboxesMethodTest {
GetMailboxesRequest getMailboxesRequest = GetMailboxesRequest.builder()
.build();
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
List<JmapResponse> getMailboxesResponse = getMailboxesMethod.process(getMailboxesRequest, clientId, mailboxSession).collect(Collectors.toList());
@@ -123,7 +120,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWhenAvailable() throws Exception {
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "name");
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(mailboxPath, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
messageManager.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), mailboxSession, false, new Flags());
@@ -148,8 +145,8 @@ public class GetMailboxesMethodTest {
public void getMailboxesShouldReturnOnlyMailboxesOfCurrentUserWhenAvailable() throws Exception {
MailboxPath mailboxPathToReturn = new MailboxPath("#private", USERNAME, "mailboxToReturn");
MailboxPath mailboxPathtoSkip = new MailboxPath("#private", USERNAME2, "mailboxToSkip");
- MailboxSession userSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
- MailboxSession user2Session = mailboxManager.createSystemSession(USERNAME2, LOGGER);
+ MailboxSession userSession = mailboxManager.createSystemSession(USERNAME);
+ MailboxSession user2Session = mailboxManager.createSystemSession(USERNAME2);
mailboxManager.createMailbox(mailboxPathToReturn, userSession);
mailboxManager.createMailbox(mailboxPathtoSkip, user2Session);
@@ -170,7 +167,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnInboxWithSortOrder10() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "INBOX");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
@@ -191,7 +188,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnSortOrder1000OnUnknownFolder() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "unknown");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
@@ -212,7 +209,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnInboxWithSortOrder10OnDifferenceCase() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "InBoX");
mailboxManager.createMailbox(mailboxPath, mailboxSession);
@@ -233,7 +230,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWithSortOrder() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(new MailboxPath("#private", USERNAME, "INBOX"), mailboxSession);
mailboxManager.createMailbox(new MailboxPath("#private", USERNAME, "ARCHIVE"), mailboxSession);
mailboxManager.createMailbox(new MailboxPath("#private", USERNAME, "DRAFTS"), mailboxSession);
@@ -269,7 +266,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnEmptyMailboxByDefault() throws MailboxException {
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "name");
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(mailboxPath, mailboxSession);
GetMailboxesRequest getMailboxesRequest = GetMailboxesRequest.builder()
@@ -290,7 +287,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnCorrectTotalMessagesCount() throws MailboxException {
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "name");
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(mailboxPath, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
messageManager.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), mailboxSession, false, new Flags());
@@ -314,7 +311,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnCorrectUnreadMessagesCount() throws MailboxException {
MailboxPath mailboxPath = new MailboxPath("#private", USERNAME, "name");
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(mailboxPath, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
Flags defaultUnseenFlag = new Flags();
@@ -340,7 +337,7 @@ public class GetMailboxesMethodTest {
@Test
public void getMailboxesShouldReturnMailboxesWithRoles() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(new MailboxPath("#private", USERNAME, "INBOX"), mailboxSession);
mailboxManager.createMailbox(new MailboxPath("#private", USERNAME, "ARCHIVE"), mailboxSession);
mailboxManager.createMailbox(new MailboxPath("#private", USERNAME, "DRAFTS"), mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
index 131c947..e363522 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Optional;
import org.apache.james.jmap.model.mailbox.Mailbox;
-import org.apache.james.jmap.utils.MailboxUtilsTest;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.inmemory.InMemoryId;
@@ -33,13 +32,10 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.SimpleMailboxMetaData;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
public class MailboxFactoryTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(MailboxUtilsTest.class);
public static final char DELIMITER = '.';
private MailboxManager mailboxManager;
@@ -52,7 +48,7 @@ public class MailboxFactoryTest {
InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(inMemoryIntegrationResources.createGroupMembershipResolver());
user = "user@domain.org";
- mailboxSession = mailboxManager.login(user, "pass", LOGGER);
+ mailboxSession = mailboxManager.login(user, "pass");
sut = new MailboxFactory(mailboxManager);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
index eb3c234..53f14d7 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
@@ -58,13 +58,10 @@ import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
public class PostDequeueDecoratorTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(PostDequeueDecoratorTest.class);
private static final String OUTBOX = DefaultMailboxes.OUTBOX;
private static final String SENT = DefaultMailboxes.SENT;
private static final String USERNAME = "username@domain.tld";
@@ -103,7 +100,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldNotThrowWhenMessageIsNotInOutbox() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(SENT_MAILBOX_PATH, mailboxSession);
@@ -116,7 +113,7 @@ public class PostDequeueDecoratorTest {
@Test(expected=MailboxRoleNotFoundException.class)
public void doneShouldThrowWhenSentDoesNotExist() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
ComposedMessageId messageId = messageManager.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), mailboxSession, false, new Flags());
@@ -128,7 +125,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldCopyMailFromOutboxToSentWhenSuccess() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -145,7 +142,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldDeleteMailFromOutboxWhenSuccess() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -162,7 +159,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldNotMoveMailFromOutboxToSentWhenSuccessIsFalse() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -179,7 +176,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldNotMoveMailFromOutboxToSentWhenNoMetadataProvided() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -194,7 +191,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldNotMoveMailFromOutboxToSentWhenUsernameNotProvided() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -210,7 +207,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldNotMoveMailFromOutboxToSentWhenMessageIdNotProvided() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -226,7 +223,7 @@ public class PostDequeueDecoratorTest {
@Test
public void doneShouldNotMoveMailFromOutboxToSentWhenInvalidMessageIdProvided() throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -247,7 +244,7 @@ public class PostDequeueDecoratorTest {
testee = new PostDequeueDecorator(mockedMailQueueItem, mailboxManager, new InMemoryMessageId.Factory(),
messageIdManager, new SystemMailboxesProviderImpl(mailboxManager));
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
MailboxId sentMailboxId = mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession).get();
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
@@ -275,7 +272,7 @@ public class PostDequeueDecoratorTest {
testee = new PostDequeueDecorator(mockedMailQueueItem, mailboxManager, new InMemoryMessageId.Factory(),
messageIdManager, new SystemMailboxesProviderImpl(mailboxManager));
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USERNAME);
mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
mailboxManager.createMailbox(SENT_MAILBOX_PATH, mailboxSession).get();
MessageManager messageManager = mailboxManager.getMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
index 5ea1428..8de3308 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
@@ -28,13 +28,9 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MailboxUtilsTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(MailboxUtilsTest.class);
-
private MailboxManager mailboxManager;
private MailboxSession mailboxSession;
private String user;
@@ -45,7 +41,7 @@ public class MailboxUtilsTest {
InMemoryIntegrationResources inMemoryIntegrationResources = new InMemoryIntegrationResources();
mailboxManager = inMemoryIntegrationResources.createMailboxManager(inMemoryIntegrationResources.createGroupMembershipResolver());
user = "user@domain.org";
- mailboxSession = mailboxManager.login(user, "pass", LOGGER);
+ mailboxSession = mailboxManager.login(user, "pass");
sut = new MailboxUtils(mailboxManager);
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
----------------------------------------------------------------------
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 68d29bc..dfa9a8a 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
@@ -75,7 +75,7 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook
username = recipient.getLocalPart();
}
- MailboxSession mailboxSession = mailboxManager.createSystemSession(username, session.getLogger());
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
MailboxPath inbox = MailboxPath.inbox(mailboxSession);
mailboxManager.startProcessingRequest(mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
index 03eed97..139d6f3 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
@@ -65,7 +65,7 @@ public class PassCmdHandler extends AbstractPassCmdHandler {
protected Mailbox auth(POP3Session session, String username, String password) throws Exception {
MailboxSession mSession = null;
try {
- mSession = manager.login(session.getUser(), password, session.getLogger());
+ mSession = manager.login(session.getUser(), password);
manager.startProcessingRequest(mSession);
MailboxPath inbox = MailboxPath.inbox(mSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
index a91e1ab..118e86b 100644
--- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
+++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
@@ -216,7 +216,7 @@ public class POP3ServerTest {
pop3Client.disconnect();
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo", "INBOX");
- MailboxSession session = mailboxManager.login("foo", "bar", LoggerFactory.getLogger("Test"));
+ MailboxSession session = mailboxManager.login("foo", "bar");
if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
}
@@ -301,7 +301,7 @@ public class POP3ServerTest {
usersRepository.addUser("foo2", "bar2");
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
- MailboxSession session = mailboxManager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
+ MailboxSession session = mailboxManager.login("foo2", "bar2");
if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
@@ -390,7 +390,7 @@ public class POP3ServerTest {
usersRepository.addUser("foo2", "bar2");
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
- MailboxSession session = mailboxManager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
+ MailboxSession session = mailboxManager.login("foo2", "bar2");
if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
@@ -440,7 +440,7 @@ public class POP3ServerTest {
usersRepository.addUser("foo2", "bar2");
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
- MailboxSession session = mailboxManager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
+ MailboxSession session = mailboxManager.login("foo2", "bar2");
if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
@@ -646,7 +646,7 @@ public class POP3ServerTest {
pop3Client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
usersRepository.addUser("foo6", "bar6");
- MailboxSession session = mailboxManager.login("foo6", "bar6", LoggerFactory.getLogger("Test"));
+ MailboxSession session = mailboxManager.login("foo6", "bar6");
MailboxPath mailboxPath = MailboxPath.inbox(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
index 469bdfb..9e8f6fa 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java
@@ -62,7 +62,7 @@ public class UserMailboxesService {
public void createMailbox(String username, MailboxName mailboxName) throws MailboxException, UsersRepositoryException {
usernamePreconditions(username);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME);
try {
mailboxManager.createMailbox(
convertToMailboxPath(username, mailboxName.asString(), mailboxSession),
@@ -74,7 +74,7 @@ public class UserMailboxesService {
public void deleteMailboxes(String username) throws MailboxException, UsersRepositoryException {
usernamePreconditions(username);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME);
listUserMailboxes(username, mailboxSession)
.map(MailboxMetaData::getPath)
.forEach(Throwing.consumer(mailboxPath -> deleteMailbox(mailboxSession, mailboxPath)));
@@ -82,7 +82,7 @@ public class UserMailboxesService {
public List<MailboxResponse> listMailboxes(String username) throws MailboxException, UsersRepositoryException {
usernamePreconditions(username);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME);
return listUserMailboxes(username, mailboxSession)
.map(mailboxMetaData -> new MailboxResponse(mailboxMetaData.getPath().getName()))
.collect(Guavate.toImmutableList());
@@ -90,7 +90,7 @@ public class UserMailboxesService {
public boolean testMailboxExists(String username, MailboxName mailboxName) throws MailboxException, UsersRepositoryException {
usernamePreconditions(username);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME);
return mailboxManager.mailboxExists(
convertToMailboxPath(username, mailboxName.asString(), mailboxSession),
mailboxSession);
@@ -98,7 +98,7 @@ public class UserMailboxesService {
public void deleteMailbox(String username, MailboxName mailboxName) throws MailboxException, UsersRepositoryException, MailboxHaveChildrenException {
usernamePreconditions(username);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(USER_NAME);
MailboxPath mailboxPath = convertToMailboxPath(username, mailboxName.asString(), mailboxSession);
listChildren(mailboxPath, mailboxSession)
.forEach(Throwing.consumer(path -> deleteMailbox(mailboxSession, path)));
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index d19542f..503abfe 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -525,7 +525,7 @@ public class UserMailboxesRoutesTest {
@Before
public void setUp() throws Exception {
mailboxManager = mock(MailboxManager.class);
- when(mailboxManager.createSystemSession(any(), any())).thenReturn(mock(MailboxSession.class));
+ when(mailboxManager.createSystemSession(any())).thenReturn(mock(MailboxSession.class));
createServer(mailboxManager);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org