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 ro...@apache.org on 2018/01/23 16:54:29 UTC
[05/10] james-project git commit: JAMES-2289
MailQueue.getMailQueueName is redundant, getName should be enough
JAMES-2289 MailQueue.getMailQueueName is redundant, getName should be enough
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/246ec6ce
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/246ec6ce
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/246ec6ce
Branch: refs/heads/master
Commit: 246ec6ce75fbffc972c8967c748785e54726609f
Parents: da1ebe8
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Jan 22 09:47:04 2018 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Tue Jan 23 10:01:06 2018 +0100
----------------------------------------------------------------------
.../transport/mailets/remote/delivery/RemoteDeliveryTest.java | 2 +-
.../src/main/java/org/apache/james/queue/api/MailQueue.java | 2 +-
.../org/apache/james/queue/api/MailQueueFactoryContract.java | 4 ++--
.../src/main/java/org/apache/james/queue/file/FileMailQueue.java | 2 +-
.../src/main/java/org/apache/james/queue/jms/JMSMailQueue.java | 2 +-
.../apache/james/queue/library/AbstractMailQueueFactoryTest.java | 2 +-
.../org/apache/james/queue/memory/MemoryMailQueueFactory.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
index d21a338..4fad57d 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
@@ -61,7 +61,7 @@ public class RemoteDeliveryTest {
}
@Override
- public String getMailQueueName() {
+ public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
index cb88b9a..4dcf82b 100644
--- a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
+++ b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
@@ -62,7 +62,7 @@ public interface MailQueue {
*/
int NO_DELAY = -1;
- String getMailQueueName();
+ String getName();
/**
* Enqueue the Mail to the queue. The given delay and unit are used to
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueFactoryContract.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueFactoryContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueFactoryContract.java
index f1c556f..7783a68 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueFactoryContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueFactoryContract.java
@@ -44,7 +44,7 @@ public interface MailQueueFactoryContract {
mailQueueFactory.getQueue(NAME_2);
assertThat(mailQueueFactory.getUsedMailQueues())
- .extracting(MailQueue::getMailQueueName)
+ .extracting(MailQueue::getName)
.containsOnly(NAME_1, NAME_2);
}
@@ -56,7 +56,7 @@ public interface MailQueueFactoryContract {
mailQueueFactory.getQueue(NAME_1);
assertThat(mailQueueFactory.getUsedMailQueues())
- .extracting(MailQueue::getMailQueueName)
+ .extracting(MailQueue::getName)
.containsOnly(NAME_1);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
index 373e8cf..5801f75 100644
--- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
+++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
@@ -87,7 +87,7 @@ public class FileMailQueue implements ManageableMailQueue {
}
@Override
- public String getMailQueueName() {
+ public String getName() {
return queueName;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
index 1583c85..bc12765 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
@@ -152,7 +152,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
}
@Override
- public String getMailQueueName() {
+ public String getName() {
return queueName;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
index 2737e81..14990ed 100644
--- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
+++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
@@ -54,7 +54,7 @@ public class AbstractMailQueueFactoryTest {
return new ManageableMailQueue() {
@Override
- public String getMailQueueName() {
+ public String getName() {
return "name";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/246ec6ce/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
index b72a02d..05e92eb 100644
--- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
+++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java
@@ -87,7 +87,7 @@ public class MemoryMailQueueFactory implements MailQueueFactory {
}
@Override
- public String getMailQueueName() {
+ public String getName() {
return name;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org