This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 35fbc89dcde2b3e50ef73aae9031d86cafba2db1
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Wed Nov 13 16:38:46 2019 +0100
[Refactoring] finally drop {un,}lock methods from MailRepository interface
---
.../james/mailrepository/file/FileMailRepository.java | 6 ++----
.../james/mailrepository/jdbc/JDBCMailRepository.java | 18 ------------------
.../james/mailrepository/api/MailRepository.java | 11 -----------
.../cassandra/CassandraMailRepository.java | 10 ----------
.../mailrepository/memory/MemoryMailRepository.java | 11 +----------
5 files changed, 3 insertions(+), 53 deletions(-)
diff --git
a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
index 93107f8..ee55188 100644
---
a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
+++
b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
@@ -98,8 +98,7 @@ public class FileMailRepository implements MailRepository,
Configurable, Initial
*
* @return true if successfully released the lock, false otherwise
*/
- @Override
- public boolean unlock(MailKey key) {
+ private boolean unlock(MailKey key) {
return accessControlLock.unlock(key);
}
@@ -111,8 +110,7 @@ public class FileMailRepository implements MailRepository,
Configurable, Initial
*
* @return true if successfully obtained the lock, false otherwise
*/
- @Override
- public boolean lock(MailKey key) {
+ private boolean lock(MailKey key) {
return accessControlLock.lock(key);
}
diff --git
a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index 6c1c06f..ac64737 100644
---
a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++
b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -219,24 +219,6 @@ public class JDBCMailRepository implements MailRepository,
Configurable, Initial
}
-
- /**
- * JDBC uses transaction, it doesn't need locks
- */
- @Override
- public boolean unlock(MailKey key) {
- return false;
- }
-
- /**
- * JDBC uses transaction, it doesn't need locks
- */
- @Override
- public boolean lock(MailKey key) {
- return false;
- }
-
-
/**
* Initialises the JDBC repository.
* <ol>
diff --git
a/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
b/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
index b20d8b0..113dc7e 100644
---
a/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
+++
b/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
@@ -96,15 +96,4 @@ public interface MailRepository {
*/
void removeAll() throws MessagingException;
- /**
- * @deprecated This method is implementation dependent, it has been moved
to org.apache.james.mailrepository.lib.AbstractMailRepository
- */
- @Deprecated
- boolean lock(MailKey key) throws MessagingException;
-
- /**
- * @deprecated This method is implementation dependent, it has been moved
to org.apache.james.mailrepository.lib.AbstractMailRepository
- */
- @Deprecated
- boolean unlock(MailKey key) throws MessagingException;
}
diff --git
a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java
b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java
index 277c39d..bbaf01f 100644
---
a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java
+++
b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepository.java
@@ -154,14 +154,4 @@ public class CassandraMailRepository implements
MailRepository {
.then()
.block();
}
-
- @Override
- public boolean lock(MailKey key) {
- return false;
- }
-
- @Override
- public boolean unlock(MailKey key) {
- return false;
- }
}
diff --git
a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepository.java
b/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepository.java
index 6df4dee..d21adcb 100644
---
a/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepository.java
+++
b/server/mailrepository/mailrepository-memory/src/main/java/org/apache/james/mailrepository/memory/MemoryMailRepository.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
+
import javax.mail.MessagingException;
import org.apache.james.mailrepository.api.MailKey;
@@ -72,16 +73,6 @@ public class MemoryMailRepository implements MailRepository {
}
@Override
- public boolean lock(MailKey key) {
- return false;
- }
-
- @Override
- public boolean unlock(MailKey key) {
- return false;
- }
-
- @Override
public long size() {
return mails.size();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
