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 rd...@apache.org on 2009/09/16 16:34:33 UTC
svn commit: r815806 - in /james/server/trunk:
avalon-user-function/src/test/java/org/apache/james/userrepository/
smtpserver-function/src/test/java/org/apache/james/smtpserver/
spoolmanager-function/src/main/java/org/apache/james/transport/mailets/
use...
Author: rdonkin
Date: Wed Sep 16 14:34:32 2009
New Revision: 815806
URL: http://svn.apache.org/viewvc?rev=815806&view=rev
Log:
JAMES-919 Switch to Java 1.5 https://issues.apache.org/jira/browse/JAMES-919
Modified:
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Wed Sep 16 14:34:32 2009
@@ -102,7 +102,7 @@
user.setAlias(alias);
repos.updateUser(user);
- Collection map = ((VirtualUserTable) repos).getMappings(username, domain);
+ Collection<String> map = ((VirtualUserTable) repos).getMappings(username, domain);
assertNull("No mapping", map);
user.setAliasing(true);
@@ -122,7 +122,7 @@
user.setForwarding(true);
repos.updateUser(user);
map = ((VirtualUserTable) repos).getMappings(username, domain);
- Iterator mappings = map.iterator();
+ Iterator<String> mappings = map.iterator();
assertTrue("Two mapping",map.size() == 2);
assertEquals("Alias found", mappings.next().toString(), alias + "@" + domain);
assertEquals("Forward found", mappings.next().toString(), forward);
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Wed Sep 16 14:34:32 2009
@@ -86,7 +86,7 @@
private VirtualUserTable setUpVirtualUserTable() {
VirtualUserTable table = new VirtualUserTable() {
- public Collection getMappings(String user, String domain) throws ErrorMappingException {
+ public Collection<String> getMappings(String user, String domain) throws ErrorMappingException {
Collection mappings = new ArrayList();
if (user.equals(USER1)) {
mappings.add("address@localhost");
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Wed Sep 16 14:34:32 2009
@@ -89,11 +89,11 @@
}
if (usersRepository instanceof VirtualUserTable) {
- Collection mappings;
+ Collection<String> mappings;
try {
mappings = ((VirtualUserTable) usersRepository).getMappings(recipient.getUser(), recipient.getHost());
} catch (ErrorMappingException e) {
- StringBuffer errorBuffer = new StringBuffer(128)
+ StringBuilder errorBuffer = new StringBuilder(128)
.append("A problem as occoured trying to alias and forward user ")
.append(recipient)
.append(": ")
@@ -105,7 +105,7 @@
return handleMappings(mappings, sender, recipient, message);
}
} else {
- StringBuffer errorBuffer = new StringBuffer(128)
+ StringBuilder errorBuffer = new StringBuilder(128)
.append("Warning: the repository ")
.append(usersRepository.getClass().getName())
.append(" does not implement VirtualUserTable interface).");
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java Wed Sep 16 14:34:32 2009
@@ -111,13 +111,13 @@
*/
public Collection processMail(MailAddress sender, MailAddress recipient, MimeMessage message) throws MessagingException {
try {
- Collection mappings = vut.getMappings(recipient.getUser(), recipient.getHost());
+ Collection<String> mappings = vut.getMappings(recipient.getUser(), recipient.getHost());
if (mappings != null) {
return handleMappings(mappings, sender, recipient, message);
}
} catch (ErrorMappingException e) {
- StringBuffer errorBuffer = new StringBuffer(128)
+ StringBuilder errorBuffer = new StringBuilder(128)
.append("A problem as occoured trying to alias and forward user ")
.append(recipient)
.append(": ")
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/VirtualUserTable.java Wed Sep 16 14:34:32 2009
@@ -58,5 +58,5 @@
* @return the mapped mailAddress
* @throws ErrorMappingException get thrown if an error mapping was found
*/
- public Collection getMappings(String user, String domain) throws ErrorMappingException;
+ public Collection<String> getMappings(String user, String domain) throws ErrorMappingException;
}
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/AbstractUsersRepository.java Wed Sep 16 14:34:32 2009
@@ -153,9 +153,9 @@
* @see org.apache.james.api.vut.VirtualUserTable#getMappings(java.lang.String,
* java.lang.String)
*/
- public Collection getMappings(String username, String domain)
+ public Collection<String> getMappings(String username, String domain)
throws ErrorMappingException {
- Collection mappings = new ArrayList();
+ Collection<String> mappings = new ArrayList<String>();
User user = getUserByName(username);
if (user instanceof JamesUser) {
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/jamesuser/LocalJamesUsersRepository.java Wed Sep 16 14:34:32 2009
@@ -55,7 +55,7 @@
/**
* @see org.apache.james.api.vut.VirtualUserTable#getMappings(java.lang.String, java.lang.String)
*/
- public Collection getMappings(String user, String domain) throws ErrorMappingException {
+ public Collection<String> getMappings(String user, String domain) throws ErrorMappingException {
return ((JamesUsersRepository) users).getMappings(user, domain);
}
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java Wed Sep 16 14:34:32 2009
@@ -113,12 +113,12 @@
/**
* @see org.apache.james.api.vut.VirtualUserTable#getMappings(String, String)
*/
- public Collection getMappings(String user,String domain) throws ErrorMappingException {
+ public Collection<String> getMappings(String user,String domain) throws ErrorMappingException {
return getMappings(user,domain,mappingLimit);
}
- public Collection getMappings(String user,String domain,int mappingLimit) throws ErrorMappingException {
+ public Collection<String> getMappings(String user,String domain,int mappingLimit) throws ErrorMappingException {
// We have to much mappings throw ErrorMappingException to avoid infinity loop
if (mappingLimit == 0) throw new ErrorMappingException("554 Too many mappings to process");
@@ -127,15 +127,15 @@
// Only non-null mappings are translated
if (targetString != null) {
- Collection mappings = new ArrayList();
+ Collection<String> mappings = new ArrayList<String>();
if (targetString.startsWith(VirtualUserTable.ERROR_PREFIX)) {
throw new ErrorMappingException(targetString.substring(VirtualUserTable.ERROR_PREFIX.length()));
} else {
- Iterator map = VirtualUserTableUtil.mappingToCollection(targetString).iterator();
+ Iterator<String> map = VirtualUserTableUtil.mappingToCollection(targetString).iterator();
while (map.hasNext()) {
- String target = map.next().toString();
+ String target = map.next();
if (target.startsWith(VirtualUserTable.REGEX_PREFIX)) {
try {
@@ -179,7 +179,7 @@
return null;
}
- Collection childMappings = getMappings(userName, domainName, mappingLimit -1);
+ Collection<String> childMappings = getMappings(userName, domainName, mappingLimit -1);
if (childMappings == null) {
// add mapping
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java Wed Sep 16 14:34:32 2009
@@ -111,7 +111,7 @@
/**
* @see org.apache.james.api.vut.VirtualUserTable#getMappings(java.lang.String, java.lang.String)
*/
- public Collection getMappings(String user, String domain) throws ErrorMappingException {
+ public Collection<String> getMappings(String user, String domain) throws ErrorMappingException {
return vut.getMappings(user, domain);
}
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableUtil.java Wed Sep 16 14:34:32 2009
@@ -160,23 +160,23 @@
* @param rawMapping
* @deprecated Use mappingToCollection(String rawMapping)
*/
- public static Collection getMappings(String rawMapping) {
+ public static Collection<String> getMappings(String rawMapping) {
return mappingToCollection(rawMapping);
}
/**
* Convert a raw mapping String to a Collection
*
- * @param rawMapping the mapping Strin
+ * @param rawMapping the mapping String
* @return map a collection which holds all mappings
*/
- public static ArrayList mappingToCollection(String rawMapping) {
- ArrayList map = new ArrayList();
+ public static ArrayList<String> mappingToCollection(String rawMapping) {
+ ArrayList<String> map = new ArrayList<String>();
StringTokenizer tokenizer = new StringTokenizer(rawMapping,
VirtualUserTableUtil.getSeparator(rawMapping));
while (tokenizer.hasMoreTokens()) {
- String raw = tokenizer.nextToken().trim();
+ final String raw = tokenizer.nextToken().trim();
map.add(raw);
}
return map;
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java?rev=815806&r1=815805&r2=815806&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockVirtualUserTableManagementImpl.java Wed Sep 16 14:34:32 2009
@@ -95,7 +95,7 @@
return removeRawMapping(user,domain,VirtualUserTable.REGEX_PREFIX + regex);
}
- public Collection getMappings(String user, String domain) throws ErrorMappingException {
+ public Collection<String> getMappings(String user, String domain) throws ErrorMappingException {
throw new UnsupportedOperationException("Not implemented yet");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org