JAMES-2114 Remove LOGGER from mailboxSession API

apache · Aug 24, 2017 · 1ff0af0 · 1ff0af0
1 parent b305e55
commit 1ff0af0
Show file tree

Hide file tree

Showing 81 changed files with 360 additions and 483 deletions.
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
@@ -40,7 +40,6 @@
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MultimailboxesSearchQuery;
 import org.apache.james.mailbox.model.SimpleMailboxACL;
-import org.slf4j.Logger;
 
 import com.google.common.base.Optional;
 
@@ -260,20 +259,18 @@ enum SearchCapabilities {
     /**
      * Creates a new system session.<br>
      * A system session is intended to be used for programmatic access.<br>
-     * Use {@link #login(String, String, Logger)} when accessing this API from a
+     * Use {@link #login(String, String)} when accessing this API from a
      * protocol.
      * 
      * @param userName
      *            the name of the user whose session is being created
-     * @param log
-     *            context sensitive log
      * @return <code>MailboxSession</code>, not null
      * @throws BadCredentialsException
      *             when system access is not allowed for the given user
      * @throws MailboxException
      *             when the creation fails for other reasons
      */
-    MailboxSession createSystemSession(String userName, Logger log) throws BadCredentialsException, MailboxException;
+    MailboxSession createSystemSession(String userName) throws BadCredentialsException, MailboxException;
 
     /**
      * Autenticates the given user against the given password.<br>
@@ -283,16 +280,14 @@ enum SearchCapabilities {
      *            user name
      * @param passwd
      *            password supplied
-     * @param log
-     *            context sensitive log
      * @return a <code>MailboxSession</code> when the user is authenticated and
      *         authorized to access
      * @throws BadCredentialsException
      *             when system access is denied for the given user
      * @throws MailboxException
      *             when the creation fails for other reasons
      */
-    MailboxSession login(String userid, String passwd, Logger log) throws BadCredentialsException, MailboxException;
+    MailboxSession login(String userid, String passwd) throws BadCredentialsException, MailboxException;
 
     /**
      * Autenticates the given administrator against the given password,
@@ -305,16 +300,14 @@ enum SearchCapabilities {
      *            password supplied for the admin user
      * @param otherUserId
      *            user name of the real user
-     * @param log
-     *            context sensitive log
      * @return a <code>MailboxSession</code> for the real user
      *         when the admin is authenticated and authorized to access
      * @throws BadCredentialsException
      *             when system access is denied for the given user
      * @throws MailboxException
      *             when the creation fails for other reasons
      */
-    MailboxSession loginAsOtherUser(String adminUserId, String passwd, String otherUserId, Logger log) throws BadCredentialsException, MailboxException;
+    MailboxSession loginAsOtherUser(String adminUserId, String passwd, String otherUserId) throws BadCredentialsException, MailboxException;
 
     /**
      * <p>

diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java
@@ -24,8 +24,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.slf4j.Logger;
-
 /**
  * Mailbox session.
  */
@@ -75,13 +73,6 @@ enum SessionType {
      */
     void close();
 
-    /**
-     * Gets the logger for this session context.
-     * 
-     * @return not null
-     */
-    Logger getLog();
-
     /**
      * Gets the user executing this session.
      * 

diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java
@@ -39,7 +39,6 @@
 import org.apache.james.mailbox.model.MailboxPath;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -63,7 +62,7 @@ public void testStressTest() throws InterruptedException, MailboxException {
         final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS / 2);
         final List<MessageUid> uList = new ArrayList<>();
         final String username = "username";
-        MailboxSession session = mailboxManager.createSystemSession(username, LoggerFactory.getLogger("Test"));
+        MailboxSession session = mailboxManager.createSystemSession(username);
         mailboxManager.startProcessingRequest(session);
         final MailboxPath path = new MailboxPath(MailboxConstants.USER_NAMESPACE, username, "INBOX");
         mailboxManager.createMailbox(path, session);
@@ -101,7 +100,7 @@ public void event(Event event) {
 
 
                 try {
-                    MailboxSession mailboxSession = mailboxManager.createSystemSession(username, LoggerFactory.getLogger("Test"));
+                    MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
 
                     mailboxManager.startProcessingRequest(mailboxSession);
                     MessageManager m = mailboxManager.getMailbox(path, mailboxSession);