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:41 UTC
[16/38] james-project git commit: JAMES-2114 Remove LOGGER from
mailboxSession API
JAMES-2114 Remove LOGGER from mailboxSession API
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1ff0af09
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1ff0af09
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1ff0af09
Branch: refs/heads/master
Commit: 1ff0af09f6ccf52fdb172560a9496002dfccb129
Parents: b305e55
Author: benwa <bt...@linagora.com>
Authored: Mon Aug 14 17:16:07 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Aug 24 10:34:43 2017 +0700
----------------------------------------------------------------------
.../apache/james/mailbox/MailboxManager.java | 15 ++---
.../apache/james/mailbox/MailboxSession.java | 9 ---
.../james/mailbox/MailboxManagerStressTest.java | 5 +-
.../james/mailbox/MailboxManagerTest.java | 59 +++++++++---------
.../mailbox/manager/ManagerTestResources.java | 21 +++----
.../james/mailbox/mock/MockMailboxManager.java | 3 +-
.../james/mailbox/mock/MockMailboxSession.java | 5 --
.../CassandraMessageIdManagerTestSystem.java | 5 +-
.../mailbox/jcr/AbstractJCRScalingMapper.java | 10 ----
.../james/mailbox/jcr/JCRMailboxManager.java | 2 +-
.../james/mailbox/jcr/JCRMessageManager.java | 2 +-
.../mailbox/jcr/JCRSubscriptionManager.java | 6 +-
.../mailbox/jcr/mail/JCRMailboxMapper.java | 10 ++--
.../mailbox/jcr/mail/JCRMessageMapper.java | 26 ++++----
.../mailbox/jcr/mail/model/JCRMailbox.java | 34 +++++------
.../jcr/mail/model/JCRMailboxMessage.java | 63 ++++++++++----------
.../mailbox/jcr/mail/model/JCRProperty.java | 22 +++----
.../mailbox/jcr/user/JCRSubscriptionMapper.java | 4 +-
.../mailbox/jcr/user/model/JCRSubscription.java | 12 ++--
.../lucene/search/LuceneMessageSearchIndex.java | 5 +-
.../james/mailbox/maildir/MaildirFolder.java | 11 ++--
.../quota/InMemoryCurrentQuotaManager.java | 6 +-
.../mailbox/store/SimpleMailboxSession.java | 18 ++----
.../mailbox/store/StoreMailboxManager.java | 44 +++++++-------
.../mailbox/store/StoreMessageIdManager.java | 5 +-
.../store/event/SynchronousEventDelivery.java | 8 ++-
.../BroadcastDelegatingMailboxListener.java | 6 +-
.../RegisteredDelegatingMailboxListener.java | 16 ++---
.../dto/MailboxSessionDataTransferObject.java | 1 -
.../quota/ListeningCurrentQuotaUpdater.java | 10 +++-
.../store/search/LazyMessageSearchIndex.java | 6 +-
.../search/ListeningMessageSearchIndex.java | 13 ++--
.../mailbox/store/search/MessageSearches.java | 19 +++---
.../mailbox/store/GroupFolderResolverTest.java | 8 +--
.../mailbox/store/StoreMailboxManagerTest.java | 21 +++----
.../search/AbstractMessageSearchIndexTest.java | 9 +--
.../james/mailbox/copier/MailboxCopierImpl.java | 38 ++++--------
.../james/mailbox/indexer/ReIndexerImpl.java | 4 +-
.../james/mailbox/copier/MailboxCopierTest.java | 7 +--
.../mailbox/indexer/ReIndexerImplTest.java | 9 ++-
.../imapmailbox/MailboxCreationDelegate.java | 6 +-
.../imapmailbox/hbase/host/HBaseHostSystem.java | 3 +-
.../mpt/imapmailbox/jcr/host/JCRHostSystem.java | 3 +-
.../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 3 +-
.../host/LuceneSearchHostSystem.java | 3 +-
.../decode/base/AbstractImapCommandParser.java | 4 ++
.../imap/processor/AbstractAuthProcessor.java | 6 +-
.../processor/AbstractSelectionProcessor.java | 9 ++-
.../base/MailboxEventAnalyserTest.java | 17 ++----
.../apache/james/modules/MailboxProbeImpl.java | 17 +++---
.../org/apache/james/utils/JmapGuiceProbe.java | 8 +--
.../mailbox/MailboxManagerManagement.java | 10 ++--
.../container/spring/tool/James23Importer.java | 2 +-
.../james/transport/mailets/LocalDelivery.java | 2 +-
.../transport/mailets/ToRecipientFolder.java | 2 +-
.../james/transport/mailets/ToSenderFolder.java | 2 +-
.../mailets/delivery/MailboxAppender.java | 7 +--
.../matchers/AbstractStorageQuota.java | 2 +-
.../james/transport/matchers/IsOverQuota.java | 5 +-
.../mailets/delivery/LocalDeliveryTest.java | 2 +-
.../mailets/delivery/MailboxAppenderTest.java | 8 +--
.../mailets/delivery/ToRecipientFolderTest.java | 2 +-
.../transport/matchers/IsOverQuotaTest.java | 8 +--
.../jmap/AccessTokenAuthenticationStrategy.java | 2 +-
.../DefaultMailboxesProvisioningFilter.java | 2 +-
.../james/jmap/JWTAuthenticationStrategy.java | 5 +-
...ameterAccessTokenAuthenticationStrategy.java | 6 +-
.../james/jmap/send/PostDequeueDecorator.java | 2 +-
.../AccessTokenAuthenticationStrategyTest.java | 8 +--
...ltMailboxesProvisioningFilterThreadTest.java | 7 +--
.../jmap/JWTAuthenticationStrategyTest.java | 8 +--
...erAccessTokenAuthenticationStrategyTest.java | 5 +-
.../jmap/methods/GetMailboxesMethodTest.java | 27 ++++-----
.../james/jmap/model/MailboxFactoryTest.java | 6 +-
.../jmap/send/PostDequeueDecoratorTest.java | 25 ++++----
.../james/jmap/utils/MailboxUtilsTest.java | 6 +-
.../hook/MailboxDeliverToRecipientHandler.java | 2 +-
.../james/pop3server/core/PassCmdHandler.java | 2 +-
.../apache/james/pop3server/POP3ServerTest.java | 10 ++--
.../webadmin/service/UserMailboxesService.java | 10 ++--
.../routes/UserMailboxesRoutesTest.java | 2 +-
81 files changed, 360 insertions(+), 483 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxManager.java
----------------------------------------------------------------------
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
index 8e48df4..f93befa 100644
--- 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.MessageId;
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 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport {
/**
* 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,8 +280,6 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport {
* 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
@@ -292,7 +287,7 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport {
* @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,8 +300,6 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport {
* 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
@@ -314,7 +307,7 @@ public interface MailboxManager extends RequestAware, MailboxListenerSupport {
* @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>
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxSession.java
----------------------------------------------------------------------
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
index 55fbe88..4ac93a1 100644
--- 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.List;
import java.util.Locale;
import java.util.Map;
-import org.slf4j.Logger;
-
/**
* Mailbox session.
*/
@@ -76,13 +74,6 @@ public interface MailboxSession {
void close();
/**
- * Gets the logger for this session context.
- *
- * @return not null
- */
- Logger getLog();
-
- /**
* Gets the user executing this session.
*
* @return not null
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java
----------------------------------------------------------------------
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
index 41f9ab2..a1e7f25 100644
--- 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.MailboxConstants;
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 abstract class MailboxManagerStressTest {
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 abstract class MailboxManagerStressTest {
try {
- MailboxSession mailboxSession = mailboxManager.createSystemSession(username, LoggerFactory.getLogger("Test"));
+ MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
mailboxManager.startProcessingRequest(mailboxSession);
MessageManager m = mailboxManager.getMailbox(path, mailboxSession);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
index 2f4e808..0ccd355 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
@@ -45,7 +45,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -99,14 +98,14 @@ public abstract class MailboxManagerTest {
@Test
public void createUser1SystemSessionShouldReturnValidSession() throws UnsupportedEncodingException, MailboxException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
assertThat(session.getUser().getUserName()).isEqualTo(USER_1);
}
@Test
public void user1ShouldNotHaveAnInbox() throws UnsupportedEncodingException, MailboxException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
@@ -115,7 +114,7 @@ public abstract class MailboxManagerTest {
@Test
public void createMailboxShouldReturnRightId() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER_1, "name.subfolder");
@@ -128,7 +127,7 @@ public abstract class MailboxManagerTest {
@Test
public void user1ShouldBeAbleToCreateInbox() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
@@ -140,7 +139,7 @@ public abstract class MailboxManagerTest {
@Test
public void user1ShouldNotBeAbleToCreateInboxTwice() throws MailboxException, UnsupportedEncodingException {
expected.expect(MailboxException.class);
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -149,7 +148,7 @@ public abstract class MailboxManagerTest {
@Test
public void user1ShouldNotHaveTestSubmailbox() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
@@ -160,7 +159,7 @@ public abstract class MailboxManagerTest {
@Test
public void user1ShouldBeAbleToCreateTestSubmailbox() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -173,7 +172,7 @@ public abstract class MailboxManagerTest {
@Test
public void user1ShouldBeAbleToDeleteInbox() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
@@ -189,7 +188,7 @@ public abstract class MailboxManagerTest {
@Test
public void user1ShouldBeAbleToDeleteSubmailbox() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
MailboxPath inbox = MailboxPath.inbox(session);
@@ -205,7 +204,7 @@ public abstract class MailboxManagerTest {
@Test
public void closingSessionShouldWork() throws BadCredentialsException, MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.startProcessingRequest(session);
mailboxManager.logout(session, false);
@@ -216,7 +215,7 @@ public abstract class MailboxManagerTest {
@Test
public void listShouldReturnMailboxes() throws MailboxException, UnsupportedEncodingException {
- session = mailboxManager.createSystemSession("manager", LoggerFactory.getLogger("testList"));
+ session = mailboxManager.createSystemSession("manager");
mailboxManager.startProcessingRequest(session);
assertThat(mailboxManager.list(session)).hasSize(MockMailboxManager.EXPECTED_MAILBOXES_COUNT);
@@ -224,7 +223,7 @@ public abstract class MailboxManagerTest {
@Test
public void user2ShouldBeAbleToCreateRootlessFolder() throws BadCredentialsException, MailboxException {
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath trash = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER_2, "Trash");
mailboxManager.createMailbox(trash, session);
@@ -233,7 +232,7 @@ public abstract class MailboxManagerTest {
@Test
public void user2ShouldBeAbleToCreateNestedFoldersWithoutTheirParents() throws BadCredentialsException, MailboxException {
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath nestedFolder = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER_2, "INBOX.testfolder");
mailboxManager.createMailbox(nestedFolder, session);
@@ -244,7 +243,7 @@ public abstract class MailboxManagerTest {
@Test
public void searchShouldNotReturnResultsFromOtherNamespaces() throws Exception {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Namespace));
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.createMailbox(new MailboxPath("#namespace", USER_1, "Other"), session);
mailboxManager.createMailbox(MailboxPath.inbox(session), session);
List<MailboxMetaData> metaDatas = mailboxManager.search(new MailboxQuery(new MailboxPath("#private", USER_1, ""), "*", '.'), session);
@@ -254,7 +253,7 @@ public abstract class MailboxManagerTest {
@Test
public void searchShouldNotReturnResultsFromOtherUsers() throws Exception {
- session = mailboxManager.createSystemSession(USER_1, LoggerFactory.getLogger("Mock"));
+ session = mailboxManager.createSystemSession(USER_1);
mailboxManager.createMailbox(new MailboxPath("#namespace", USER_2, "Other"), session);
mailboxManager.createMailbox(MailboxPath.inbox(session), session);
List<MailboxMetaData> metaDatas = mailboxManager.search(new MailboxQuery(new MailboxPath("#private", USER_1, ""), "*", '.'), session);
@@ -265,7 +264,7 @@ public abstract class MailboxManagerTest {
@Test
public void updateAnnotationsShouldUpdateStoredAnnotation() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -278,7 +277,7 @@ public abstract class MailboxManagerTest {
@Test
public void updateAnnotationsShouldDeleteAnnotationWithNilValue() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -292,7 +291,7 @@ public abstract class MailboxManagerTest {
public void updateAnnotationsShouldThrowExceptionIfMailboxDoesNotExist() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
expected.expect(MailboxException.class);
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION));
@@ -301,7 +300,7 @@ public abstract class MailboxManagerTest {
@Test
public void getAnnotationsShouldReturnEmptyForNonStoredAnnotation() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -311,7 +310,7 @@ public abstract class MailboxManagerTest {
@Test
public void getAllAnnotationsShouldRetrieveStoredAnnotations() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -324,7 +323,7 @@ public abstract class MailboxManagerTest {
public void getAllAnnotationsShouldThrowExceptionIfMailboxDoesNotExist() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
expected.expect(MailboxException.class);
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.getAllAnnotations(inbox, session);
@@ -333,7 +332,7 @@ public abstract class MailboxManagerTest {
@Test
public void getAnnotationsByKeysShouldRetrieveStoresAnnotationsByKeys() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -347,7 +346,7 @@ public abstract class MailboxManagerTest {
public void getAnnotationsByKeysShouldThrowExceptionIfMailboxDoesNotExist() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
expected.expect(MailboxException.class);
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(PRIVATE_KEY));
@@ -356,7 +355,7 @@ public abstract class MailboxManagerTest {
@Test
public void getAnnotationsByKeysWithOneDepthShouldRetriveAnnotationsWithOneDepth() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -370,7 +369,7 @@ public abstract class MailboxManagerTest {
public void getAnnotationsByKeysWithAllDepthShouldThrowExceptionWhenMailboxDoesNotExist() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
expected.expect(MailboxException.class);
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY));
@@ -379,7 +378,7 @@ public abstract class MailboxManagerTest {
@Test
public void getAnnotationsByKeysWithAllDepthShouldRetriveAnnotationsWithAllDepth() throws BadCredentialsException, MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -393,7 +392,7 @@ public abstract class MailboxManagerTest {
public void updateAnnotationsShouldThrowExceptionIfAnnotationDataIsOverLimitation() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
expected.expect(AnnotationException.class);
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -403,7 +402,7 @@ public abstract class MailboxManagerTest {
@Test
public void shouldUpdateAnnotationWhenRequestCreatesNewAndMailboxIsNotOverLimit() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
@@ -419,7 +418,7 @@ public abstract class MailboxManagerTest {
public void updateAnnotationsShouldThrowExceptionIfRequestCreateNewButMailboxIsOverLimit() throws MailboxException {
Assume.assumeTrue(mailboxManager.hasCapability(MailboxCapabilities.Annotation));
expected.expect(MailboxException.class);
- session = mailboxManager.createSystemSession(USER_2, LoggerFactory.getLogger("Test"));
+ session = mailboxManager.createSystemSession(USER_2);
MailboxPath inbox = MailboxPath.inbox(session);
mailboxManager.createMailbox(inbox, session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
index 8df6b53..590c5aa 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/manager/ManagerTestResources.java
@@ -19,33 +19,30 @@
package org.apache.james.mailbox.manager;
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Calendar;
+
+import javax.mail.Flags;
+
import org.apache.james.mailbox.FlagsBuilder;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.mock.MockMail;
import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.quota.MaxQuotaManager;
+import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.mail.Flags;
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Calendar;
/**
* Provide an initialized Mailbox environment where we can run managers tests
*/
public class ManagerTestResources {
- private static final Logger LOG = LoggerFactory.getLogger(ManagerTestResources.class);
-
public static final String USER = "user@domain.org";
public static final String USER_PASS = "pass";
@@ -72,7 +69,7 @@ public class ManagerTestResources {
quotaRootResolver = integrationResources.createQuotaRootResolver(mailboxManager);
quotaManager = integrationResources.createQuotaManager(maxQuotaManager, mailboxManager);
integrationResources.init();
- session = mailboxManager.login(USER, USER_PASS, LOG);
+ session = mailboxManager.login(USER, USER_PASS);
inbox = MailboxPath.inbox(session);
subFolder = new MailboxPath(inbox, "INBOX.SUB");
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
index 23017e1..c0c4dd1 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
@@ -29,7 +29,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxPath;
-import org.slf4j.LoggerFactory;
/**
* A mock mailbox manager.
@@ -114,7 +113,7 @@ public class MockMailboxManager {
String folderName = "INBOX";
- MailboxSession mailboxSession = getMockMailboxManager().createSystemSession(user, LoggerFactory.getLogger("mailboxmanager-test"));
+ MailboxSession mailboxSession = getMockMailboxManager().createSystemSession(user);
mailboxPath = new MailboxPath("#private", user, folderName);
createMailbox(mailboxSession, mailboxPath);
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
index a622d09..0a01ab5 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
@@ -35,7 +35,6 @@ public class MockMailboxSession implements MailboxSession{
private final User user;
private boolean close;
private final Map<Object, Object> attrs = new HashMap<>();
- private final Logger log = LoggerFactory.getLogger("MockLog");
private final static Random RANDOM = new Random();
private final long sessionId = RANDOM.nextLong();
@@ -78,10 +77,6 @@ public class MockMailboxSession implements MailboxSession{
return attrs;
}
- public Logger getLog() {
- return log;
- }
-
public String getOtherUsersSpace() {
return null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java
index 2d4c6c1..e7561be 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMessageIdManagerTestSystem.java
@@ -43,8 +43,6 @@ 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.ListeningCurrentQuotaUpdater;
import org.apache.james.mailbox.store.quota.StoreCurrentQuotaManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
@@ -52,7 +50,6 @@ import com.google.common.base.Throwables;
public class CassandraMessageIdManagerTestSystem extends MessageIdManagerTestSystem {
private static final byte[] MESSAGE_CONTENT = "subject: any\n\nbody".getBytes(Charsets.UTF_8);
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraMessageIdManagerTestSystem.class);
public static MessageIdManagerTestSystem createTestingData(QuotaManager quotaManager, MailboxEventDispatcher dispatcher) throws Exception {
CassandraMailboxSessionMapperFactory mapperFactory = CassandraTestSystemFixture.createMapperFactory();
@@ -70,7 +67,7 @@ public class CassandraMessageIdManagerTestSystem extends MessageIdManagerTestSys
ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(
(StoreCurrentQuotaManager) currentQuotaManager,
mailboxManager.getQuotaRootResolver());
- mailboxManager.addGlobalListener(listeningCurrentQuotaUpdater, mailboxManager.createSystemSession("System", LOGGER));
+ mailboxManager.addGlobalListener(listeningCurrentQuotaUpdater, mailboxManager.createSystemSession("System"));
return new CassandraMessageIdManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, mailboxManager.getEventDispatcher()),
new CassandraMessageId.Factory(),
mapperFactory,
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
index 1750b81..a0c1521 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
@@ -26,7 +26,6 @@ import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.store.transaction.TransactionalMapper;
-import org.slf4j.Logger;
/**
* Abstract base class for Mapper's which support scaling. This supports Level 1 Implementations of JCR. So no real transaction management is used.
@@ -49,15 +48,6 @@ public abstract class AbstractJCRScalingMapper extends TransactionalMapper imple
this.mSession = mSession;
this.repository = repository;
}
-
- /**
- * Return the logger
- *
- * @return logger
- */
- protected Logger getLogger() {
- return mSession.getLog();
- }
/**
* Return the JCR Session
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
index e60ba33..c330140 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
@@ -83,7 +83,7 @@ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapCon
@Override
protected Mailbox doCreateMailbox(MailboxPath path, MailboxSession session) throws MailboxException {
- return new org.apache.james.mailbox.jcr.mail.model.JCRMailbox(path, randomUidValidity(), logger);
+ return new org.apache.james.mailbox.jcr.mail.model.JCRMailbox(path, randomUidValidity());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
index ee76bab..7307087 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
@@ -69,7 +69,7 @@ public class JCRMessageManager extends StoreMessageManager {
protected MailboxMessage createMessage(Date internalDate, int size, int bodyStartOctet, SharedInputStream content, Flags flags, PropertyBuilder propertyBuilder, List<MessageAttachment> attachments) throws MailboxException{
JCRId mailboxId = (JCRId) getMailboxEntity().getMailboxId();
return new JCRMailboxMessage(mailboxId, getMessageIdFactory().generate(), internalDate,
- size, flags, content, bodyStartOctet, propertyBuilder, log);
+ size, flags, content, bodyStartOctet, propertyBuilder);
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
index 7c5827b..bf4960d 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
@@ -22,15 +22,11 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.jcr.user.model.JCRSubscription;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.user.model.Subscription;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* JCR implementation of a SubscriptionManager
*/
public class JCRSubscriptionManager extends StoreSubscriptionManager implements JCRImapConstants {
-
- private final Logger logger = LoggerFactory.getLogger(JCRSubscriptionManager.class);
public JCRSubscriptionManager(JCRMailboxSessionMapperFactory mapperFactory) {
super(mapperFactory);
@@ -38,6 +34,6 @@ public class JCRSubscriptionManager extends StoreSubscriptionManager implements
@Override
protected Subscription createSubscription(MailboxSession session, String mailbox) {
- return new JCRSubscription(session.getUser().getUserName(), mailbox, logger);
+ return new JCRSubscription(session.getUser().getUserName(), mailbox);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
index 0e0be80..901a268 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
@@ -52,7 +52,7 @@ import org.apache.james.mailbox.store.mail.model.Mailbox;
*/
public class JCRMailboxMapper extends AbstractJCRScalingMapper implements MailboxMapper {
- @SuppressWarnings("deprecation")
+ @SuppressWarnings("deprecation")
private static final String XPATH_LANGUAGE = Query.XPATH;
public JCRMailboxMapper(MailboxSessionJCRRepository repos, MailboxSession session, int scaling) {
@@ -99,7 +99,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator it = result.getNodes();
if (it.hasNext()) {
- return new JCRMailbox(it.nextNode(), getLogger());
+ return new JCRMailbox(it.nextNode());
}
throw new MailboxNotFoundException(path);
} catch (PathNotFoundException e) {
@@ -113,7 +113,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
public Mailbox findMailboxById(MailboxId id) throws MailboxException, MailboxNotFoundException {
try {
Node node = getSession().getNodeByIdentifier(id.serialize());
- return new JCRMailbox(node, getLogger());
+ return new JCRMailbox(node);
} catch (PathNotFoundException e) {
throw new MailboxNotFoundException(id.serialize());
} catch (RepositoryException e) {
@@ -142,7 +142,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator it = result.getNodes();
while (it.hasNext()) {
- mailboxList.add(new JCRMailbox(it.nextNode(), getLogger()));
+ mailboxList.add(new JCRMailbox(it.nextNode()));
}
} catch (PathNotFoundException e) {
// nothing todo
@@ -242,7 +242,7 @@ public class JCRMailboxMapper extends AbstractJCRScalingMapper implements Mailbo
QueryResult result = manager.createQuery(queryString, XPATH_LANGUAGE).execute();
NodeIterator it = result.getNodes();
while (it.hasNext()) {
- mList.add(new JCRMailbox(it.nextNode(), getLogger()));
+ mList.add(new JCRMailbox(it.nextNode()));
}
return mList;
} catch (RepositoryException e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
index e721389..8eac455 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
@@ -56,6 +56,8 @@ import org.apache.james.mailbox.store.mail.UidProvider;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.utils.ApplicableFlagCalculator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JCR implementation of a {@link MessageMapper}. The implementation store each
@@ -64,6 +66,8 @@ import org.apache.james.mailbox.store.mail.utils.ApplicableFlagCalculator;
*/
public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapConstants {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JCRMessageMapper.class);
+
@SuppressWarnings("deprecation")
private static final String XPATH_LANGUAGE = Query.XPATH;
@@ -349,7 +353,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()).getUid());
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER).getUid());
}
return list;
@@ -372,7 +376,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
if (iterator.hasNext()) {
- return new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()).getUid();
+ return new JCRMailboxMessage(iterator.nextNode(), LOGGER).getUid();
} else {
return null;
}
@@ -444,7 +448,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
// A copy of a message is recent
// See MAILBOX-85
node.setProperty(JCRMailboxMessage.RECENT_PROPERTY, true);
- return new SimpleMessageMetaData(new JCRMailboxMessage(node, mailboxSession.getLog()));
+ return new SimpleMessageMetaData(new JCRMailboxMessage(node, LOGGER));
} catch (RepositoryException e) {
throw new MailboxException("Unable to copy message " + original + " in mailbox " + mailbox, e);
}
@@ -565,7 +569,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER));
}
return list;
}
@@ -582,7 +586,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
QueryResult result = query.execute();
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER));
}
return list;
}
@@ -602,7 +606,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER));
}
return list;
}
@@ -621,7 +625,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER));
}
return list;
}
@@ -638,7 +642,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER));
}
return list;
}
@@ -655,7 +659,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- JCRMailboxMessage member = new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog());
+ JCRMailboxMessage member = new JCRMailboxMessage(iterator.nextNode(), LOGGER);
list.add(member);
}
return list;
@@ -673,7 +677,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- list.add(new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog()));
+ list.add(new JCRMailboxMessage(iterator.nextNode(), LOGGER));
}
return list;
}
@@ -689,7 +693,7 @@ public class JCRMessageMapper extends AbstractMessageMapper implements JCRImapCo
NodeIterator iterator = result.getNodes();
while (iterator.hasNext()) {
- JCRMailboxMessage member = new JCRMailboxMessage(iterator.nextNode(), mailboxSession.getLog());
+ JCRMailboxMessage member = new JCRMailboxMessage(iterator.nextNode(), LOGGER);
list.add(member);
}
return list;
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
index 7b570d5..21b3ff5 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
@@ -34,6 +34,7 @@ import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.MailboxUtil;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,6 +42,8 @@ import org.slf4j.Logger;
*/
public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
+ private static final Logger LOGGER = LoggerFactory.getLogger(JCRMailbox.class);
+
private static final String TAB = " ";
@@ -53,7 +56,6 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
private String name;
private long uidValidity;
- private final Logger logger;
private Node node;
@@ -63,21 +65,15 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
private long highestKnownModSeq;
- public JCRMailbox( final MailboxPath path, long uidValidity, Logger logger) {
+ public JCRMailbox(final MailboxPath path, long uidValidity) {
this.name = path.getName();
this.namespace = path.getNamespace();
this.user = path.getUser();
this.uidValidity = uidValidity;
- this.logger = logger;
}
- public JCRMailbox( final Node node, Logger logger) {
+ public JCRMailbox(final Node node) {
this.node = node;
- this.logger = logger;
- }
-
- public Logger getLog() {
- return logger;
}
@Override
@@ -94,7 +90,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
return node.getProperty(NAME_PROPERTY).getString();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + NAME_PROPERTY, e);
+ LOGGER.error("Unable to access property " + NAME_PROPERTY, e);
}
}
return name;
@@ -109,7 +105,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
return node.getProperty(UIDVALIDITY_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + UIDVALIDITY_PROPERTY, e);
+ LOGGER.error("Unable to access property " + UIDVALIDITY_PROPERTY, e);
}
}
return uidValidity;
@@ -127,7 +123,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
// See https://issues.apache.org/jira/browse/IMAP-162
node.getSession().move(node.getPath(), node.getParent().getPath() + NODE_DELIMITER + Text.escapePath(name));
} catch (RepositoryException e) {
- logger.error("Unable to access property " + NAME_PROPERTY, e);
+ LOGGER.error("Unable to access property " + NAME_PROPERTY, e);
}
} else {
this.name = name;
@@ -211,7 +207,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
return JCRId.of(node.getIdentifier());
} catch (RepositoryException e) {
- logger.error("Unable to access property " + JcrConstants.JCR_UUID, e);
+ LOGGER.error("Unable to access property " + JcrConstants.JCR_UUID, e);
}
}
return null;
@@ -230,7 +226,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
return node.getProperty(NAMESPACE_PROPERTY).getString();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + NAMESPACE_PROPERTY, e);
+ LOGGER.error("Unable to access property " + NAMESPACE_PROPERTY, e);
}
}
return namespace;
@@ -250,7 +246,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
return user;
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + USER_PROPERTY, e);
+ LOGGER.error("Unable to access property " + USER_PROPERTY, e);
}
}
return user;
@@ -265,7 +261,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
node.setProperty(NAMESPACE_PROPERTY, namespace);
} catch (RepositoryException e) {
- logger.error("Unable to access property " + NAMESPACE_PROPERTY, e);
+ LOGGER.error("Unable to access property " + NAMESPACE_PROPERTY, e);
}
} else {
this.namespace = namespace;
@@ -285,7 +281,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
}
node.setProperty(USER_PROPERTY, user);
} catch (RepositoryException e) {
- logger.error("Unable to access property " + NAME_PROPERTY, e);
+ LOGGER.error("Unable to access property " + NAME_PROPERTY, e);
}
} else {
this.user = user;
@@ -297,7 +293,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
return node.getProperty(LASTUID_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + LASTUID_PROPERTY, e);
+ LOGGER.error("Unable to access property " + LASTUID_PROPERTY, e);
}
}
return lastKnownUid;
@@ -308,7 +304,7 @@ public class JCRMailbox implements Mailbox, JCRImapConstants, Persistent{
try {
return node.getProperty(HIGHESTMODSEQ_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + HIGHESTMODSEQ_PROPERTY, e);
+ LOGGER.error("Unable to access property " + HIGHESTMODSEQ_PROPERTY, e);
}
}
return highestKnownModSeq;
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java
index 2e7c233..9bc69f3 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailboxMessage.java
@@ -54,15 +54,17 @@ import org.apache.james.mailbox.store.mail.model.Property;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.comparator.UidComparator;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.github.steveash.guavate.Guavate;
public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Persistent {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JCRMailboxMessage.class);
+
private static final Comparator<MailboxMessage> MESSAGE_UID_COMPARATOR = new UidComparator();
private Node node;
- private final Logger logger;
private SharedInputStream content;
private String mediaType;
private Long textualLineCount;
@@ -108,18 +110,16 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
public final static String MODSEQ_PROPERTY = "jamesMailbox:modSeq";
public JCRMailboxMessage(Node node, Logger logger) {
- this.logger= logger;
this.node = node;
}
public JCRMailboxMessage(JCRId mailboxUUID, MessageId messageId, Date internalDate, int size, Flags flags, SharedInputStream content,
- int bodyStartOctet, PropertyBuilder propertyBuilder, Logger logger) {
+ int bodyStartOctet, PropertyBuilder propertyBuilder) {
super();
this.mailboxUUID = mailboxUUID;
this.messageId = messageId;
this.internalDate = internalDate;
this.size = size;
- this.logger = logger;
setFlags(flags);
this.content = content;
@@ -130,7 +130,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
final List<Property> properties = propertyBuilder.toProperties();
this.properties = new ArrayList<>(properties.size());
for (Property property:properties) {
- this.properties.add(new JCRProperty(property,logger));
+ this.properties.add(new JCRProperty(property));
}
}
@@ -138,7 +138,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
/**
* Create a copy of the given message
*/
- public JCRMailboxMessage(JCRId mailboxUUID, MessageUid uid, MessageId messageId, long modSeq, JCRMailboxMessage message, Logger logger) throws MailboxException {
+ public JCRMailboxMessage(JCRId mailboxUUID, MessageUid uid, MessageId messageId, long modSeq, JCRMailboxMessage message) throws MailboxException {
this.mailboxUUID = mailboxUUID;
this.messageId = messageId;
this.internalDate = message.getInternalDate();
@@ -146,7 +146,6 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
setFlags(message.createFlags());
this.uid = uid;
this.modSeq = modSeq;
- this.logger = logger;
try {
this.content = new SharedByteArrayInputStream(IOUtils.toByteArray(message.getFullContent()));
} catch (IOException e) {
@@ -162,7 +161,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
final List<Property> properties = pBuilder.toProperties();
this.properties = new ArrayList<>(properties.size());
for (Property property:properties) {
- this.properties.add(new JCRProperty(property, logger));
+ this.properties.add(new JCRProperty(property));
}
}
@@ -181,7 +180,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return node.getProperty(SIZE_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to retrieve property " + SIZE_PROPERTY, e);
+ LOGGER.error("Unable to retrieve property " + SIZE_PROPERTY, e);
}
return 0;
@@ -195,7 +194,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return node.getNode(JcrConstants.JCR_CONTENT).getProperty(JcrConstants.JCR_MIMETYPE).getString();
} catch (RepositoryException e) {
- logger.error("Unable to retrieve node " + JcrConstants.JCR_MIMETYPE, e);
+ LOGGER.error("Unable to retrieve node " + JcrConstants.JCR_MIMETYPE, e);
}
return null;
}
@@ -209,11 +208,11 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
List<Property> properties = new ArrayList<>();
NodeIterator nodeIt = node.getNodes("messageProperty");
while (nodeIt.hasNext()) {
- properties.add(new JCRProperty(nodeIt.nextNode(), logger));
+ properties.add(new JCRProperty(nodeIt.nextNode()));
}
return properties;
} catch (RepositoryException e) {
- logger.error("Unable to retrieve nodes messageProperty", e);
+ LOGGER.error("Unable to retrieve nodes messageProperty", e);
}
}
return new ArrayList<>(properties);
@@ -225,7 +224,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return node.getProperty(SUBTYPE_PROPERTY).getString();
} catch (RepositoryException e) {
- logger.error("Unable to retrieve node " + SUBTYPE_PROPERTY, e);
+ LOGGER.error("Unable to retrieve node " + SUBTYPE_PROPERTY, e);
}
return null;
}
@@ -245,7 +244,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return node.getProperty(TEXTUAL_LINE_COUNT_PROPERTY).getLong();
}
} catch (RepositoryException e) {
- logger.error("Unable to retrieve property " + TEXTUAL_LINE_COUNT_PROPERTY, e);
+ LOGGER.error("Unable to retrieve property " + TEXTUAL_LINE_COUNT_PROPERTY, e);
}
return null;
@@ -268,7 +267,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return node.getIdentifier();
} catch (RepositoryException e) {
- logger.error("Unable to access UUID", e);
+ LOGGER.error("Unable to access UUID", e);
}
}
return null;
@@ -318,7 +317,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
List<Property> currentProperties = getProperties();
List<Property> newProperties = currentProperties.stream()
- .map(prop -> new JCRProperty(prop, logger))
+ .map(JCRProperty::new)
.collect(Guavate.toImmutableList());
// remove old properties, we will add a bunch of new ones
NodeIterator iterator = node.getNodes("messageProperty");
@@ -343,7 +342,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return (int)node.getProperty(BODY_START_OCTET_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to retrieve property " + TEXTUAL_LINE_COUNT_PROPERTY, e);
+ LOGGER.error("Unable to retrieve property " + TEXTUAL_LINE_COUNT_PROPERTY, e);
}
return 0;
@@ -402,7 +401,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + FLAGGED_PROPERTY,
+ LOGGER.error("Unable to access property " + FLAGGED_PROPERTY,
e);
}
return null;
@@ -416,7 +415,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return JCRId.of(node.getProperty(MAILBOX_UUID_PROPERTY).getString());
} catch (RepositoryException e) {
- logger.error("Unable to access property "
+ LOGGER.error("Unable to access property "
+ MAILBOX_UUID_PROPERTY, e);
}
}
@@ -431,7 +430,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return MessageUid.of(node.getProperty(UID_PROPERTY).getLong());
} catch (RepositoryException e) {
- logger.error("Unable to access property " + UID_PROPERTY, e);
+ LOGGER.error("Unable to access property " + UID_PROPERTY, e);
}
return MessageUid.MIN_VALUE;
}
@@ -447,7 +446,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + ANSWERED_PROPERTY,
+ LOGGER.error("Unable to access property " + ANSWERED_PROPERTY,
e);
}
return false;
@@ -464,7 +463,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + DELETED_PROPERTY,
+ LOGGER.error("Unable to access property " + DELETED_PROPERTY,
e);
}
return false;
@@ -480,7 +479,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return node.getProperty(DRAFT_PROPERTY).getBoolean();
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + DRAFT_PROPERTY, e);
+ LOGGER.error("Unable to access property " + DRAFT_PROPERTY, e);
}
return false;
}
@@ -495,7 +494,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return node.getProperty(FLAGGED_PROPERTY).getBoolean();
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + FLAGGED_PROPERTY,
+ LOGGER.error("Unable to access property " + FLAGGED_PROPERTY,
e);
}
return false;
@@ -511,7 +510,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return node.getProperty(RECENT_PROPERTY).getBoolean();
}
} catch (RepositoryException e) {
- logger.error("Unable to access property " + RECENT_PROPERTY, e);
+ LOGGER.error("Unable to access property " + RECENT_PROPERTY, e);
}
return false;
}
@@ -525,7 +524,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return node.getProperty(SEEN_PROPERTY).getBoolean();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + SEEN_PROPERTY, e);
+ LOGGER.error("Unable to access property " + SEEN_PROPERTY, e);
}
return false;
}
@@ -550,7 +549,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
flags.contains(Flags.Flag.SEEN));
node.setProperty(USERFLAGS_PROPERTY, flags.getUserFlags());
} catch (RepositoryException e) {
- logger.error("Unable to set flags", e);
+ LOGGER.error("Unable to set flags", e);
}
} else {
answered = flags.contains(Flags.Flag.ANSWERED);
@@ -574,7 +573,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
node.setProperty(RECENT_PROPERTY, false);
} catch (RepositoryException e) {
- logger.error("Unable to access property " + RECENT_PROPERTY, e);
+ LOGGER.error("Unable to access property " + RECENT_PROPERTY, e);
}
} else {
recent = false;
@@ -587,7 +586,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
return node.getIdentifier();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + JcrConstants.JCR_UUID, e);
+ LOGGER.error("Unable to access property " + JcrConstants.JCR_UUID, e);
}
}
return null;
@@ -648,7 +647,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
return node.getProperty(MODSEQ_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to access property " + MODSEQ_PROPERTY, e);
+ LOGGER.error("Unable to access property " + MODSEQ_PROPERTY, e);
}
return 0;
}
@@ -661,7 +660,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
node.setProperty(MODSEQ_PROPERTY, modSeq);
} catch (RepositoryException e) {
- logger.error("Unable to set mod-sequence", e);
+ LOGGER.error("Unable to set mod-sequence", e);
}
} else {
this.modSeq = modSeq;
@@ -674,7 +673,7 @@ public class JCRMailboxMessage implements MailboxMessage, JCRImapConstants, Pers
try {
node.setProperty(UID_PROPERTY, uid.asLong());
} catch (RepositoryException e) {
- logger.error("Unable to set uid", e);
+ LOGGER.error("Unable to set uid", e);
}
} else {
this.uid = uid;
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
index 156af51..2233417 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
@@ -25,6 +25,7 @@ import org.apache.james.mailbox.jcr.JCRImapConstants;
import org.apache.james.mailbox.jcr.Persistent;
import org.apache.james.mailbox.store.mail.model.Property;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JCR implementation of {@link Property}
@@ -32,8 +33,9 @@ import org.slf4j.Logger;
*/
public class JCRProperty implements JCRImapConstants, Persistent, Property {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JCRProperty.class);
+
private Node node;
- private final Logger logger;
private String namespace;
private String localName;
private String value;
@@ -44,20 +46,18 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
public final static String VALUE_PROPERTY = "jamesMailbox:propertyValue";
public final static String ORDER_PROPERTY = "jamesMailbox:propertyOrder";
- public JCRProperty(Node node, Logger logger) {
+ public JCRProperty(Node node) {
this.node = node;
- this.logger = logger;
}
- public JCRProperty(String namespace, String localName, String value, Logger logger) {
+ public JCRProperty(String namespace, String localName, String value) {
this.namespace = namespace;
this.localName = localName;
this.value = value;
- this.logger = logger;
}
- public JCRProperty(Property property, Logger logger) {
- this(property.getNamespace(), property.getLocalName(), property.getValue(), logger);
+ public JCRProperty(Property property) {
+ this(property.getNamespace(), property.getLocalName(), property.getValue());
}
/*
* (non-Javadoc)
@@ -71,7 +71,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
try {
return (int)node.getProperty(ORDER_PROPERTY).getLong();
} catch (RepositoryException e) {
- logger.error("Unable to access Property " + ORDER_PROPERTY, e);
+ LOGGER.error("Unable to access Property " + ORDER_PROPERTY, e);
}
return 0;
}
@@ -97,7 +97,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
try {
return node.getProperty(LOCALNAME_PROPERTY).getString();
} catch (RepositoryException e) {
- logger.error("Unable to access Property " + LOCALNAME_PROPERTY, e);
+ LOGGER.error("Unable to access Property " + LOCALNAME_PROPERTY, e);
}
return null;
}
@@ -114,7 +114,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
try {
return node.getProperty(NAMESPACE_PROPERTY).getString();
} catch (RepositoryException e) {
- logger.error("Unable to access Property " + NAMESPACE_PROPERTY, e);
+ LOGGER.error("Unable to access Property " + NAMESPACE_PROPERTY, e);
}
return null;
}
@@ -131,7 +131,7 @@ public class JCRProperty implements JCRImapConstants, Persistent, Property {
try {
return node.getProperty(VALUE_PROPERTY).getString();
} catch (RepositoryException e) {
- logger.error("Unable to access Property " + VALUE_PROPERTY, e);
+ LOGGER.error("Unable to access Property " + VALUE_PROPERTY, e);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
index f83ac54..8f592f9 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
@@ -107,7 +107,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S
NodeIterator nodeIt = result.getNodes();
if (nodeIt.hasNext()) {
- return new JCRSubscription(nodeIt.nextNode(), mailbox, getLogger());
+ return new JCRSubscription(nodeIt.nextNode(), mailbox);
}
} catch (PathNotFoundException e) {
@@ -140,7 +140,7 @@ public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements S
if (node.hasProperty(JCRSubscription.MAILBOXES_PROPERTY)) {
Value[] values = node.getProperty(JCRSubscription.MAILBOXES_PROPERTY).getValues();
for (Value value : values) {
- subList.add(new JCRSubscription(node, value.getString(), getLogger()));
+ subList.add(new JCRSubscription(node, value.getString()));
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
index 18616d8..aa97c07 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
@@ -31,32 +31,32 @@ import org.apache.james.mailbox.jcr.JCRImapConstants;
import org.apache.james.mailbox.jcr.Persistent;
import org.apache.james.mailbox.store.user.model.Subscription;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JCR implementation of a {@link Subscription}.
*/
public class JCRSubscription implements Subscription, Persistent, JCRImapConstants {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JCRSubscription.class);
+
private static final String TOSTRING_SEPARATOR = " ";
public final static String USERNAME_PROPERTY = "jamesMailbox:user";
public final static String MAILBOXES_PROPERTY = "jamesMailbox:subscriptionMailboxes";
private Node node;
- private final Logger log;
private final String mailbox;
private String username;
- public JCRSubscription(Node node, String mailbox, Logger log) {
+ public JCRSubscription(Node node, String mailbox) {
this.node = node;
- this.log = log;
this.mailbox = mailbox;
}
- public JCRSubscription(String username, String mailbox, Logger log) {
+ public JCRSubscription(String username, String mailbox) {
this.username = username;
this.mailbox = mailbox;
- this.log = log;
}
/*
@@ -78,7 +78,7 @@ public class JCRSubscription implements Subscription, Persistent, JCRImapConstan
try {
return node.getProperty(USERNAME_PROPERTY).getString();
} catch (RepositoryException e) {
- log.error("Unable to access Property " + USERNAME_PROPERTY, e);
+ LOGGER.error("Unable to access Property " + USERNAME_PROPERTY, e);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
index 2acaa37..319ad7d 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
@@ -119,6 +119,8 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@ -134,6 +136,7 @@ import com.google.common.collect.ImmutableSet;
* @param
*/
public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LuceneMessageSearchIndex.class);
private final static Date MAX_DATE;
private final static Date MIN_DATE;
@@ -603,7 +606,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
sentDate = cal.getTime();
} catch (org.apache.james.mime4j.field.datetime.parser.ParseException e) {
- session.getLog().debug("Unable to parse Date header for proper indexing", e);
+ LOGGER.debug("Unable to parse Date header for proper indexing", e);
// This should never happen anyway fallback to the already parsed field
sentDate = ((DateTimeField) f).getDate();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
index a7fc8f7..dd1ee8e 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
@@ -52,10 +52,13 @@ import org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey;
import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.SimpleMailboxACL;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
public class MaildirFolder {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MaildirFolder.class);
public static final String VALIDITY_FILE = "james-uidvalidity";
public static final String UIDLIST_FILE = "james-uidlist";
@@ -343,7 +346,7 @@ public class MaildirFolder {
int gap = line.indexOf(" ");
if (gap == -1) {
// there must be some issues in the file if no gap can be found
- session.getLog().info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++);
+ LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++);
continue;
}
@@ -509,7 +512,7 @@ public class MaildirFolder {
if (gap == -1) {
// there must be some issues in the file if no gap can be found
// there must be some issues in the file if no gap can be found
- session.getLog().info("Corrupted entry in uid-file " + uidList + " line " + lines.size());
+ LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lines.size());
continue;
}
@@ -636,7 +639,7 @@ public class MaildirFolder {
if (gap == -1) {
// there must be some issues in the file if no gap can be found
- session.getLog().info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++);
+ LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++);
continue;
}
@@ -860,7 +863,7 @@ public class MaildirFolder {
int gap = line.indexOf(" ");
if (gap == -1) {
// there must be some issues in the file if no gap can be found
- session.getLog().info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++);
+ LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++);
continue;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ff0af09/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
index f378d7f..4dbdc20 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
@@ -30,8 +30,6 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator;
import org.apache.james.mailbox.store.quota.StoreCurrentQuotaManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheBuilder;
@@ -40,8 +38,6 @@ import com.google.common.cache.LoadingCache;
public class InMemoryCurrentQuotaManager implements StoreCurrentQuotaManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(InMemoryCurrentQuotaManager.class);
-
private final LoadingCache<QuotaRoot, Entry> quotaCache;
@Inject
@@ -49,7 +45,7 @@ public class InMemoryCurrentQuotaManager implements StoreCurrentQuotaManager {
this.quotaCache = CacheBuilder.newBuilder().build(new CacheLoader<QuotaRoot, Entry>() {
@Override
public Entry load(QuotaRoot quotaRoot) throws Exception {
- return new Entry(quotaCalculator.recalculateCurrentQuotas(quotaRoot, mailboxManager.createSystemSession(quotaRoot.getValue(), LOGGER)));
+ return new Entry(quotaCalculator.recalculateCurrentQuotas(quotaRoot, mailboxManager.createSystemSession(quotaRoot.getValue())));
}
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org