Author: eric
Date: Sat Aug 20 04:32:49 2011
New Revision: 1159838
URL: http://svn.apache.org/viewvc?rev=1159838&view=rev
Log:
Move common getUserString and getDomainString methods to the Abstract class so
it can be reused by all RRT implementations (jdbc, jpa, hbase...)
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=1159838&r1=1159837&r2=1159838&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 04:32:49 2011
@@ -482,4 +482,46 @@ public abstract class AbstractRecipientR
}
}
+ /**
+ * Return user String for the given argument
+ *
+ * @param user
+ * the given user String
+ * @return user the user String
+ * @throws InvalidMappingException
+ * get thrown on invalid argument
+ */
+ protected String getUserString(String user) {
+ if (user != null) {
+ if (user.equals(WILDCARD) || user.indexOf("@") < 0) {
+ return user;
+ } else {
+ throw new IllegalArgumentException("Invalid user: " + user);
+ }
+ } else {
+ return WILDCARD;
+ }
+ }
+
+ /**
+ * Return domain String for the given argument
+ *
+ * @param domain
+ * the given domain String
+ * @return domainString the domain String
+ * @throws InvalidMappingException
+ * get thrown on invalid argument
+ */
+ protected String getDomainString(String domain) {
+ if (domain != null) {
+ if (domain.equals(WILDCARD) || domain.indexOf("@") < 0) {
+ return domain;
+ } else {
+ throw new IllegalArgumentException("Invalid domain: " +
domain);
+ }
+ } else {
+ return WILDCARD;
+ }
+ }
+
}
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=1159838&r1=1159837&r2=1159838&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 04:32:49 2011
@@ -460,42 +460,4 @@ public class JDBCRecipientRewriteTable e
}
}
- /**
- * Return user String for the given argument
- *
- * @param user
- * the given user String
- * @return user the user String
- */
- private String getUserString(String user) {
- if (user != null) {
- if (user.equals(WILDCARD) || user.indexOf("@") < 0) {
- return user;
- } else {
- throw new IllegalArgumentException("Invalid user: " + user);
- }
- } else {
- return WILDCARD;
- }
- }
-
- /**
- * Return domain String for the given argument
- *
- * @param domain
- * the given domain String
- * @return domainString the domain String
- */
- private String getDomainString(String domain) {
- if (domain != null) {
- if (domain.equals(WILDCARD) || domain.indexOf("@") < 0) {
- return domain;
- } else {
- throw new IllegalArgumentException("Invalid domain: " +
domain);
- }
- } else {
- return WILDCARD;
- }
- }
-
}
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=1159838&r1=1159837&r2=1159838&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 04:32:49 2011
@@ -273,46 +273,4 @@ public class JPARecipientRewriteTable ex
}
}
- /**
- * Return user String for the given argument
- *
- * @param user
- * the given user String
- * @return user the user String
- * @throws InvalidMappingException
- * get thrown on invalid argument
- */
- private String getUserString(String user) {
- if (user != null) {
- if (user.equals(WILDCARD) || user.indexOf("@") < 0) {
- return user;
- } else {
- throw new IllegalArgumentException("Invalid user: " + user);
- }
- } else {
- return WILDCARD;
- }
- }
-
- /**
- * Return domain String for the given argument
- *
- * @param domain
- * the given domain String
- * @return domainString the domain String
- * @throws InvalidMappingException
- * get thrown on invalid argument
- */
- private String getDomainString(String domain) {
- if (domain != null) {
- if (domain.equals(WILDCARD) || domain.indexOf("@") < 0) {
- return domain;
- } else {
- throw new IllegalArgumentException("Invalid domain: " +
domain);
- }
- } else {
- return WILDCARD;
- }
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
