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 2018/06/26 09:13:08 UTC
[12/20] james-project git commit: JAMES-2151 Solve IntelliJ warnings
in CassandraSieveRepository
JAMES-2151 Solve IntelliJ warnings in CassandraSieveRepository
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2e8f3f75
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2e8f3f75
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2e8f3f75
Branch: refs/heads/master
Commit: 2e8f3f755d25b610c3e45c8b6d6f54eb412086ff
Parents: ff2113e
Author: benwa <bt...@linagora.com>
Authored: Mon Jun 25 10:44:08 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jun 26 16:07:50 2018 +0700
----------------------------------------------------------------------
.../sieve/cassandra/CassandraSieveRepository.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2e8f3f75/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 b4ca04b..56a7563 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
@@ -42,7 +42,6 @@ import org.apache.james.sieverepository.api.exception.IsActiveException;
import org.apache.james.sieverepository.api.exception.QuotaExceededException;
import org.apache.james.sieverepository.api.exception.QuotaNotFoundException;
import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
-import org.apache.james.sieverepository.api.exception.StorageException;
import org.apache.james.util.CompletableFutureUtil;
import org.joda.time.DateTime;
@@ -60,18 +59,18 @@ public class CassandraSieveRepository implements SieveRepository {
}
@Override
- public DateTime getActivationDateForActiveScript(User user) throws StorageException, ScriptNotFoundException {
+ public DateTime getActivationDateForActiveScript(User user) throws ScriptNotFoundException {
return cassandraActiveScriptDAO.getActiveSctiptInfo(user).join()
.orElseThrow(ScriptNotFoundException::new)
.getActivationDate();
}
@Override
- public void haveSpace(User user, ScriptName name, long newSize) throws QuotaExceededException, StorageException {
+ public void haveSpace(User user, ScriptName name, long newSize) throws QuotaExceededException {
throwOnOverQuota(user, spaceThatWillBeUsedByNewScript(user, name, newSize));
}
- private void throwOnOverQuota(User user, CompletableFuture<Long> sizeDifference) throws QuotaExceededException, StorageException {
+ private void throwOnOverQuota(User user, CompletableFuture<Long> sizeDifference) throws QuotaExceededException {
CompletableFuture<Optional<QuotaSize>> userQuotaFuture = cassandraSieveQuotaDAO.getQuota(user);
CompletableFuture<Optional<QuotaSize>> globalQuotaFuture = cassandraSieveQuotaDAO.getQuota();
CompletableFuture<Long> spaceUsedFuture = cassandraSieveQuotaDAO.spaceUsedBy(user);
@@ -80,7 +79,7 @@ public class CassandraSieveRepository implements SieveRepository {
.checkOverQuotaUponModification(sizeDifference.join());
}
- public CompletableFuture<Long> spaceThatWillBeUsedByNewScript(User user, ScriptName name, long scriptSize) {
+ private CompletableFuture<Long> spaceThatWillBeUsedByNewScript(User user, ScriptName name, long scriptSize) {
return cassandraSieveDAO.getScript(user, name)
.thenApply(optional -> optional.map(Script::getSize).orElse(0L))
.thenApply(sizeOfStoredScript -> scriptSize - sizeOfStoredScript);
@@ -94,7 +93,7 @@ public class CassandraSieveRepository implements SieveRepository {
}
@Override
- public void putScript(User user, ScriptName name, ScriptContent content) throws QuotaExceededException, StorageException {
+ public void putScript(User user, ScriptName name, ScriptContent content) throws QuotaExceededException {
CompletableFuture<Long> spaceUsed = spaceThatWillBeUsedByNewScript(user, name, content.length());
throwOnOverQuota(user, spaceUsed);
@@ -109,7 +108,7 @@ public class CassandraSieveRepository implements SieveRepository {
.join();
}
- public CompletableFuture<Void> updateSpaceUsed(User user, long spaceUsed) {
+ private CompletableFuture<Void> updateSpaceUsed(User user, long spaceUsed) {
if (spaceUsed == 0) {
return CompletableFuture.completedFuture(null);
}
@@ -241,7 +240,7 @@ public class CassandraSieveRepository implements SieveRepository {
}
@Override
- public void removeQuota() throws QuotaNotFoundException {
+ public void removeQuota() {
cassandraSieveQuotaDAO.removeQuota().join();
}
@@ -267,7 +266,7 @@ public class CassandraSieveRepository implements SieveRepository {
}
@Override
- public void removeQuota(User user) throws QuotaNotFoundException {
+ public void removeQuota(User user) {
cassandraSieveQuotaDAO.removeQuota(user).join();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org