JAMES-2151 SieveRepository default quota methods should have an explicit name
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/685a13b4 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/685a13b4 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/685a13b4 Branch: refs/heads/master Commit: 685a13b46fe5a70e0fa3d9d58e9d78c39eec00a5 Parents: 3d0a553 Author: benwa <[email protected]> Authored: Fri Jun 22 11:23:31 2018 +0700 Committer: benwa <[email protected]> Committed: Tue Jun 26 16:06:31 2018 +0700 ---------------------------------------------------------------------- .../james/modules/protocols/SieveProbeImpl.java | 4 +-- .../api/SieveQuotaRepository.java | 6 ++-- .../cassandra/CassandraSieveRepository.java | 6 ++-- .../file/SieveDefaultRepository.java | 6 ++-- .../file/SieveFileRepository.java | 6 ++-- .../lib/SieveRepositoryManagement.java | 4 +-- .../lib/AbstractSieveRepositoryTest.java | 34 ++++++++++---------- .../memory/InMemorySieveQuotaRepository.java | 6 ++-- .../james/webadmin/routes/SieveQuotaRoutes.java | 4 +-- .../webadmin/routes/SieveQuotaRoutesTest.java | 8 ++--- 10 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java index 54ccc24..9e09e44 100644 --- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java @@ -39,12 +39,12 @@ public class SieveProbeImpl implements GuiceProbe, SieveProbe { @Override public long getSieveQuota() throws Exception { - return sieveRepository.getQuota().asLong(); + return sieveRepository.getDefaultQuota().asLong(); } @Override public void setSieveQuota(long quota) throws Exception { - sieveRepository.setQuota(QuotaSize.size(quota)); + sieveRepository.setDefaultQuota(QuotaSize.size(quota)); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveQuotaRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveQuotaRepository.java b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveQuotaRepository.java index 02206e5..4866b01 100644 --- a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveQuotaRepository.java +++ b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveQuotaRepository.java @@ -30,11 +30,11 @@ import org.apache.james.sieverepository.api.exception.StorageException; */ public interface SieveQuotaRepository { - boolean hasQuota() throws StorageException; + boolean hasDefaultQuota() throws StorageException; - QuotaSize getQuota() throws QuotaNotFoundException, StorageException; + QuotaSize getDefaultQuota() throws QuotaNotFoundException, StorageException; - void setQuota(QuotaSize quota) throws StorageException; + void setDefaultQuota(QuotaSize quota) throws StorageException; void removeQuota() throws QuotaNotFoundException, StorageException; http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java index 73e4626..b4ca04b 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveRepository.java @@ -222,21 +222,21 @@ public class CassandraSieveRepository implements SieveRepository { } @Override - public boolean hasQuota() { + public boolean hasDefaultQuota() { return cassandraSieveQuotaDAO.getQuota() .join() .isPresent(); } @Override - public QuotaSize getQuota() throws QuotaNotFoundException { + public QuotaSize getDefaultQuota() throws QuotaNotFoundException { return cassandraSieveQuotaDAO.getQuota() .join() .orElseThrow(QuotaNotFoundException::new); } @Override - public void setQuota(QuotaSize quota) { + public void setDefaultQuota(QuotaSize quota) { cassandraSieveQuotaDAO.setQuota(quota).join(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java index 9dcaea3..bfa8f64 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java @@ -122,17 +122,17 @@ public class SieveDefaultRepository implements SieveRepository { } @Override - public boolean hasQuota() throws StorageException { + public boolean hasDefaultQuota() throws StorageException { throw apologizeForQuotas(); } @Override - public QuotaSize getQuota() throws QuotaNotFoundException, StorageException { + public QuotaSize getDefaultQuota() throws QuotaNotFoundException, StorageException { throw apologizeForQuotas(); } @Override - public void setQuota(QuotaSize quota) throws StorageException { + public void setDefaultQuota(QuotaSize quota) throws StorageException { throw apologizeForQuotas(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java index 9c6bbd6..a651ceb 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java @@ -388,12 +388,12 @@ public class SieveFileRepository implements SieveRepository { } @Override - public boolean hasQuota() throws StorageException { + public boolean hasDefaultQuota() throws StorageException { return getQuotaFile().exists(); } @Override - public QuotaSize getQuota() throws QuotaNotFoundException, StorageException { + public QuotaSize getDefaultQuota() throws QuotaNotFoundException, StorageException { Long quota = null; File file = getQuotaFile(); if (file.exists()) { @@ -429,7 +429,7 @@ public class SieveFileRepository implements SieveRepository { } @Override - public synchronized void setQuota(QuotaSize quota) throws StorageException { + public synchronized void setDefaultQuota(QuotaSize quota) throws StorageException { File file = getQuotaFile(); String content = Long.toString(quota.asLong()); toFile(file, content); http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java b/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java index d60cf1a..0fdd8e9 100644 --- a/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java +++ b/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java @@ -45,12 +45,12 @@ public class SieveRepositoryManagement extends StandardMBean implements SieveRep @Override public long getQuota() throws SieveRepositoryException { - return sieveRepository.getQuota().asLong(); + return sieveRepository.getDefaultQuota().asLong(); } @Override public void setQuota(long quota) throws SieveRepositoryException { - sieveRepository.setQuota(QuotaSize.size(quota)); + sieveRepository.setDefaultQuota(QuotaSize.size(quota)); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java index fe5b557..4352209 100644 --- a/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java @@ -88,13 +88,13 @@ public abstract class AbstractSieveRepositoryTest { @Test public void haveSpaceShouldNotThrowWhenQuotaIsNotReached() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); sieveRepository.haveSpace(USER, SCRIPT_NAME, DEFAULT_QUOTA.asLong()); } @Test(expected = QuotaExceededException.class) public void haveSpaceShouldThrowWhenQuotaIsExceed() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); sieveRepository.haveSpace(USER, SCRIPT_NAME, DEFAULT_QUOTA.asLong() + 1); } @@ -160,15 +160,15 @@ public abstract class AbstractSieveRepositoryTest { @Test(expected = QuotaExceededException.class) public void putScriptShouldThrowWhenScriptTooBig() throws Exception { - sieveRepository.setQuota(QuotaSize.size(SCRIPT_CONTENT.length() - 1)); + sieveRepository.setDefaultQuota(QuotaSize.size(SCRIPT_CONTENT.length() - 1)); sieveRepository.putScript(USER, SCRIPT_NAME, SCRIPT_CONTENT); } @Test(expected = QuotaExceededException.class) public void putScriptShouldThrowWhenQuotaChangedInBetween() throws Exception { - sieveRepository.setQuota(QuotaSize.size(SCRIPT_CONTENT.length())); + sieveRepository.setDefaultQuota(QuotaSize.size(SCRIPT_CONTENT.length())); sieveRepository.putScript(USER, SCRIPT_NAME, SCRIPT_CONTENT); - sieveRepository.setQuota(QuotaSize.size(SCRIPT_CONTENT.length() - 1)); + sieveRepository.setDefaultQuota(QuotaSize.size(SCRIPT_CONTENT.length() - 1)); sieveRepository.putScript(USER, SCRIPT_NAME, SCRIPT_CONTENT); } @@ -262,13 +262,13 @@ public abstract class AbstractSieveRepositoryTest { @Test(expected = QuotaNotFoundException.class) public void getQuotaShouldThrowIfQuotaNotFound() throws Exception { - sieveRepository.getQuota(); + sieveRepository.getDefaultQuota(); } @Test public void getQuotaShouldWork() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); - assertThat(sieveRepository.getQuota()).isEqualTo(DEFAULT_QUOTA); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); + assertThat(sieveRepository.getDefaultQuota()).isEqualTo(DEFAULT_QUOTA); } @Test @@ -279,18 +279,18 @@ public abstract class AbstractSieveRepositoryTest { @Test public void hasQuotaShouldReturnFalseWhenRepositoryDoesNotHaveQuota() throws Exception { - assertThat(sieveRepository.hasQuota()).isFalse(); + assertThat(sieveRepository.hasDefaultQuota()).isFalse(); } @Test public void hasQuotaShouldReturnTrueWhenRepositoryHaveQuota() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); - assertThat(sieveRepository.hasQuota()).isTrue(); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); + assertThat(sieveRepository.hasDefaultQuota()).isTrue(); } @Test public void hasQuotaShouldReturnFalseWhenUserDoesNotHaveQuota() throws Exception { - assertThat(sieveRepository.hasQuota()).isFalse(); + assertThat(sieveRepository.hasDefaultQuota()).isFalse(); } @Test @@ -311,9 +311,9 @@ public abstract class AbstractSieveRepositoryTest { @Test public void removeQuotaShouldWorkOnRepositories() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); sieveRepository.removeQuota(); - assertThat(sieveRepository.hasQuota()).isFalse(); + assertThat(sieveRepository.hasDefaultQuota()).isFalse(); } @Test @@ -325,7 +325,7 @@ public abstract class AbstractSieveRepositoryTest { @Test(expected = QuotaNotFoundException.class) public void removeQuotaShouldWorkOnUsersWithGlobalQuota() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); sieveRepository.setQuota(USER, USER_QUOTA); sieveRepository.removeQuota(USER); sieveRepository.getQuota(USER); @@ -333,8 +333,8 @@ public abstract class AbstractSieveRepositoryTest { @Test public void setQuotaShouldWork() throws Exception { - sieveRepository.setQuota(DEFAULT_QUOTA); - assertThat(sieveRepository.getQuota()).isEqualTo(DEFAULT_QUOTA); + sieveRepository.setDefaultQuota(DEFAULT_QUOTA); + assertThat(sieveRepository.getDefaultQuota()).isEqualTo(DEFAULT_QUOTA); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/data/data-memory/src/main/java/org/apache/james/sieverepository/memory/InMemorySieveQuotaRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-memory/src/main/java/org/apache/james/sieverepository/memory/InMemorySieveQuotaRepository.java b/server/data/data-memory/src/main/java/org/apache/james/sieverepository/memory/InMemorySieveQuotaRepository.java index 8820ee9..3ca888f 100644 --- a/server/data/data-memory/src/main/java/org/apache/james/sieverepository/memory/InMemorySieveQuotaRepository.java +++ b/server/data/data-memory/src/main/java/org/apache/james/sieverepository/memory/InMemorySieveQuotaRepository.java @@ -35,17 +35,17 @@ public class InMemorySieveQuotaRepository implements SieveQuotaRepository { private Map<User, QuotaSize> userQuota = new ConcurrentHashMap<>(); @Override - public boolean hasQuota() { + public boolean hasDefaultQuota() { return globalQuota.isPresent(); } @Override - public QuotaSize getQuota() throws QuotaNotFoundException { + public QuotaSize getDefaultQuota() throws QuotaNotFoundException { return globalQuota.orElseThrow(QuotaNotFoundException::new); } @Override - public void setQuota(QuotaSize quota) { + public void setDefaultQuota(QuotaSize quota) { this.globalQuota = Optional.of(quota); } http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java index c0abc61..a1fb584 100644 --- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java @@ -94,7 +94,7 @@ public class SieveQuotaRoutes implements Routes { public void defineGetGlobalSieveQuota(Service service) { service.get(ROOT_PATH, (request, response) -> { try { - QuotaSize sieveQuota = sieveQuotaRepository.getQuota(); + QuotaSize sieveQuota = sieveQuotaRepository.getDefaultQuota(); response.status(HttpStatus.OK_200); return sieveQuota.asLong(); } catch (QuotaNotFoundException e) { @@ -122,7 +122,7 @@ public class SieveQuotaRoutes implements Routes { service.put(ROOT_PATH, (request, response) -> { try { QuotaSize requestedSize = extractRequestedQuotaSizeFromRequest(request); - sieveQuotaRepository.setQuota(requestedSize); + sieveQuotaRepository.setDefaultQuota(requestedSize); response.status(HttpStatus.NO_CONTENT_204); return Constants.EMPTY_BODY; } catch (JsonExtractException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/685a13b4/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java index 02d3ef1..41be8cc 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java @@ -75,7 +75,7 @@ public class SieveQuotaRoutesTest { @Test public void getGlobalSieveQuotaShouldReturnStoredValue() throws Exception { long value = 1000L; - sieveRepository.setQuota(value); + sieveRepository.setDefaultQuota(value); long actual = given() @@ -91,7 +91,7 @@ public class SieveQuotaRoutesTest { @Test public void updateGlobalSieveQuotaShouldUpdateStoredValue() throws Exception { - sieveRepository.setQuota(500L); + sieveRepository.setDefaultQuota(500L); long requiredSize = 1024L; given() @@ -100,7 +100,7 @@ public class SieveQuotaRoutesTest { .then() .statusCode(HttpStatus.NO_CONTENT_204); - assertThat(sieveRepository.getQuota()).isEqualTo(requiredSize); + assertThat(sieveRepository.getDefaultQuota()).isEqualTo(requiredSize); } @Test @@ -131,7 +131,7 @@ public class SieveQuotaRoutesTest { @Test public void removeGlobalSieveQuotaShouldRemoveGlobalSieveQuota() throws Exception { - sieveRepository.setQuota(1024L); + sieveRepository.setDefaultQuota(1024L); given() .delete(SieveQuotaRoutes.ROOT_PATH) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
