[prev in list] [next in list] [prev in thread] [next in thread]
List: james-dev
Subject: [3/5] james-project git commit: JAMES-2344 QuotaRoot is part of mailbox-api and should not require a
From: rouazana () apache ! org
Date: 2018-02-27 13:27:43
Message-ID: 35dd45d789f6494cadd75125ccc38055 () git ! apache ! org
[Download RAW message or body]
JAMES-2344 QuotaRoot is part of mailbox-api and should not require an implementation \
project to create instances
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/159886f0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/159886f0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/159886f0
Branch: refs/heads/master
Commit: 159886f08bcd73adb2ef43938f0bca014566e43d
Parents: dbe65ce
Author: Matthieu Baechler <matthieu@apache.org>
Authored: Tue Feb 20 16:00:28 2018 +0100
Committer: Matthieu Baechler <matthieu@apache.org>
Committed: Tue Feb 27 09:59:23 2018 +0100
----------------------------------------------------------------------
.../apache/james/mailbox/model/QuotaRoot.java | 29 ++++++++++-
.../quota/InMemoryCurrentQuotaManagerTest.java | 3 +-
.../store/quota/DefaultQuotaRootResolver.java | 4 +-
.../mailbox/store/quota/QuotaRootImpl.java | 55 --------------------
.../quota/DefaultQuotaRootResolverTest.java | 4 +-
.../store/quota/GenericMaxQuotaManagerTest.java | 2 +-
.../quota/ListeningCurrentQuotaUpdaterTest.java | 2 +-
.../mailbox/store/quota/QuotaCheckerTest.java | 2 +-
.../quota/StoreCurrentQuotaManagerTest.java | 2 +-
.../store/quota/StoreQuotaManagerTest.java | 2 +-
.../imap/processor/GetQuotaProcessorTest.java | 3 +-
.../processor/GetQuotaRootProcessorTest.java | 3 +-
.../james/cli/QuotaCommandsIntegrationTest.java | 3 +-
13 files changed, 40 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java \
b/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java index \
ad181d2..885540b 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/QuotaRoot.java
@@ -19,11 +19,36 @@
package org.apache.james.mailbox.model;
+import com.google.common.base.Objects;
+
/**
* Represents RFC 2087 Quota root
*/
-public interface QuotaRoot {
+public class QuotaRoot {
+
+ public static QuotaRoot quotaRoot(String value) {
+ return new QuotaRoot(value);
+ }
+
+ private final String value;
+
+ private QuotaRoot(String value) {
+ this.value = value;
+ }
+
+ public boolean equals(Object o) {
+ if (o == null || !(o instanceof QuotaRoot)) {
+ return false;
+ }
+ return value.equals(((QuotaRoot) o).getValue());
+ }
+
+ public int hashCode() {
+ return Objects.hashCode(value);
+ }
- String getValue();
+ public String getValue() {
+ return value;
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/memory/src/ \
test/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManagerTest.java \
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManagerTest.java
index 9a82bc7..abc5cdb 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManagerTest.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManagerTest.java
@@ -26,13 +26,12 @@ import static org.mockito.Mockito.when;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator;
-import org.apache.james.mailbox.store.quota.QuotaRootImpl;
import org.junit.Before;
import org.junit.Test;
public class InMemoryCurrentQuotaManagerTest {
- public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa");
+ public static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa");
private InMemoryCurrentQuotaManager testee;
private CurrentQuotaCalculator mockedCurrentQuotaCalculator;
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolver.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolver.java \
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolver.java
index 793c854..3125b6f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolver.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolver.java
@@ -48,14 +48,14 @@ public class DefaultQuotaRootResolver implements \
QuotaRootResolver {
@Override
public QuotaRoot createQuotaRoot(String quotaRootValue) {
- return QuotaRootImpl.quotaRoot(quotaRootValue);
+ return QuotaRoot.quotaRoot(quotaRootValue);
}
@Override
public QuotaRoot getQuotaRoot(MailboxPath mailboxPath) throws MailboxException {
Preconditions.checkArgument(!mailboxPath.getNamespace().contains(SEPARATOR), \
"Namespace should not contain " + SEPARATOR);
Preconditions.checkArgument(!mailboxPath.getUser().contains(SEPARATOR), \
"Username should not contain " + SEPARATOR);
- return QuotaRootImpl.quotaRoot(mailboxPath.getNamespace() + SEPARATOR + \
mailboxPath.getUser()); + return \
QuotaRoot.quotaRoot(mailboxPath.getNamespace() + SEPARATOR + mailboxPath.getUser()); \
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java \
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java \
deleted file mode 100644 index 6ef8e4e..0000000
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/QuotaRootImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailbox.store.quota;
-
-import org.apache.james.mailbox.model.QuotaRoot;
-
-import com.google.common.base.Objects;
-
-public class QuotaRootImpl implements QuotaRoot {
-
- public static QuotaRoot quotaRoot(String value) {
- return new QuotaRootImpl(value);
- }
-
- private final String value;
-
- private QuotaRootImpl(String value) {
- this.value = value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (o == null || !(o instanceof QuotaRoot)) {
- return false;
- }
- return value.equals(((QuotaRoot) o).getValue());
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(value);
- }
-
- public String getValue() {
- return value;
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java \
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java
index bc18ae8..89c46da 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/DefaultQuotaRootResolverTest.java
@@ -41,7 +41,7 @@ public class DefaultQuotaRootResolverTest {
public static final MailboxPath PATH_LIKE = MailboxPath.forUser("benwa", "%");
public static final MailboxPath MAILBOX_PATH_2 = MailboxPath.forUser("benwa", \
"test");
public static final SimpleMailbox MAILBOX_2 = new SimpleMailbox(MAILBOX_PATH_2, \
10);
- public static final QuotaRoot QUOTA_ROOT = \
QuotaRootImpl.quotaRoot("#private&benwa"); + public static final QuotaRoot \
QUOTA_ROOT = QuotaRoot.quotaRoot("#private&benwa");
private DefaultQuotaRootResolver testee;
private MailboxSessionMapperFactory mockedFactory;
@@ -77,7 +77,7 @@ public class DefaultQuotaRootResolverTest {
@Test(expected = MailboxException.class)
public void retrieveAssociatedMailboxesShouldThrowWhenQuotaRootNotContainsSeparator2Times() \
throws Exception {
- testee.retrieveAssociatedMailboxes(QuotaRootImpl.quotaRoot("#private&be&nwa"), \
null); + testee.retrieveAssociatedMailboxes(QuotaRoot.quotaRoot("#private&be&nwa"), \
null); }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java \
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java
index e0de93a..148a899 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/GenericMaxQuotaManagerTest.java
@@ -37,7 +37,7 @@ public abstract class GenericMaxQuotaManagerTest {
@Before
public void setUp() {
maxQuotaManager = provideMaxQuotaManager();
- quotaRoot = QuotaRootImpl.quotaRoot("benwa");
+ quotaRoot = QuotaRoot.quotaRoot("benwa");
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/t \
est/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java \
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
index 2e56542..3fe73df 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java
@@ -44,7 +44,7 @@ public class ListeningCurrentQuotaUpdaterTest {
public static final int SIZE = 45;
public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", \
"INBOX");
- public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa");
+ public static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa");
private StoreCurrentQuotaManager mockedCurrentQuotaManager;
private QuotaRootResolver mockedQuotaRootResolver;
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java \
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
index 1902e84..7566e88 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/QuotaCheckerTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
public class QuotaCheckerTest {
- public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa");
+ public static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa");
public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("benwa", \
"INBOX");
public static final SimpleMailbox MAILBOX = new SimpleMailbox(MAILBOX_PATH, 10);
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java \
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
index c5aa4d3..fcec1c7 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreCurrentQuotaManagerTest.java
@@ -26,7 +26,7 @@ import org.junit.Before;
import org.junit.Test;
public abstract class StoreCurrentQuotaManagerTest {
- public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("benwa");
+ public static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("benwa");
protected abstract StoreCurrentQuotaManager provideTestee();
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java \
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java
index a73a34e..4b576f6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java
@@ -44,7 +44,7 @@ public class StoreQuotaManagerTest {
mockedCurrentQuotaManager = mock(CurrentQuotaManager.class);
mockedMaxQuotaManager = mock(MaxQuotaManager.class);
testee = new StoreQuotaManager(mockedCurrentQuotaManager, \
mockedMaxQuotaManager);
- quotaRoot = QuotaRootImpl.quotaRoot("benwa");
+ quotaRoot = QuotaRoot.quotaRoot("benwa");
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java \
b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
index fadbc3b..e78f679 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
@@ -46,7 +46,6 @@ import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.quota.QuotaImpl;
-import org.apache.james.mailbox.store.quota.QuotaRootImpl;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.Before;
import org.junit.Test;
@@ -56,7 +55,7 @@ import com.google.common.collect.ImmutableList;
public class GetQuotaProcessorTest {
- private static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("plop");
+ private static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("plop");
public static final MailboxPath MAILBOX_PATH = new MailboxPath("namespace", \
"plop", "INBOX"); public static final Quota MESSAGE_QUOTA = QuotaImpl.quota(24, \
1589);
public static final Quota STORAGE_QUOTA = QuotaImpl.quota(240, 15890);
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java \
b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
index f4057df..c435874 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaRootProcessorTest.java
@@ -40,7 +40,6 @@ import org.apache.james.mailbox.model.QuotaRoot;
import org.apache.james.mailbox.quota.QuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.quota.QuotaImpl;
-import org.apache.james.mailbox.store.quota.QuotaRootImpl;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
@@ -50,7 +49,7 @@ import org.junit.Test;
public class GetQuotaRootProcessorTest {
- private static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("plop");
+ private static final QuotaRoot QUOTA_ROOT = QuotaRoot.quotaRoot("plop");
public static final MailboxPath MAILBOX_PATH = MailboxPath.forUser("plop", \
"INBOX"); public static final Quota MESSAGE_QUOTA = QuotaImpl.quota(24, 1589);
public static final Quota STORAGE_QUOTA = QuotaImpl.quota(240, 15890);
http://git-wip-us.apache.org/repos/asf/james-project/blob/159886f0/server/container/cl \
i-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java \
b/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java
index 551a5f0..fc8fb7a 100644
--- a/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java
+++ b/server/container/cli-integration/src/test/java/org/apache/james/cli/QuotaCommandsIntegrationTest.java
@@ -26,7 +26,6 @@ import org.apache.james.GuiceJamesServer;
import org.apache.james.MemoryJmapTestRule;
import org.apache.james.cli.util.OutputCapture;
import org.apache.james.mailbox.model.QuotaRoot;
-import org.apache.james.mailbox.store.quota.QuotaRootImpl;
import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex;
import org.apache.james.modules.QuotaProbesImpl;
import org.apache.james.modules.server.JMXServerModule;
@@ -37,7 +36,7 @@ import org.junit.Test;
public class QuotaCommandsIntegrationTest {
public static final String USER = "user";
- public static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("#private&" + \
USER); + public static final QuotaRoot QUOTA_ROOT = \
QuotaRoot.quotaRoot("#private&" + USER); private OutputCapture outputCapture;
@Rule
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic