JAMES-2374 rename {add,remove}AddressMapping argument to prevent ambiguity
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ff1ff882
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ff1ff882
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ff1ff882
Branch: refs/heads/master
Commit: ff1ff8824a74a8c75a4163a3c72460125c2af5b4
Parents: 7d80a4c
Author: Matthieu Baechler <[email protected]>
Authored: Tue Apr 24 16:06:37 2018 +0200
Committer: benwa <[email protected]>
Committed: Fri Apr 27 14:25:58 2018 +0700
----------------------------------------------------------------------
.../james/cli/probe/impl/JmxDataProbe.java | 8 +++---
.../org/apache/james/utils/DataProbeImpl.java | 10 ++++----
.../java/org/apache/james/probe/DataProbe.java | 4 +--
.../RecipientRewriteTableManagementMBean.java | 27 +++++++++-----------
.../lib/RecipientRewriteTableManagement.java | 12 ++++-----
5 files changed, 29 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ff1ff882/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
----------------------------------------------------------------------
diff --git
a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
index dde2d88..fae65ac 100644
---
a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
+++
b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxDataProbe.java
@@ -173,24 +173,24 @@ public class JmxDataProbe implements DataProbe, JmxProbe {
}
@Override
- public void addAddressMapping(String user, String domain, String
toAddress) throws Exception {
+ public void addAddressMapping(String fromUser, String fromDomain, String
toAddress) throws Exception {
try (Closeable closeable =
MDCBuilder.create()
.addContext(MDCBuilder.PROTOCOL, JMX)
.addContext(MDCBuilder.ACTION, "addAddressMapping")
.build()) {
- virtualUserTableProxy.addAddressMapping(user, domain, toAddress);
+ virtualUserTableProxy.addAddressMapping(fromUser, fromDomain,
toAddress);
}
}
@Override
- public void removeAddressMapping(String user, String domain, String
fromAddress) throws Exception {
+ public void removeAddressMapping(String fromUser, String fromDomain,
String toAddress) throws Exception {
try (Closeable closeable =
MDCBuilder.create()
.addContext(MDCBuilder.PROTOCOL, JMX)
.addContext(MDCBuilder.ACTION, "removeAddressMapping")
.build()) {
- virtualUserTableProxy.removeAddressMapping(user, domain,
fromAddress);
+ virtualUserTableProxy.removeAddressMapping(fromUser, fromDomain,
toAddress);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ff1ff882/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
----------------------------------------------------------------------
diff --git
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
index 38bc8ed..c5cab72 100644
---
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
+++
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java
@@ -117,15 +117,15 @@ public class DataProbeImpl implements GuiceProbe,
DataProbe {
}
@Override
- public void addAddressMapping(String user, String domain, String
toAddress) throws Exception {
- MappingSource source = MappingSource.fromUser(user, domain);
+ public void addAddressMapping(String fromUser, String fromDomain, String
toAddress) throws Exception {
+ MappingSource source = MappingSource.fromUser(fromUser, fromDomain);
recipientRewriteTable.addAddressMapping(source, toAddress);
}
@Override
- public void removeAddressMapping(String user, String domain, String
fromAddress) throws Exception {
- MappingSource source = MappingSource.fromUser(user, domain);
- recipientRewriteTable.removeAddressMapping(source, fromAddress);
+ public void removeAddressMapping(String fromUser, String fromDomain,
String toAddress) throws Exception {
+ MappingSource source = MappingSource.fromUser(fromUser, fromDomain);
+ recipientRewriteTable.removeAddressMapping(source, toAddress);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/ff1ff882/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
----------------------------------------------------------------------
diff --git
a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
index c545d27..e85c06c 100644
--- a/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
+++ b/server/data/data-api/src/main/java/org/apache/james/probe/DataProbe.java
@@ -48,9 +48,9 @@ public interface DataProbe {
Mappings listUserDomainMappings(String user, String domain) throws
Exception;
- void addAddressMapping(String user, String domain, String toAddress)
throws Exception;
+ void addAddressMapping(String fromUser, String fromDomain, String
toAddress) throws Exception;
- void removeAddressMapping(String user, String domain, String fromAddress)
throws Exception;
+ void removeAddressMapping(String fromUser, String fromDomain, String
toAddress) throws Exception;
void addRegexMapping(String user, String domain, String regex) throws
Exception;
http://git-wip-us.apache.org/repos/asf/james-project/blob/ff1ff882/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
----------------------------------------------------------------------
diff --git
a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
index 75e4dee..30dac12 100644
---
a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
+++
b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java
@@ -57,31 +57,28 @@ public interface RecipientRewriteTableManagementMBean {
void removeRegexMapping(String user, String domain, String regex) throws
Exception;
/***
- * Add address mapping
+ * Add address mapping that, for a user from@fromDomain would redirect
+ * mails to toAddress
*
- * @param user
+ * @param fromUser
* the username. Null if no username should be used
- * @param domain
+ * @param fromDomain
* the domain. Null if no domain should be used
- * @param address
+ * @param toAddress
* the address.
- * @throws Exception
- * If an error occurred
*/
- void addAddressMapping(String user, String domain, String address) throws
Exception;
+ void addAddressMapping(String fromUser, String fromDomain, String
toAddress) throws Exception;
/**
- * Remove address mapping
- *
- * @param user
+ * Remove address mapping. The API takes the same arguments as
addAddressMapping
+ *
+ * @param fromUser
* the username. Null if no username should be used
- * @param domain
+ * @param fromDomain
* the domain. Null if no domain should be used
- * @param address
- * @throws Exception
- * If an error occurred
+ * @param toAddress
*/
- void removeAddressMapping(String user, String domain, String address)
throws Exception;
+ void removeAddressMapping(String fromUser, String fromDomain, String
toAddress) throws Exception;
/**
* Add error mapping
http://git-wip-us.apache.org/repos/asf/james-project/blob/ff1ff882/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
----------------------------------------------------------------------
diff --git
a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
index 9ee4bb5..ecc7b17 100644
---
a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
+++
b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
@@ -57,15 +57,15 @@ public class RecipientRewriteTableManagement extends
StandardMBean implements Re
}
@Override
- public void addAddressMapping(String user, String domain, String address)
throws RecipientRewriteTableException {
- MappingSource source = MappingSource.fromUser(user, domain);
- rrt.addAddressMapping(source, address);
+ public void addAddressMapping(String fromUser, String fromDomain, String
toAddress) throws RecipientRewriteTableException {
+ MappingSource source = MappingSource.fromUser(fromUser, fromDomain);
+ rrt.addAddressMapping(source, toAddress);
}
@Override
- public void removeAddressMapping(String user, String domain, String
address) throws RecipientRewriteTableException {
- MappingSource source = MappingSource.fromUser(user, domain);
- rrt.removeAddressMapping(source, address);
+ public void removeAddressMapping(String fromUser, String fromDomain,
String toAddress) throws RecipientRewriteTableException {
+ MappingSource source = MappingSource.fromUser(fromUser, fromDomain);
+ rrt.removeAddressMapping(source, toAddress);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
