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:40 UTC
[15/38] james-project git commit: JAMES-2114 Remove LOGGER from
mailboxSession API
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
index 11d13f8..4db10ce 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
@@ -28,7 +28,6 @@ import java.util.Map;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.model.MailboxConstants;
-import org.slf4j.Logger;
/**
* Describes a mailbox session.
@@ -42,8 +41,6 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
private final String personalSpace;
private final long sessionId;
-
- private final Logger log;
private final String userName;
@@ -61,14 +58,13 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
public SimpleMailboxSession(long sessionId, String userName, String password,
- final Logger log, List<Locale> localePreferences, char pathSeparator, SessionType type) {
- this(sessionId, userName, password, log, localePreferences, new ArrayList<>(), null, pathSeparator, type);
+ List<Locale> localePreferences, char pathSeparator, SessionType type) {
+ this(sessionId, userName, password, localePreferences, new ArrayList<>(), null, pathSeparator, type);
}
public SimpleMailboxSession(long sessionId, String userName, String password,
- final Logger log, List<Locale> localePreferences, List<String> sharedSpaces, String otherUsersSpace, char pathSeparator, SessionType type) {
+ List<Locale> localePreferences, List<String> sharedSpaces, String otherUsersSpace, char pathSeparator, SessionType type) {
this.sessionId = sessionId;
- this.log = log;
this.userName = userName;
this.password = password;
this.otherUsersSpace = otherUsersSpace;
@@ -84,13 +80,7 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
this.attributes = new HashMap<>();
this.pathSeparator = pathSeparator;
}
-
- /**
- * @see org.apache.james.mailbox.MailboxSession#getLog()
- */
- public Logger getLog() {
- return log;
- }
+
/**
* @see org.apache.james.mailbox.MailboxSession#close()
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 4220bcb..c51bd2b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -82,6 +82,7 @@ import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
import org.apache.james.mailbox.store.transaction.Mapper;
import org.apache.james.mailbox.store.transaction.TransactionalMapper;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.Optional;
@@ -97,6 +98,7 @@ import com.google.common.collect.Iterables;
*
*/
public class StoreMailboxManager implements MailboxManager {
+ private static final Logger LOGGER = LoggerFactory.getLogger(StoreMailboxManager.class);
public static final char SQL_WILDCARD_CHAR = '%';
@@ -383,19 +385,19 @@ public class StoreMailboxManager implements MailboxManager {
}
@Override
- public MailboxSession createSystemSession(String userName, Logger log) {
- return createSession(userName, null, log, SessionType.System);
+ public MailboxSession createSystemSession(String userName) {
+ return createSession(userName, null, SessionType.System);
}
/**
* Create Session
*
* @param userName
- * @param log
* @return session
*/
- protected MailboxSession createSession(String userName, String password, Logger log, SessionType type) {
- return new SimpleMailboxSession(randomId(), userName, password, log, new ArrayList<>(), getDelimiter(), type);
+
+ protected MailboxSession createSession(String userName, String password, SessionType type) {
+ return new SimpleMailboxSession(randomId(), userName, password, new ArrayList<>(), getDelimiter(), type);
}
/**
@@ -419,28 +421,28 @@ public class StoreMailboxManager implements MailboxManager {
* @param passwd the password
* @return success true if login success false otherwise
*/
- private boolean login(String userid, String passwd) throws MailboxException {
+ private boolean isValidLogin(String userid, String passwd) throws MailboxException {
return authenticator.isAuthentic(userid, passwd);
}
@Override
- public MailboxSession login(String userid, String passwd, Logger log) throws BadCredentialsException, MailboxException {
- if (login(userid, passwd)) {
- return createSession(userid, passwd, log, SessionType.User);
+ public MailboxSession login(String userid, String passwd) throws BadCredentialsException, MailboxException {
+ if (isValidLogin(userid, passwd)) {
+ return createSession(userid, passwd, SessionType.User);
} else {
throw new BadCredentialsException();
}
}
@Override
- public MailboxSession loginAsOtherUser(String adminUserid, String passwd, String otherUserId, Logger log) throws MailboxException {
- if (! login(adminUserid, passwd)) {
+ public MailboxSession loginAsOtherUser(String adminUserid, String passwd, String otherUserId) throws MailboxException {
+ if (! isValidLogin(adminUserid, passwd)) {
throw new BadCredentialsException();
}
Authorizator.AuthorizationState authorizationState = authorizator.canLoginAsOtherUser(adminUserid, otherUserId);
switch (authorizationState) {
case ALLOWED:
- return createSystemSession(otherUserId, log);
+ return createSystemSession(otherUserId);
case NOT_ADMIN:
throw new NotAdminException();
case UNKNOWN_USER:
@@ -493,11 +495,11 @@ public class StoreMailboxManager implements MailboxManager {
Mailbox mailboxRow = mapper.findMailboxByPath(mailboxPath);
if (mailboxRow == null) {
- session.getLog().info("Mailbox '" + mailboxPath + "' not found.");
+ LOGGER.info("Mailbox '" + mailboxPath + "' not found.");
throw new MailboxNotFoundException(mailboxPath);
} else {
- session.getLog().debug("Loaded mailbox " + mailboxPath);
+ LOGGER.debug("Loaded mailbox " + mailboxPath);
return createMessageManager(mailboxRow, session);
}
@@ -510,16 +512,16 @@ public class StoreMailboxManager implements MailboxManager {
Mailbox mailboxRow = mapper.findMailboxById(mailboxId);
if (mailboxRow == null) {
- session.getLog().info("Mailbox '" + mailboxId.serialize() + "' not found.");
+ LOGGER.info("Mailbox '" + mailboxId.serialize() + "' not found.");
throw new MailboxNotFoundException(mailboxId.serialize());
}
if (! belongsToCurrentUser(mailboxRow, session)) {
- session.getLog().info("Mailbox '" + mailboxId.serialize() + "' does not belong to user '" + session.getUser() + "' but to '" + mailboxRow.getUser());
+ LOGGER.info("Mailbox '" + mailboxId.serialize() + "' does not belong to user '" + session.getUser() + "' but to '" + mailboxRow.getUser());
throw new MailboxNotFoundException(mailboxId.serialize());
}
- session.getLog().debug("Loaded mailbox " + mailboxId.serialize());
+ LOGGER.debug("Loaded mailbox " + mailboxId.serialize());
return createMessageManager(mailboxRow, session);
}
@@ -531,10 +533,10 @@ public class StoreMailboxManager implements MailboxManager {
@Override
public Optional<MailboxId> createMailbox(MailboxPath mailboxPath, final MailboxSession mailboxSession)
throws MailboxException {
- mailboxSession.getLog().debug("createMailbox " + mailboxPath);
+ LOGGER.debug("createMailbox " + mailboxPath);
final int length = mailboxPath.getName().length();
if (length == 0) {
- mailboxSession.getLog().warn("Ignoring mailbox with empty name");
+ LOGGER.warn("Ignoring mailbox with empty name");
} else {
if (mailboxPath.getName().charAt(length - 1) == getDelimiter())
mailboxPath.setName(mailboxPath.getName().substring(0, length - 1));
@@ -574,7 +576,7 @@ public class StoreMailboxManager implements MailboxManager {
@Override
public void deleteMailbox(final MailboxPath mailboxPath, final MailboxSession session) throws MailboxException {
- session.getLog().info("deleteMailbox " + mailboxPath);
+ LOGGER.info("deleteMailbox " + mailboxPath);
final MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(session);
Mailbox mailbox = mapper.execute((Mapper.Transaction<Mailbox>) () -> {
@@ -596,7 +598,7 @@ public class StoreMailboxManager implements MailboxManager {
@Override
public void renameMailbox(final MailboxPath from, final MailboxPath to, final MailboxSession session) throws MailboxException {
- final Logger log = session.getLog();
+ final Logger log = LOGGER;
if (log.isDebugEnabled())
log.debug("renameMailbox " + from + " to " + to);
if (mailboxExists(to, session)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
index 94b8449..4643fc1 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
@@ -54,6 +54,8 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage;
import org.apache.james.mailbox.store.quota.QuotaChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.base.Optional;
@@ -66,6 +68,7 @@ import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
public class StoreMessageIdManager implements MessageIdManager {
+ private static final Logger LOGGER = LoggerFactory.getLogger(StoreMessageIdManager.class);
private final MailboxSessionMapperFactory mailboxSessionMapperFactory;
private final MailboxEventDispatcher dispatcher;
private final MessageId.Factory messageIdFactory;
@@ -259,7 +262,7 @@ public class StoreMessageIdManager implements MessageIdManager {
Mailbox currentMailbox = mailboxMapper.findMailboxById(mailboxId);
return belongsToCurrentUser(currentMailbox, mailboxSession);
} catch (MailboxException e) {
- mailboxSession.getLog().error(String.format("Can not retrieve mailboxPath associated with %s", mailboxId.serialize()), e);
+ LOGGER.error(String.format("Can not retrieve mailboxPath associated with %s", mailboxId.serialize()), e);
return false;
}
};
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java
index 45b9a65..aca62f9 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java
@@ -20,17 +20,19 @@
package org.apache.james.mailbox.store.event;
import org.apache.james.mailbox.MailboxListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SynchronousEventDelivery implements EventDelivery {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SynchronousEventDelivery.class);
+
@Override
public void deliver(MailboxListener mailboxListener, MailboxListener.Event event) {
try {
mailboxListener.event(event);
} catch(Throwable throwable) {
- event.getSession()
- .getLog()
- .error("Error while processing listener "
+ LOGGER.error("Error while processing listener "
+ mailboxListener.getClass().getCanonicalName()
+ " for "
+ event.getClass().getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
index 57c3a9c..c7c2dcb 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListener.java
@@ -19,6 +19,8 @@
package org.apache.james.mailbox.store.event.distributed;
+import java.util.Collection;
+
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
@@ -33,8 +35,6 @@ import org.apache.james.mailbox.store.publisher.Topic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
-
public class BroadcastDelegatingMailboxListener implements DistributedDelegatingMailboxListener {
private final static Logger LOGGER = LoggerFactory.getLogger(BroadcastDelegatingMailboxListener.class);
@@ -102,7 +102,7 @@ public class BroadcastDelegatingMailboxListener implements DistributedDelegating
try {
publisher.publish(globalTopic, eventSerializer.serializeEvent(event));
} catch (Throwable t) {
- event.getSession().getLog().error("Error while sending event to publisher", t);
+ LOGGER.error("Error while sending event to publisher", t);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
index b657bb6..a16434f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java
@@ -19,6 +19,9 @@
package org.apache.james.mailbox.store.event.distributed;
+import java.util.Collection;
+import java.util.Set;
+
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
@@ -33,9 +36,6 @@ import org.apache.james.mailbox.store.publisher.Topic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
-import java.util.Set;
-
public class RegisteredDelegatingMailboxListener implements DistributedDelegatingMailboxListener {
private static final Logger LOGGER = LoggerFactory.getLogger(RegisteredDelegatingMailboxListener.class);
@@ -109,9 +109,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin
deliverToMailboxPathRegisteredListeners(event);
sendToRemoteJames(event);
} catch (Throwable t) {
- event.getSession()
- .getLog()
- .error("Error while delegating event " + event.getClass().getCanonicalName(), t);
+ LOGGER.error("Error while delegating event " + event.getClass().getCanonicalName(), t);
}
}
@@ -160,16 +158,14 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin
try {
serializedEvent = eventSerializer.serializeEvent(event);
} catch (Exception e) {
- event.getSession()
- .getLog()
- .error("Unable to serialize " + event.getClass().getCanonicalName(), e);
+ LOGGER.error("Unable to serialize " + event.getClass().getCanonicalName(), e);
return;
}
for (Topic topic : topics) {
try {
publisher.publish(topic, serializedEvent);
} catch (Throwable t) {
- event.getSession().getLog().error("Unable to send serialized event to topic " + topic);
+ LOGGER.error("Unable to send serialized event to topic " + topic);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
index ec65a5d..5b4acaa 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
@@ -69,7 +69,6 @@ public class MailboxSessionDataTransferObject {
return new SimpleMailboxSession(sessionId,
username,
"",
- LOG,
retrieveLocales(),
sharedSpaces,
otherUserSpace,
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
index c54b9d6..ca5657d 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
@@ -20,16 +20,20 @@ package org.apache.james.mailbox.store.quota;
import java.util.List;
+import javax.inject.Inject;
+
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-
-import javax.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdater {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ListeningCurrentQuotaUpdater.class);
+
private final StoreCurrentQuotaManager currentQuotaManager;
private final QuotaRootResolver quotaRootResolver;
@@ -59,7 +63,7 @@ public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdat
handleExpungedEvent((Expunged) event, quotaRoot);
}
} catch(MailboxException e) {
- event.getSession().getLog().error("Error while updating quotas", e);
+ LOGGER.error("Error while updating quotas", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
index 9ebee95..f4c9947 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
@@ -37,6 +37,8 @@ import org.apache.james.mailbox.model.UpdatedFlags;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
@@ -51,6 +53,8 @@ import com.google.common.base.Preconditions;
*/
public class LazyMessageSearchIndex extends ListeningMessageSearchIndex {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LazyMessageSearchIndex.class);
+
private final ListeningMessageSearchIndex index;
private final ConcurrentHashMap<MailboxId, Object> indexed = new ConcurrentHashMap<>();
@@ -110,7 +114,7 @@ public class LazyMessageSearchIndex extends ListeningMessageSearchIndex {
try {
add(session, mailbox, message);
} catch (MailboxException e) {
- session.getLog().error("Unable to index message " + message.getUid() + " in mailbox " + mailbox.getName(), e);
+ LOGGER.error("Unable to index message " + message.getUid() + " in mailbox " + mailbox.getName(), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
index bd4521c..13155e7 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
@@ -31,6 +31,8 @@ import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
@@ -41,6 +43,7 @@ import com.google.common.base.Optional;
*
*/
public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, MailboxListener {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ListeningMessageSearchIndex.class);
public static final int UNLIMITED = -1;
private final MessageMapperFactory factory;
@@ -89,7 +92,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
try {
delete(session, expunged.getMailbox(), expunged.getUids());
} catch (MailboxException e) {
- session.getLog().error("Unable to deleted messages " + expunged.getUids() + " from index for mailbox " + expunged.getMailbox(), e);
+ LOGGER.error("Unable to deleted messages " + expunged.getUids() + " from index for mailbox " + expunged.getMailbox(), e);
}
} else if (event instanceof EventFactory.FlagsUpdatedImpl) {
EventFactory.FlagsUpdatedImpl flagsUpdated = (EventFactory.FlagsUpdatedImpl) event;
@@ -98,14 +101,14 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
try {
update(session, mailbox, flagsUpdated.getUpdatedFlags());
} catch (MailboxException e) {
- session.getLog().error("Unable to update flags in index for mailbox " + mailbox, e);
+ LOGGER.error("Unable to update flags in index for mailbox " + mailbox, e);
}
}
} else if (event instanceof EventFactory.MailboxDeletionImpl) {
deleteAll(session, ((EventFactory.MailboxDeletionImpl) event).getMailbox());
}
} catch (MailboxException e) {
- session.getLog().error("Unable to update index", e);
+ LOGGER.error("Unable to update index", e);
}
}
@@ -119,7 +122,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
.findInMailbox(mailbox, MessageRange.one(next), FetchType.Full, UNLIMITED)
.next());
} catch (Exception e) {
- session.getLog().error(String.format("Could not retrieve message %d in mailbox %s",
+ LOGGER.error(String.format("Could not retrieve message %d in mailbox %s",
next, mailbox.getMailboxId().serialize()), e);
return Optional.absent();
}
@@ -130,7 +133,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
try {
add(session, mailbox, message);
} catch (MailboxException e) {
- session.getLog().error("Unable to index message " + message.getUid() + " for mailbox " + mailbox, e);
+ LOGGER.error("Unable to index message " + message.getUid() + " for mailbox " + mailbox, e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
index b2fdd22..5625a31 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
@@ -70,6 +70,8 @@ import org.apache.james.mime4j.message.HeaderImpl;
import org.apache.james.mime4j.stream.MimeConfig;
import org.apache.james.mime4j.util.MimeUtil;
import org.apache.james.mime4j.utils.search.MessageMatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
@@ -81,6 +83,8 @@ import com.google.common.collect.Lists;
*/
public class MessageSearches implements Iterable<SimpleMessageSearchIndex.SearchResult> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MessageSearches.class);
+
private static final MimeConfig MIME_ENTITY_CONFIG = MimeConfig.custom()
.setMaxContentLen(-1)
.setMaxHeaderCount(-1)
@@ -115,9 +119,7 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search
builder.add(m);
}
} catch (MailboxException e) {
- if (session != null && session.getLog() != null) {
- session.getLog().error("Unable to search message " + m.getUid(), e);
- }
+ LOGGER.error("Unable to search message " + m.getUid(), e);
}
}
List<MailboxMessage> sortedResults = FluentIterable.from(builder.build())
@@ -223,14 +225,13 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search
}
private boolean isInMessage(String value, InputStream input, boolean header) throws IOException, MimeException {
- MessageMatcher.MessageMatcherBuilder builder = MessageMatcher.builder()
+ return MessageMatcher.builder()
.searchContents(Lists.<CharSequence>newArrayList(value))
.caseInsensitive(true)
- .includeHeaders(header);
- if (session != null && session.getLog() != null) {
- builder.logger(session.getLog());
- }
- return builder.build().messageMatches(input);
+ .includeHeaders(header)
+ .logger(LOGGER)
+ .build()
+ .messageMatches(input);
}
private boolean messageContains(String value, MailboxMessage message) throws IOException, MimeException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
index 836bf4a..be87636 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
@@ -40,7 +40,7 @@ public class GroupFolderResolverTest {
@Test
public void isGroupFolderShouldReturnFalseWhenMailboxNamespaceIsNull() {
- SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, null, pathSeparator, SessionType.User);
+ SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", localePreferences, sharedSpaces, null, pathSeparator, SessionType.User);
GroupFolderResolver testee = new GroupFolderResolver(mailboxSession);
SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath(null, "user", "name"), UID_VALIDITY);
@@ -49,7 +49,7 @@ public class GroupFolderResolverTest {
@Test
public void isGroupFolderShouldReturnFalseWhenMailboxNamespaceEqualsToUserNamespace() {
- SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, null, pathSeparator, SessionType.User);
+ SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", localePreferences, sharedSpaces, null, pathSeparator, SessionType.User);
GroupFolderResolver testee = new GroupFolderResolver(mailboxSession);
SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, "user", "name"), UID_VALIDITY);
@@ -59,7 +59,7 @@ public class GroupFolderResolverTest {
@Test
public void isGroupFolderShouldReturnFalseWhenMailboxNamespaceEqualsToOtherUsersNamespace() {
String otherUsersSpace = "other";
- SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, otherUsersSpace, pathSeparator, SessionType.User);
+ SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", localePreferences, sharedSpaces, otherUsersSpace, pathSeparator, SessionType.User);
GroupFolderResolver testee = new GroupFolderResolver(mailboxSession);
SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath("other", "user", "name"), UID_VALIDITY);
@@ -69,7 +69,7 @@ public class GroupFolderResolverTest {
@Test
public void isGroupFolderShouldReturnTrueWhenMailboxNamespaceDoesntEqualToOtherUsersNamespace() {
String otherUsersSpace = "other";
- SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", log, localePreferences, sharedSpaces, otherUsersSpace, pathSeparator, SessionType.User);
+ SimpleMailboxSession mailboxSession = new SimpleMailboxSession(1, "username", "password", localePreferences, sharedSpaces, otherUsersSpace, pathSeparator, SessionType.User);
GroupFolderResolver testee = new GroupFolderResolver(mailboxSession);
SimpleMailbox mailbox = new SimpleMailbox(new MailboxPath("namespace", "user", "name"), UID_VALIDITY);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
index c55d7cc..e0db1ec 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
@@ -44,8 +44,6 @@ import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class StoreMailboxManagerTest {
@@ -54,7 +52,6 @@ public class StoreMailboxManagerTest {
private static final String ADMIN = "admin";
private static final String ADMIN_PASSWORD = "adminsecret";
private static final MailboxId MAILBOX_ID = TestId.of(123);
- private static final Logger LOGGER = LoggerFactory.getLogger(StoreMailboxManagerTest.class);
private static final int UID_VALIDITY = 42;
public static final String UNKNOWN_USER = "otheruser";
public static final String BAD_PASSWORD = "badpassword";
@@ -183,49 +180,49 @@ public class StoreMailboxManagerTest {
@Test
public void loginShouldCreateSessionWhenGoodPassword() throws Exception {
- MailboxSession expected = storeMailboxManager.login(CURRENT_USER, CURRENT_USER_PASSWORD, LOGGER);
+ MailboxSession expected = storeMailboxManager.login(CURRENT_USER, CURRENT_USER_PASSWORD);
assertThat(expected.getUser().getUserName()).isEqualTo(CURRENT_USER);
}
@Test(expected = BadCredentialsException.class)
public void loginShouldThrowWhenBadPassword() throws Exception {
- storeMailboxManager.login(CURRENT_USER, BAD_PASSWORD, LOGGER);
+ storeMailboxManager.login(CURRENT_USER, BAD_PASSWORD);
}
@Test(expected = BadCredentialsException.class)
public void loginAsOtherUserShouldNotCreateUserSessionWhenAdminWithBadPassword() throws Exception {
- storeMailboxManager.loginAsOtherUser(ADMIN, BAD_PASSWORD, CURRENT_USER, LOGGER);
+ storeMailboxManager.loginAsOtherUser(ADMIN, BAD_PASSWORD, CURRENT_USER);
}
@Test(expected = NotAdminException.class)
public void loginAsOtherUserShouldNotCreateUserSessionWhenNotAdmin() throws Exception {
- storeMailboxManager.loginAsOtherUser(CURRENT_USER, CURRENT_USER_PASSWORD, UNKNOWN_USER, LOGGER);
+ storeMailboxManager.loginAsOtherUser(CURRENT_USER, CURRENT_USER_PASSWORD, UNKNOWN_USER);
}
@Test(expected = BadCredentialsException.class)
public void loginAsOtherUserShouldThrowBadCredentialWhenBadPasswordAndNotAdminUser() throws Exception {
- storeMailboxManager.loginAsOtherUser(CURRENT_USER, BAD_PASSWORD, CURRENT_USER, LOGGER);
+ storeMailboxManager.loginAsOtherUser(CURRENT_USER, BAD_PASSWORD, CURRENT_USER);
}
@Test(expected = BadCredentialsException.class)
public void loginAsOtherUserShouldThrowBadCredentialWhenBadPasswordNotAdminUserAndUnknownUser() throws Exception {
- storeMailboxManager.loginAsOtherUser(CURRENT_USER, BAD_PASSWORD, UNKNOWN_USER, LOGGER);
+ storeMailboxManager.loginAsOtherUser(CURRENT_USER, BAD_PASSWORD, UNKNOWN_USER);
}
@Test(expected = BadCredentialsException.class)
public void loginAsOtherUserShouldThrowBadCredentialsWhenBadPasswordAndUserDoesNotExists() throws Exception {
- storeMailboxManager.loginAsOtherUser(ADMIN, BAD_PASSWORD, UNKNOWN_USER, LOGGER);
+ storeMailboxManager.loginAsOtherUser(ADMIN, BAD_PASSWORD, UNKNOWN_USER);
}
@Test(expected = UserDoesNotExistException.class)
public void loginAsOtherUserShouldNotCreateUserSessionWhenDelegatedUserDoesNotExist() throws Exception {
- storeMailboxManager.loginAsOtherUser(ADMIN, ADMIN_PASSWORD, UNKNOWN_USER, LOGGER);
+ storeMailboxManager.loginAsOtherUser(ADMIN, ADMIN_PASSWORD, UNKNOWN_USER);
}
@Test
public void loginAsOtherUserShouldCreateUserSessionWhenAdminWithGoodPassword() throws Exception {
- MailboxSession expected = storeMailboxManager.loginAsOtherUser(ADMIN, ADMIN_PASSWORD, CURRENT_USER, LOGGER);
+ MailboxSession expected = storeMailboxManager.loginAsOtherUser(ADMIN, ADMIN_PASSWORD, CURRENT_USER);
assertThat(expected.getUser().getUserName()).isEqualTo(CURRENT_USER);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index 8c45ae0..5dbfe9a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -47,8 +47,6 @@ import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
@@ -58,7 +56,6 @@ public abstract class AbstractMessageSearchIndexTest {
protected static final String OTHERUSER = "otheruser";
protected static final String USERNAME = "benwa";
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMessageSearchIndexTest.class);
public static final long LIMIT = 100L;
public static final boolean RECENT = true;
public static final boolean NOT_RECENT = false;
@@ -92,8 +89,8 @@ public abstract class AbstractMessageSearchIndexTest {
public void setUp() throws Exception {
initializeMailboxManager();
- session = storeMailboxManager.createSystemSession(USERNAME, LOGGER);
- otherSession = storeMailboxManager.createSystemSession(OTHERUSER, LOGGER);
+ session = storeMailboxManager.createSystemSession(USERNAME);
+ otherSession = storeMailboxManager.createSystemSession(OTHERUSER);
MailboxPath inboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USERNAME, INBOX);
MailboxPath otherInboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, OTHERUSER, INBOX);
@@ -330,7 +327,7 @@ public abstract class AbstractMessageSearchIndexTest {
@Test
public void searchShouldReturnEmptyWhenUserDontMatch() throws MailboxException {
Assume.assumeTrue(storeMailboxManager.getSupportedSearchCapabilities().contains(MailboxManager.SearchCapabilities.MultimailboxSearch));
- MailboxSession otherUserSession = storeMailboxManager.createSystemSession("otherUser", LOGGER);
+ MailboxSession otherUserSession = storeMailboxManager.createSystemSession("otherUser");
SearchQuery searchQuery = new SearchQuery();
assertThat(messageSearchIndex.search(otherUserSession, mailbox, searchQuery))
.isEmpty();
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
index 9c09cc9..1f1f238 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
@@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class MailboxCopierImpl implements MailboxCopier {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailboxCopierImpl.class.getName());
private final static FetchGroup GROUP = new FetchGroup() {
@@ -59,11 +60,6 @@ public class MailboxCopierImpl implements MailboxCopier {
}
};
-
- /**
- * The logger.
- */
- private Logger log = LoggerFactory.getLogger(MailboxCopierImpl.class.getName());
/**
* @see org.apache.james.mailbox.copier.MailboxCopier#copyMailboxes(org.apache.james.mailbox.MailboxManager, org.apache.james.mailbox.MailboxManager)
@@ -77,14 +73,14 @@ public class MailboxCopierImpl implements MailboxCopier {
List<MailboxPath> mailboxPathList = null;
- srcMailboxSession = srcMailboxManager.createSystemSession("manager", log);
+ srcMailboxSession = srcMailboxManager.createSystemSession("manager");
srcMailboxManager.startProcessingRequest(srcMailboxSession);
mailboxPathList = srcMailboxManager.list(srcMailboxSession);
srcMailboxManager.endProcessingRequest(srcMailboxSession);
- log.info("Found " + mailboxPathList.size() + " mailboxes in source mailbox manager.");
+ LOGGER.info("Found " + mailboxPathList.size() + " mailboxes in source mailbox manager.");
for (int i=0; i < mailboxPathList.size(); i++) {
- log.info("Mailbox#" + i + " path=" + mailboxPathList.get(i));
+ LOGGER.info("Mailbox#" + i + " path=" + mailboxPathList.get(i));
}
MailboxPath mailboxPath = null;
@@ -95,19 +91,19 @@ public class MailboxCopierImpl implements MailboxCopier {
if ((mailboxPath.getName() != null) && (mailboxPath.getName().trim().length() > 0)) {
- log.info("Ready to copy source mailbox path=" + mailboxPath.toString());
+ LOGGER.info("Ready to copy source mailbox path=" + mailboxPath.toString());
- srcMailboxSession = srcMailboxManager.createSystemSession(mailboxPath.getUser(), log);
- dstMailboxSession = dstMailboxManager.createSystemSession(mailboxPath.getUser(), log);
+ srcMailboxSession = srcMailboxManager.createSystemSession(mailboxPath.getUser());
+ dstMailboxSession = dstMailboxManager.createSystemSession(mailboxPath.getUser());
dstMailboxManager.startProcessingRequest(dstMailboxSession);
try {
dstMailboxManager.createMailbox(mailboxPath, dstMailboxSession);
- log.info("Destination mailbox " + i + "/" + mailboxPathList.size()
+ LOGGER.info("Destination mailbox " + i + "/" + mailboxPathList.size()
+ " created with path=" + mailboxPath.toString()
+ " after " + (Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis()) + " ms.");
} catch (MailboxExistsException e) {
- log.error("Mailbox " + i + " with path=" + mailboxPath.toString() + " already exists.", e);
+ LOGGER.error("Mailbox " + i + " with path=" + mailboxPath.toString() + " already exists.", e);
}
dstMailboxManager.endProcessingRequest(dstMailboxSession);
@@ -129,7 +125,7 @@ public class MailboxCopierImpl implements MailboxCopier {
dstMailboxManager.startProcessingRequest(dstMailboxSession);
dstMessageManager.appendMessage(content.getInputStream(), messageResult.getInternalDate(), dstMailboxSession, messageResult.getFlags().contains(Flag.RECENT), messageResult.getFlags());
dstMailboxManager.endProcessingRequest(dstMailboxSession);
- log.info("MailboxMessage #" + j + " appended in destination mailbox with path=" + mailboxPath.toString());
+ LOGGER.info("MailboxMessage #" + j + " appended in destination mailbox with path=" + mailboxPath.toString());
j++;
}
@@ -139,7 +135,7 @@ public class MailboxCopierImpl implements MailboxCopier {
else {
- log.info("Destination mailbox " + i + "/" + mailboxPathList.size()
+ LOGGER.info("Destination mailbox " + i + "/" + mailboxPathList.size()
+ " with path=" + mailboxPath.toString()
+ " has a null or empty name");
@@ -147,17 +143,7 @@ public class MailboxCopierImpl implements MailboxCopier {
}
- log.info("Mailboxes copied in " + (Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis()) + " ms.");
+ LOGGER.info("Mailboxes copied in " + (Calendar.getInstance().getTimeInMillis() - start.getTimeInMillis()) + " ms.");
}
-
- /**
- * Set the logger.
- *
- * @param log
- */
- public void setLog(Logger log) {
- this.log = log;
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
index bc7200d..48e7367 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java
@@ -77,13 +77,13 @@ public class ReIndexerImpl implements ReIndexer {
}
public void reIndex(MailboxPath path) throws MailboxException {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(path.getUser(), LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(path.getUser());
reIndex(path, mailboxSession);
}
public void reIndex() throws MailboxException {
- MailboxSession mailboxSession = mailboxManager.createSystemSession("re-indexing", LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession("re-indexing");
LOGGER.info("Starting a full reindex");
List<MailboxPath> mailboxPaths = mailboxManager.list(mailboxSession);
GlobalRegistration globalRegistration = new GlobalRegistration();
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
index e36f2e5..0a0aa30 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
@@ -43,7 +43,6 @@ import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.LoggerFactory;
/**
* Test class for the {@link MailboxCopierImpl} implementation.
@@ -81,10 +80,8 @@ public class MailboxCopierTest {
*/
@Before
public void setup() throws BadCredentialsException, MailboxException {
-
mailboxCopier = new MailboxCopierImpl();
- mailboxCopier.setLog(LoggerFactory.getLogger(MailboxCopierTest.class.getName()));
-
+
srcMemMailboxManager = newInMemoryMailboxManager();
dstMemMailboxManager = newInMemoryMailboxManager();
@@ -132,7 +129,7 @@ public class MailboxCopierTest {
*/
private void assertMailboxManagerSize(MailboxManager mailboxManager, int multiplicationFactor) throws BadCredentialsException, MailboxException {
- MailboxSession mailboxSession = mailboxManager.createSystemSession("manager", LoggerFactory.getLogger("src-mailbox-copier"));
+ MailboxSession mailboxSession = mailboxManager.createSystemSession("manager");
mailboxManager.startProcessingRequest(mailboxSession);
List<MailboxPath> mailboxPathList = mailboxManager.list(mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java
index 330e5cc..a74abe3 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/ReIndexerImplTest.java
@@ -45,7 +45,6 @@ import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.assertj.core.util.Lists;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
import com.google.common.collect.ImmutableList;
@@ -70,7 +69,7 @@ public class ReIndexerImplTest {
@Test
public void test() throws Exception {
final MockMailboxSession mockMailboxSession = new MockMailboxSession("re-indexing");
- when(mailboxManager.createSystemSession(any(String.class), any(Logger.class)))
+ when(mailboxManager.createSystemSession(any(String.class)))
.thenReturn(mockMailboxSession);
final MessageMapper messageMapper = mock(MessageMapper.class);
final MailboxMapper mailboxMapper = mock(MailboxMapper.class);
@@ -87,7 +86,7 @@ public class ReIndexerImplTest {
reIndexer.reIndex(INBOX);
- verify(mailboxManager).createSystemSession(any(String.class), any(Logger.class));
+ verify(mailboxManager).createSystemSession(any(String.class));
verify(mailboxSessionMapperFactory).getMailboxMapper(mockMailboxSession);
verify(mailboxSessionMapperFactory).getMessageMapper(mockMailboxSession);
verify(mailboxMapper).findMailboxByPath(INBOX);
@@ -102,7 +101,7 @@ public class ReIndexerImplTest {
@Test
public void mailboxPathUserShouldBeUsedWhenReIndexing() throws Exception {
MockMailboxSession systemMailboxSession = new MockMailboxSession("re-indexing");
- when(mailboxManager.createSystemSession(eq("re-indexing"), any(Logger.class)))
+ when(mailboxManager.createSystemSession("re-indexing"))
.thenReturn(systemMailboxSession);
MailboxMapper mailboxMapper = mock(MailboxMapper.class);
when(mailboxSessionMapperFactory.getMailboxMapper(systemMailboxSession))
@@ -111,7 +110,7 @@ public class ReIndexerImplTest {
String user1 = "user1@james.org";
MailboxPath user1MailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, user1, "Inbox");
MockMailboxSession user1MailboxSession = new MockMailboxSession(user1);
- when(mailboxManager.createSystemSession(eq(user1), any(Logger.class)))
+ when(mailboxManager.createSystemSession(user1))
.thenReturn(user1MailboxSession);
MailboxMapper user1MailboxMapper = mock(MailboxMapper.class);
when(mailboxSessionMapperFactory.getMailboxMapper(user1MailboxSession))
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/MailboxCreationDelegate.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/MailboxCreationDelegate.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/MailboxCreationDelegate.java
index 7eca35a..75fdf4e 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/MailboxCreationDelegate.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/MailboxCreationDelegate.java
@@ -22,13 +22,9 @@ package org.apache.james.mpt.imapmailbox;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.model.MailboxPath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MailboxCreationDelegate {
- private static final Logger LOGGER = LoggerFactory.getLogger(MailboxCreationDelegate.class);
-
private final MailboxManager mailboxManager;
public MailboxCreationDelegate(MailboxManager mailboxManager) {
@@ -36,7 +32,7 @@ public class MailboxCreationDelegate {
}
public void createMailbox(MailboxPath mailboxPath) throws Exception{
- MailboxSession mailboxSession = mailboxManager.createSystemSession("system", LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession("system");
mailboxManager.startProcessingRequest(mailboxSession);
mailboxManager.createMailbox(mailboxPath, mailboxSession);
mailboxManager.logout(mailboxSession, true);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
index a6558b0..67cf8fe 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
@@ -51,7 +51,6 @@ import org.apache.james.mpt.api.ImapFeatures;
import org.apache.james.mpt.api.ImapFeatures.Feature;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
-import org.slf4j.LoggerFactory;
public class HBaseHostSystem extends JamesImapHostSystem {
@@ -123,7 +122,7 @@ public class HBaseHostSystem extends JamesImapHostSystem {
@Override
protected void resetData() throws Exception {
resetUserMetaData();
- MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("TestLog"));
+ MailboxSession session = mailboxManager.createSystemSession("test");
mailboxManager.startProcessingRequest(session);
mailboxManager.deleteEverything(session);
mailboxManager.endProcessingRequest(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
index 30251af..f46d0e8 100644
--- a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
+++ b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
@@ -51,7 +51,6 @@ import org.apache.james.mpt.api.ImapFeatures;
import org.apache.james.mpt.api.ImapFeatures.Feature;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
-import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
public class JCRHostSystem extends JamesImapHostSystem {
@@ -104,7 +103,7 @@ public class JCRHostSystem extends JamesImapHostSystem {
new DefaultQuotaRootResolver(mf),
new DefaultMetricFactory());
resetUserMetaData();
- MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("TestLog"));
+ MailboxSession session = mailboxManager.createSystemSession("test");
mailboxManager.startProcessingRequest(session);
//mailboxManager.deleteEverything(session);
mailboxManager.endProcessingRequest(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
index 2ba9c0c..31b8571 100644
--- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
+++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
@@ -57,7 +57,6 @@ import org.apache.james.mpt.api.ImapFeatures;
import org.apache.james.mpt.api.ImapFeatures.Feature;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
@@ -124,7 +123,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
public void resetData() throws Exception {
resetUserMetaData();
- MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("TestLog"));
+ MailboxSession session = mailboxManager.createSystemSession("test");
mailboxManager.startProcessingRequest(session);
mailboxManager.deleteEverything(session);
mailboxManager.endProcessingRequest(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java
index 6bd7221..27f3ab0 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/lucenesearch/src/test/java/org/apache/james/mpt/imapmailbox/lucenesearch/host/LuceneSearchHostSystem.java
@@ -61,7 +61,6 @@ import org.apache.james.mpt.api.ImapFeatures.Feature;
import org.apache.james.mpt.host.JamesImapHostSystem;
import org.apache.james.mpt.imapmailbox.MailboxCreationDelegate;
import org.apache.lucene.store.FSDirectory;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.io.Files;
@@ -86,7 +85,7 @@ public class LuceneSearchHostSystem extends JamesImapHostSystem {
tempFile.deleteOnExit();
resetUserMetaData();
- MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("TestLog"));
+ MailboxSession session = mailboxManager.createSystemSession("test");
mailboxManager.startProcessingRequest(session);
mailboxManager.deleteEverything(session);
mailboxManager.endProcessingRequest(session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
index 2103b10..062104f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
@@ -27,6 +27,8 @@ import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.MessagingImapCommandParser;
import org.apache.james.protocols.imap.DecodingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -35,6 +37,8 @@ import org.apache.james.protocols.imap.DecodingException;
*/
public abstract class AbstractImapCommandParser implements MessagingImapCommandParser {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractImapCommandParser.class);
+
private final ImapCommand command;
private StatusResponseFactory statusResponseFactory;
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 8f7fbd0..6ffb83f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -63,8 +63,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
final MailboxManager mailboxManager = getMailboxManager();
try {
final MailboxSession mailboxSession = mailboxManager.login(authenticationAttempt.getAuthenticationId(),
- authenticationAttempt.getPassword(),
- session.getLog());
+ authenticationAttempt.getPassword());
session.authenticated();
session.setAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY, mailboxSession);
provisionInbox(session, mailboxManager, mailboxSession);
@@ -94,8 +93,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
try {
final MailboxSession mailboxSession = mailboxManager.loginAsOtherUser(authenticationAttempt.getAuthenticationId(),
authenticationAttempt.getPassword(),
- authenticationAttempt.getDelegateUserName().get(),
- session.getLog());
+ authenticationAttempt.getDelegateUserName().get());
session.authenticated();
session.setAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY, mailboxSession);
provisionInbox(session, mailboxManager, mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
index 06ca1ab..b1d2170 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
@@ -54,11 +54,16 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.metrics.api.MetricFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequest> extends AbstractMailboxProcessor<M> implements PermitEnableCapabilityProcessor {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSelectionProcessor.class);
+
final StatusResponseFactory statusResponseFactory;
private final boolean openReadOnly;
@@ -363,8 +368,8 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
int msn = selected.msn(unseenUid);
if (msn == SelectedMailbox.NO_SUCH_MESSAGE) {
- if (session.getLog().isDebugEnabled()) {
- session.getLog().debug("No message found with uid " + unseenUid + " in mailbox " + selected.getPath().getFullName(session.getPathDelimiter()));
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("No message found with uid " + unseenUid + " in mailbox " + selected.getPath().getFullName(session.getPathDelimiter()));
}
return false;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
index b744b85..3c702f0 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
@@ -76,7 +76,6 @@ import org.apache.james.mailbox.model.TestId;
import org.apache.james.mailbox.model.UpdatedFlags;
import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
import org.junit.Test;
-import org.slf4j.Logger;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -163,7 +162,7 @@ public class MailboxEventAnalyserTest {
}
- public MailboxSession login(String userid, String passwd, Logger log) throws MailboxException {
+ public MailboxSession login(String userid, String passwd) throws MailboxException {
throw new UnsupportedOperationException("Not implemented");
}
@@ -343,7 +342,7 @@ public class MailboxEventAnalyserTest {
throw new UnsupportedOperationException("Not implemented");
}
- public MailboxSession createSystemSession(String userName, Logger log) throws MailboxException {
+ public MailboxSession createSystemSession(String userName) throws MailboxException {
throw new UnsupportedOperationException("Not implemented");
}
@@ -421,7 +420,7 @@ public class MailboxEventAnalyserTest {
}
@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 {
throw new UnsupportedOperationException("Not implemented");
}
};
@@ -447,10 +446,6 @@ public class MailboxEventAnalyserTest {
return null;
}
- public Logger getLog() {
- return null;
- }
-
public String getOtherUsersSpace() {
return null;
}
@@ -531,11 +526,7 @@ public class MailboxEventAnalyserTest {
public SelectedMailbox getSelected() {
return null;
}
-
- public Logger getLog() {
- return null;
- }
-
+
public Object getAttribute(String key) {
if (key.equals(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY)) {
return mSession;
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
----------------------------------------------------------------------
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
index 445fa46..73982a7 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxProbeImpl.java
@@ -45,14 +45,11 @@ import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.utils.GuiceProbe;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
- private static final Logger LOGGER = LoggerFactory.getLogger(MailboxProbeImpl.class);
private final MailboxManager mailboxManager;
private final MailboxMapperFactory mailboxMapperFactory;
private final SubscriptionManager subscriptionManager;
@@ -69,7 +66,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
public void createMailbox(String namespace, String user, String name) {
MailboxSession mailboxSession = null;
try {
- mailboxSession = mailboxManager.createSystemSession(user, LOGGER);
+ mailboxSession = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(mailboxSession);
mailboxManager.createMailbox(new MailboxPath(namespace, user, name), mailboxSession);
} catch (MailboxException e) {
@@ -84,7 +81,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
public Mailbox getMailbox(String namespace, String user, String name) {
MailboxSession mailboxSession = null;
try {
- mailboxSession = mailboxManager.createSystemSession(user, LOGGER);
+ mailboxSession = mailboxManager.createSystemSession(user);
MailboxMapper mailboxMapper = mailboxMapperFactory.getMailboxMapper(mailboxSession);
return mailboxMapper.findMailboxByPath(new MailboxPath(namespace, user, name));
} catch (MailboxException e) {
@@ -109,7 +106,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
public Collection<String> listUserMailboxes(String user) {
MailboxSession mailboxSession = null;
try {
- mailboxSession = mailboxManager.createSystemSession(user, LOGGER);
+ mailboxSession = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(mailboxSession);
return searchUserMailboxes(user, mailboxSession)
.stream()
@@ -136,7 +133,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
public void deleteMailbox(String namespace, String user, String name) {
MailboxSession mailboxSession = null;
try {
- mailboxSession = mailboxManager.createSystemSession(user, LOGGER);
+ mailboxSession = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(mailboxSession);
mailboxManager.deleteMailbox(new MailboxPath(namespace, user, name), mailboxSession);
} catch (MailboxException e) {
@@ -148,7 +145,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
@Override
public void importEmlFileToMailbox(String namespace, String user, String name, String emlPath) throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(user, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(mailboxSession);
MessageManager messageManager = mailboxManager.getMailbox(new MailboxPath(namespace, user, name), mailboxSession);
@@ -163,7 +160,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
public ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message, Date internalDate, boolean isRecent, Flags flags)
throws MailboxException {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(username, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, mailboxSession);
return messageManager.appendMessage(message, internalDate, mailboxSession, isRecent, flags);
}
@@ -190,7 +187,7 @@ public class MailboxProbeImpl implements GuiceProbe, MailboxProbe {
@Override
public Collection<String> listSubscriptions(String user) throws Exception {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(user, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(user);
return subscriptionManager.subscriptions(mailboxSession);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
index 627d1c6..854d590 100644
--- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
+++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
@@ -35,13 +35,9 @@ import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class JmapGuiceProbe implements GuiceProbe {
- private static final Logger LOGGER = LoggerFactory.getLogger(JmapGuiceProbe.class);
-
private final VacationRepository vacationRepository;
private final JMAPServer jmapServer;
private final MessageIdManager messageIdManager;
@@ -60,7 +56,7 @@ public class JmapGuiceProbe implements GuiceProbe {
}
public void addMailboxListener(MailboxListener listener) throws MailboxException {
- mailboxManager.addGlobalListener(listener, mailboxManager.createSystemSession("jmap", LOGGER));
+ mailboxManager.addGlobalListener(listener, mailboxManager.createSystemSession("jmap"));
}
public void modifyVacation(AccountId accountId, VacationPatch vacationPatch) {
@@ -72,7 +68,7 @@ public class JmapGuiceProbe implements GuiceProbe {
}
public void setInMailboxes(MessageId messageId, String username, MailboxId... mailboxIds) throws MailboxException {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(username, LOGGER);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
messageIdManager.setInMailboxes(messageId, Arrays.asList(mailboxIds), mailboxSession);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
index 515f5b0..517326a 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
@@ -79,7 +79,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
.addContext(MDCBuilder.ACTION, "deleteMailboxes")
.addContext("concernedUser", username)
.build()) {
- session = mailboxManager.createSystemSession(username, log);
+ session = mailboxManager.createSystemSession(username);
mailboxManager.startProcessingRequest(session);
List<MailboxMetaData> mList = retrieveAllUserMailboxes(username, session);
for (MailboxMetaData aMList : mList) {
@@ -120,7 +120,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
.addContext(MDCBuilder.ACTION, "listMailboxes")
.addContext("concernedUser", username)
.build()) {
- session = mailboxManager.createSystemSession(username, log);
+ session = mailboxManager.createSystemSession(username);
mailboxManager.startProcessingRequest(session);
List<MailboxMetaData> mList = retrieveAllUserMailboxes(username, session);
boxes = mList.stream()
@@ -148,7 +148,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
.addContext(MDCBuilder.ACTION, "createMailbox")
.addContext("mailboxPath", mailboxPath.asString())
.build()) {
- session = mailboxManager.createSystemSession(user, log);
+ session = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(session);
mailboxManager.createMailbox(mailboxPath, session);
} catch (Exception e) {
@@ -169,7 +169,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
.addContext(MDCBuilder.ACTION, "deleteMailbox")
.addContext("mailboxPath", mailboxPath.asString())
.build()) {
- session = mailboxManager.createSystemSession(user, log);
+ session = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(session);
mailboxManager.deleteMailbox(mailboxPath, session);
} catch (Exception e) {
@@ -193,7 +193,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
.addContext("mailboxPath", mailboxPath.asString())
.addContext("emlPath", emlPath)
.build()) {
- session = mailboxManager.createSystemSession(user, log);
+ session = mailboxManager.createSystemSession(user);
mailboxManager.startProcessingRequest(session);
MessageManager messageManager = mailboxManager.getMailbox(mailboxPath, session);
InputStream emlFileAsStream = new FileInputStream(emlPath);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
index 2e71bdc..4236b61 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
@@ -147,7 +147,7 @@ public class James23Importer implements LogEnabled {
String userName30 = convert23UserTo30(userName23);
- MailboxSession mailboxSession = mailboxManager.createSystemSession(userName30, log);
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(userName30);
MailboxPath mailboxPath = MailboxPath.inbox(mailboxSession);
mailboxManager.startProcessingRequest(mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
index a458b39..a9e7fc9 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
@@ -68,7 +68,7 @@ public class LocalDelivery extends GenericMailet {
public void init() throws MessagingException {
mailDispatcher = MailDispatcher.builder()
.mailStore(SimpleMailStore.builder()
- .mailboxAppender(new MailboxAppender(mailboxManager, getMailetContext().getLogger()))
+ .mailboxAppender(new MailboxAppender(mailboxManager))
.usersRepository(usersRepository)
.folder(MailboxConstants.INBOX)
.metric(metricFactory.generate(LOCAL_DELIVERED_MAILS_METRIC_NAME))
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
index aa5be0d..3394aa4 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
@@ -77,7 +77,7 @@ public class ToRecipientFolder extends GenericMailet {
public void init() throws MessagingException {
mailDispatcher = MailDispatcher.builder()
.mailStore(SimpleMailStore.builder()
- .mailboxAppender(new MailboxAppender(mailboxManager, getMailetContext().getLogger()))
+ .mailboxAppender(new MailboxAppender(mailboxManager))
.usersRepository(usersRepository)
.folder(getInitParameter(FOLDER_PARAMETER, MailboxConstants.INBOX))
.metric(metricFactory.generate(LOCAL_DELIVERED_MAILS_METRIC_NAME))
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
----------------------------------------------------------------------
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 7ac3721..41e0749 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
@@ -98,7 +98,7 @@ public class ToSenderFolder extends GenericMailet {
public void init() throws MessagingException {
folder = getInitParameter("folder", "Sent");
consume = getInitParameter("consume", false);
- mailboxAppender = new MailboxAppender(mailboxManager, getMailetContext().getLogger());
+ mailboxAppender = new MailboxAppender(mailboxManager);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
index c8dacb9..47dc518 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
@@ -32,7 +32,6 @@ import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.BadCredentialsException;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxPath;
-import org.slf4j.Logger;
import com.google.common.base.Strings;
@@ -41,11 +40,9 @@ public class MailboxAppender {
private static final Flags FLAGS = null;
private final MailboxManager mailboxManager;
- private final Logger logger;
- public MailboxAppender(MailboxManager mailboxManager, Logger logger) {
+ public MailboxAppender(MailboxManager mailboxManager) {
this.mailboxManager = mailboxManager;
- this.logger = logger;
}
public void append(MimeMessage mail, String user, String folder) throws MessagingException {
@@ -93,7 +90,7 @@ public class MailboxAppender {
public MailboxSession createMailboxSession(String user) throws MessagingException {
try {
- return mailboxManager.createSystemSession(user, logger);
+ return mailboxManager.createSystemSession(user);
} catch (BadCredentialsException e) {
throw new MessagingException("Unable to authenticate to mailbox", e);
} catch (MailboxException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org