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 er...@apache.org on 2011/08/20 07:05:46 UTC
svn commit: r1159847 - in /james/server/trunk:
data-library/src/main/java/org/apache/james/rrt/lib/
jdbc/src/main/java/org/apache/james/rrt/jdbc/
jpa/src/main/java/org/apache/james/rrt/jpa/
Author: eric
Date: Sat Aug 20 05:05:46 2011
New Revision: 1159847
URL: http://svn.apache.org/viewvc?rev=1159847&view=rev
Log:
More method/variable trivial rename and javadoc to better reflect rrt working.
Modified:
james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java?rev=1159847&r1=1159846&r2=1159847&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java Sat Aug 20 05:05:46 2011
@@ -483,15 +483,14 @@ public abstract class AbstractRecipientR
}
/**
- * Return user String for the given argument
+ * Return user String for the given argument.
+ * If give value is null, return a wildcard.
*
- * @param user
- * the given user String
- * @return user the user String
- * @throws InvalidMappingException
- * get thrown on invalid argument
+ * @param user the given user String
+ * @return fixedUser the fixed user String
+ * @throws InvalidMappingException get thrown on invalid argument
*/
- protected String getUserString(String user) {
+ protected String getFixedUser(String user) {
if (user != null) {
if (user.equals(WILDCARD) || user.indexOf("@") < 0) {
return user;
@@ -504,15 +503,14 @@ public abstract class AbstractRecipientR
}
/**
- * Return domain String for the given argument
+ * Fix the domain for the given argument.
+ * If give value is null, return a wildcard.
*
- * @param domain
- * the given domain String
- * @return domainString the domain String
- * @throws InvalidMappingException
- * get thrown on invalid argument
+ * @param domain the given domain String
+ * @return fixedDomain the fixed domain String
+ * @throws InvalidMappingException get thrown on invalid argument
*/
- protected String getDomainString(String domain) {
+ protected String getFixedDomain(String domain) {
if (domain != null) {
if (domain.equals(WILDCARD) || domain.indexOf("@") < 0) {
return domain;
Modified: james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java?rev=1159847&r1=1159846&r2=1159847&view=diff
==============================================================================
--- james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java (original)
+++ james/server/trunk/jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java Sat Aug 20 05:05:46 2011
@@ -205,18 +205,14 @@ public class JDBCRecipientRewriteTable e
* String, String)
*/
protected void addMappingInternal(String user, String domain, String regex) throws RecipientRewriteTableException {
-
- String newUser = getUserString(user);
- String newDomain = getDomainString(domain);
- Collection<String> map = getUserDomainMappings(newUser, newDomain);
-
+ String fixedUser = getFixedUser(user);
+ String fixedDomain = getFixedDomain(domain);
+ Collection<String> map = getUserDomainMappings(fixedUser, fixedDomain);
if (map != null && map.size() != 0) {
map.add(regex);
- updateMapping(newUser, newDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
+ doUpdateMapping(fixedUser, fixedDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
}
-
- addRawMapping(newUser, newDomain, regex);
-
+ doAddMapping(fixedUser, fixedDomain, regex);
}
/**
@@ -326,14 +322,14 @@ public class JDBCRecipientRewriteTable e
* String, String)
*/
protected void removeMappingInternal(String user, String domain, String mapping) throws RecipientRewriteTableException {
- String newUser = getUserString(user);
- String newDomain = getDomainString(domain);
- Collection<String> map = getUserDomainMappings(newUser, newDomain);
+ String fixedUser = getFixedUser(user);
+ String fixedDomain = getFixedDomain(domain);
+ Collection<String> map = getUserDomainMappings(fixedUser, fixedDomain);
if (map != null && map.size() > 1) {
map.remove(mapping);
- updateMapping(newUser, newDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
+ doUpdateMapping(fixedUser, fixedDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
} else {
- removeRawMapping(newUser, newDomain, mapping);
+ doRemoveMapping(fixedUser, fixedDomain, mapping);
}
}
@@ -349,7 +345,7 @@ public class JDBCRecipientRewriteTable e
* @return true if update was successfully
* @throws RecipientRewriteTableException
*/
- private void updateMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
+ private void doUpdateMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
Connection conn = null;
PreparedStatement mappingStmt = null;
@@ -391,7 +387,7 @@ public class JDBCRecipientRewriteTable e
* @return true if succesfully
* @throws RecipientRewriteTableException
*/
- private void removeRawMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
+ private void doRemoveMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
Connection conn = null;
PreparedStatement mappingStmt = null;
@@ -431,7 +427,7 @@ public class JDBCRecipientRewriteTable e
* @return true if successfully
* @throws RecipientRewriteTableException
*/
- private void addRawMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
+ private void doAddMapping(String user, String domain, String mapping) throws RecipientRewriteTableException {
Connection conn = null;
PreparedStatement mappingStmt = null;
Modified: james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java?rev=1159847&r1=1159846&r2=1159847&view=diff
==============================================================================
--- james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java (original)
+++ james/server/trunk/jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java Sat Aug 20 05:05:46 2011
@@ -60,18 +60,15 @@ public class JPARecipientRewriteTable ex
* @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#addMappingInternal(String, String, String)
*/
protected void addMappingInternal(String user, String domain, String mapping) throws RecipientRewriteTableException {
-
- String newUser = getUserString(user);
- String newDomain = getDomainString(domain);
- Collection<String> map = getUserDomainMappings(newUser, newDomain);
-
+ String fixedUser = getFixedUser(user);
+ String fixedDomain = getFixedDomain(domain);
+ Collection<String> map = getUserDomainMappings(fixedUser, fixedDomain);
if (map != null && map.size() != 0) {
map.add(mapping);
- doUpdateMapping(newUser, newDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
+ doUpdateMapping(fixedUser, fixedDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
} else {
- doAddMapping(newUser, newDomain, mapping);
+ doAddMapping(fixedUser, fixedDomain, mapping);
}
-
}
/**
@@ -163,14 +160,14 @@ public class JPARecipientRewriteTable ex
* @see org.apache.james.rrt.lib.AbstractRecipientRewriteTable#removeMappingInternal(String, String, String)
*/
protected void removeMappingInternal(String user, String domain, String mapping) throws RecipientRewriteTableException {
- String newUser = getUserString(user);
- String newDomain = getDomainString(domain);
- Collection<String> map = getUserDomainMappings(newUser, newDomain);
+ String fixedUser = getFixedUser(user);
+ String fixedDomain = getFixedDomain(domain);
+ Collection<String> map = getUserDomainMappings(fixedUser, fixedDomain);
if (map != null && map.size() > 1) {
map.remove(mapping);
- doUpdateMapping(newUser, newDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
+ doUpdateMapping(fixedUser, fixedDomain, RecipientRewriteTableUtil.CollectionToMapping(map));
} else {
- doRemoveMapping(newUser, newDomain, mapping);
+ doRemoveMapping(fixedUser, fixedDomain, mapping);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org