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/06/28 07:21:15 UTC
[2/3] james-project git commit: JAMES-2076 remove useless lightweight
condition
JAMES-2076 remove useless lightweight condition
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/416e3108
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/416e3108
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/416e3108
Branch: refs/heads/master
Commit: 416e31088b8abf262f07e87274db11c97ee13ce5
Parents: 3562b88
Author: benwa <bt...@linagora.com>
Authored: Wed Jun 28 09:19:15 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jun 28 14:20:47 2017 +0700
----------------------------------------------------------------------
.../james/sieve/cassandra/CassandraSieveDAO.java | 3 ++-
.../james/sieve/cassandra/CassandraSieveQuotaDAO.java | 14 ++++++--------
.../sieve/cassandra/CassandraSieveRepository.java | 8 ++------
.../sieverepository/file/SieveFileRepository.java | 4 ++--
.../lib/AbstractSieveRepositoryTest.java | 9 +++++++--
5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/416e3108/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java
index 7dab54a..f15dba5 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java
@@ -49,6 +49,7 @@ import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.querybuilder.Select;
+import com.github.steveash.guavate.Guavate;
public class CassandraSieveDAO {
@@ -116,7 +117,7 @@ public class CassandraSieveDAO {
.map(row -> new ScriptSummary(
row.getString(SCRIPT_NAME),
row.getBool(IS_ACTIVE)))
- .collect(Collectors.toList()));
+ .collect(Guavate.toImmutableList()));
}
public CompletableFuture<Boolean> updateScriptActivation(String user, String scriptName, boolean active) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/416e3108/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java
index 6dcbe6e..eaeb39e 100644
--- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java
+++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java
@@ -89,14 +89,12 @@ public class CassandraSieveQuotaDAO {
deleteClusterQuotaStatement = session.prepare(
delete()
.from(CassandraSieveClusterQuotaTable.TABLE_NAME)
- .where(eq(CassandraSieveClusterQuotaTable.NAME, bindMarker(CassandraSieveClusterQuotaTable.NAME)))
- .ifExists());
+ .where(eq(CassandraSieveClusterQuotaTable.NAME, bindMarker(CassandraSieveClusterQuotaTable.NAME))));
deleteUserQuotaStatement = session.prepare(
delete()
.from(CassandraSieveQuotaTable.TABLE_NAME)
- .where(eq(CassandraSieveQuotaTable.USER_NAME, bindMarker(CassandraSieveQuotaTable.USER_NAME)))
- .ifExists());
+ .where(eq(CassandraSieveQuotaTable.USER_NAME, bindMarker(CassandraSieveQuotaTable.USER_NAME))));
}
public CompletableFuture<Long> spaceUsedBy(String user) {
@@ -128,8 +126,8 @@ public class CassandraSieveQuotaDAO {
.setString(CassandraSieveClusterQuotaTable.NAME, CassandraSieveClusterQuotaTable.DEFAULT_NAME));
}
- public CompletableFuture<Boolean> removeQuota() {
- return cassandraAsyncExecutor.executeReturnApplied(
+ public CompletableFuture<Void> removeQuota() {
+ return cassandraAsyncExecutor.executeVoid(
deleteClusterQuotaStatement.bind()
.setString(CassandraSieveClusterQuotaTable.NAME, CassandraSieveClusterQuotaTable.DEFAULT_NAME));
}
@@ -148,8 +146,8 @@ public class CassandraSieveQuotaDAO {
.setString(CassandraSieveQuotaTable.USER_NAME, user));
}
- public CompletableFuture<Boolean> removeQuota(String user) {
- return cassandraAsyncExecutor.executeReturnApplied(
+ public CompletableFuture<Void> removeQuota(String user) {
+ return cassandraAsyncExecutor.executeVoid(
deleteUserQuotaStatement.bind()
.setString(CassandraSieveQuotaTable.USER_NAME, user));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/416e3108/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 1e3ad9f..95557e5 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
@@ -237,9 +237,7 @@ public class CassandraSieveRepository implements SieveRepository {
@Override
public void removeQuota() throws QuotaNotFoundException {
- if (!cassandraSieveQuotaDAO.removeQuota().join()) {
- throw new QuotaNotFoundException();
- }
+ cassandraSieveQuotaDAO.removeQuota().join();
}
@Override
@@ -266,9 +264,7 @@ public class CassandraSieveRepository implements SieveRepository {
@Override
public void removeQuota(String user) throws QuotaNotFoundException {
- if (!cassandraSieveQuotaDAO.removeQuota(user).join()) {
- throw new QuotaNotFoundException();
- }
+ cassandraSieveQuotaDAO.removeQuota(user).join();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/416e3108/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 221320e..60f5351 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
@@ -420,7 +420,7 @@ public class SieveFileRepository implements SieveRepository {
public synchronized void removeQuota() throws QuotaNotFoundException, StorageException {
File file = getQuotaFile();
if (!file.exists()) {
- throw new QuotaNotFoundException("No default quota");
+ return;
}
try {
FileUtils.forceDelete(file);
@@ -475,7 +475,7 @@ public class SieveFileRepository implements SieveRepository {
synchronized (lock) {
File file = getQuotaFile(user);
if (!file.exists()) {
- throw new QuotaNotFoundException("No quota for user: " + user);
+ return;
}
try {
FileUtils.forceDelete(file);
http://git-wip-us.apache.org/repos/asf/james-project/blob/416e3108/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 b07d3dc..b545160 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
@@ -303,12 +303,17 @@ public abstract class AbstractSieveRepositoryTest {
assertThat(sieveRepository.hasQuota(USER)).isTrue();
}
- @Test(expected = QuotaNotFoundException.class)
- public void removeQuotaShouldThrowIfRepositoryDoesNotHaveQuota() throws Exception {
+ @Test
+ public void removeQuotaShouldNotThrowIfRepositoryDoesNotHaveQuota() throws Exception {
sieveRepository.removeQuota();
}
@Test
+ public void removeUserQuotaShouldNotThrowWhenAbsent() throws Exception {
+ sieveRepository.removeQuota(USER);
+ }
+
+ @Test
public void removeQuotaShouldWorkOnRepositories() throws Exception {
sieveRepository.setQuota(DEFAULT_QUOTA);
sieveRepository.removeQuota();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org