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 no...@apache.org on 2009/10/25 13:52:45 UTC
svn commit: r829565 - in /james/server/trunk:
core-api/src/main/java/org/apache/james/services/
domain-api/src/main/java/org/apache/james/api/dnsservice/
domain-api/src/main/java/org/apache/james/api/dnsservice/util/
domain-api/src/main/java/org/apache...
Author: norman
Date: Sun Oct 25 12:52:44 2009
New Revision: 829565
URL: http://svn.apache.org/viewvc?rev=829565&view=rev
Log:
Only some cleanup like add Generics/remove empty packages
Removed:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/api/
Modified:
james/server/trunk/core-api/src/main/java/org/apache/james/services/MailRepository.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/SpoolManager.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/DNSService.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/InetNetwork.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/SimpleDomainList.java
james/server/trunk/javamail-util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java
james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFDelimitedByteBuffer.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementMBean.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java
Modified: james/server/trunk/core-api/src/main/java/org/apache/james/services/MailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/services/MailRepository.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/services/MailRepository.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/services/MailRepository.java Sun Oct 25 12:52:44 2009
@@ -60,7 +60,7 @@
* @return an <code>Iterator</code> over the list of keys in the repository
*
*/
- Iterator list() throws MessagingException;
+ Iterator<String> list() throws MessagingException;
/**
* Retrieves a message given a key. At the moment, keys can be obtained
@@ -84,7 +84,7 @@
* @param mails The Collection of <code>MailImpl</code>'s to delete
* @since 2.2.0
*/
- void remove(Collection mails) throws MessagingException;
+ void remove(Collection<Mail> mails) throws MessagingException;
/**
* Removes a message identified by key.
Modified: james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/services/MailServer.java Sun Oct 25 12:52:44 2009
@@ -63,7 +63,7 @@
*
* @deprecated You can use MailetContext service for this purpose
*/
- void sendMail(MailAddress sender, Collection recipients, MimeMessage msg)
+ void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg)
throws MessagingException;
/**
@@ -77,7 +77,7 @@
*
* @deprecated You can use MailetContext service for this purpose
*/
- void sendMail(MailAddress sender, Collection recipients, InputStream msg)
+ void sendMail(MailAddress sender, Collection<MailAddress> recipients, InputStream msg)
throws MessagingException;
/**
Modified: james/server/trunk/core-api/src/main/java/org/apache/james/services/SpoolManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/services/SpoolManager.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/services/SpoolManager.java (original)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/services/SpoolManager.java Sun Oct 25 12:52:44 2009
@@ -20,6 +20,9 @@
import java.util.List;
+import org.apache.mailet.MailetConfig;
+import org.apache.mailet.MatcherConfig;
+
/**
* provide all the data needed to manage spool processors, mailets and matchers
*/
@@ -36,12 +39,12 @@
* @param processorName - name of the processor who's mailets should be retrieved
* @return List<MailetConfig>
*/
- List getMailetConfigs(String processorName);
+ List<MailetConfig> getMailetConfigs(String processorName);
/**
* retrieve all matchers for given processor
* @param processorName - name of the processor who's matchers should be retrieved
* @return List<MatcherConfig>
*/
- List getMatcherConfigs(String processorName);
+ List<MatcherConfig> getMatcherConfigs(String processorName);
}
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/DNSService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/DNSService.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/DNSService.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/DNSService.java Sun Oct 25 12:52:44 2009
@@ -26,6 +26,8 @@
import java.util.Collection;
import java.util.Iterator;
+import org.apache.mailet.HostAddress;
+
/**
* Provides abstraction for DNS resolutions. The interface is Mail specific.
@@ -53,7 +55,7 @@
* this mail domain name
* @throws TemporaryResolutionException get thrown on temporary problems
*/
- Collection findMXRecords(String hostname) throws TemporaryResolutionException;
+ Collection<String> findMXRecords(String hostname) throws TemporaryResolutionException;
/**
* Get a collection of DNS TXT Records
@@ -61,7 +63,7 @@
* @param hostname The hostname to check
* @return collection of strings representing TXT record values
*/
- Collection findTXTRecords(String hostname);
+ Collection<String> findTXTRecords(String hostname);
/**
@@ -82,7 +84,7 @@
* @return an Iterator over HostAddress instances, sorted by priority
* @throws TemporaryResolutionException get thrown on temporary problems
*/
- Iterator getSMTPHostAddresses(String domainName) throws TemporaryResolutionException;
+ Iterator<HostAddress> getSMTPHostAddresses(String domainName) throws TemporaryResolutionException;
/**
* @see java.net.InetAddress#getAllByName(String)
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/TemporaryResolutionException.java Sun Oct 25 12:52:44 2009
@@ -24,6 +24,7 @@
import java.io.IOException;
+@SuppressWarnings("serial")
public class TemporaryResolutionException extends IOException {
public TemporaryResolutionException() {
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/InetNetwork.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/InetNetwork.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/InetNetwork.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/InetNetwork.java Sun Oct 25 12:52:44 2009
@@ -206,8 +206,8 @@
static {
try {
- Class inetAddressClass = Class.forName("java.net.InetAddress");
- Class[] parameterTypes = { byte[].class };
+ Class<?> inetAddressClass = Class.forName("java.net.InetAddress");
+ Class<?>[] parameterTypes = { byte[].class };
getByAddress = inetAddressClass.getMethod("getByAddress", parameterTypes);
} catch (Exception e) {
getByAddress = null;
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java Sun Oct 25 12:52:44 2009
@@ -33,7 +33,7 @@
{
private DNSService dnsServer;
- private ArrayList networks;
+ private ArrayList<InetNetwork> networks;
/**
@@ -41,15 +41,15 @@
*
* @param nets a Collection which holds all networks
*/
- public void initInetNetworks(final Collection nets)
+ public void initInetNetworks(final Collection<String> nets)
{
- networks = new ArrayList();
+ networks = new ArrayList<InetNetwork>();
InetNetwork in = new InetNetwork(dnsServer);
- for (Iterator iter = nets.iterator(); iter.hasNext(); ) try
+ for (Iterator<String> iter = nets.iterator(); iter.hasNext(); ) try
{
- InetNetwork net = in.getFromString((String) iter.next());
+ InetNetwork net = in.getFromString(iter.next());
if (!networks.contains(net)) networks.add(net);
}
catch (java.net.UnknownHostException uhe)
@@ -67,7 +67,7 @@
public void initInetNetworks(final String[] nets)
{
- networks = new ArrayList();
+ networks = new ArrayList<InetNetwork>();
InetNetwork in = new InetNetwork(dnsServer);
@@ -104,9 +104,9 @@
boolean sameNet = false;
- if (ip != null) for (Iterator iter = networks.iterator(); (!sameNet) && iter.hasNext(); )
+ if (ip != null) for (Iterator<InetNetwork> iter = networks.iterator(); (!sameNet) && iter.hasNext(); )
{
- InetNetwork network = (InetNetwork) iter.next();
+ InetNetwork network = iter.next();
sameNet = network.contains(ip);
}
return sameNet;
@@ -119,9 +119,9 @@
{
boolean sameNet = false;
- for (Iterator iter = networks.iterator(); (!sameNet) && iter.hasNext(); )
+ for (Iterator<InetNetwork> iter = networks.iterator(); (!sameNet) && iter.hasNext(); )
{
- InetNetwork network = (InetNetwork) iter.next();
+ InetNetwork network = iter.next();
sameNet = network.contains(ip);
}
return sameNet;
@@ -145,7 +145,7 @@
* @param nets a Collection which holds all networks
* @param dnsServer the DNSService which will be used in this class
*/
- public NetMatcher(final Collection nets,DNSService dnsServer)
+ public NetMatcher(final Collection<String> nets,DNSService dnsServer)
{
this.dnsServer = dnsServer;
initInetNetworks(nets);
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/SimpleDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/SimpleDomainList.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/SimpleDomainList.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/domainlist/SimpleDomainList.java Sun Oct 25 12:52:44 2009
@@ -28,13 +28,13 @@
* Simplest implementation for ManageableDomainList
*/
public class SimpleDomainList implements ManageableDomainList {
- List domains = new LinkedList();
+ List<String> domains = new LinkedList<String>();
public boolean containsDomain(String domain) {
return domains.contains(domain);
}
- public List getDomains() {
+ public List<String> getDomains() {
return domains;
}
Modified: james/server/trunk/javamail-util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
URL: http://svn.apache.org/viewvc/james/server/trunk/javamail-util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/javamail-util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java (original)
+++ james/server/trunk/javamail-util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java Sun Oct 25 12:52:44 2009
@@ -56,7 +56,7 @@
private String required = "?";
- private HashMap headers = new HashMap();
+ private Map<String,String> headers = new HashMap<String,String>();
/**
* Init the spamassassin invoker
@@ -180,7 +180,7 @@
*
* @return headers Map of headers to add as attributes
*/
- public Map getHeadersAsAttribute() {
+ public Map<String,String> getHeadersAsAttribute() {
return headers;
}
}
Modified: james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java (original)
+++ james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ExtensibleHandler.java Sun Oct 25 12:52:44 2009
@@ -42,6 +42,6 @@
* @param interfaceName
* @param extension a list of objects implementing the marker interface
*/
- void wireExtensions(Class interfaceName, List extension) throws WiringException;
+ void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException;
}
Modified: james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java (original)
+++ james/server/trunk/socket-api/src/main/java/org/apache/james/api/protocol/ProtocolHandlerChain.java Sun Oct 25 12:52:44 2009
@@ -11,7 +11,6 @@
* @param type the type of handler we're interested in
* @return a List of handlers
*/
- @SuppressWarnings("unchecked")
public abstract <T> LinkedList<T> getHandlers(Class<T> type);
}
\ No newline at end of file
Modified: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFDelimitedByteBuffer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFDelimitedByteBuffer.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFDelimitedByteBuffer.java (original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/CRLFDelimitedByteBuffer.java Sun Oct 25 12:52:44 2009
@@ -160,12 +160,10 @@
java.io.IOException e;
byte[] bytes;
- @SuppressWarnings("unused")
public Line(byte[] data) {
bytes = data;
}
- @SuppressWarnings("unused")
public Line(String data) {
bytes = data.getBytes();
}
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersStore.java Sun Oct 25 12:52:44 2009
@@ -54,5 +54,5 @@
* @return an Iterator over the set of repository names
* for this store
*/
- Iterator getRepositoryNames();
+ Iterator<String> getRepositoryNames();
}
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementMBean.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/user/management/UserManagementMBean.java Sun Oct 25 12:52:44 2009
@@ -195,5 +195,5 @@
*
* @return List<String> of repository names
*/
- List getUserRepositoryNames();
+ List<String> getUserRepositoryNames();
}
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementMBean.java Sun Oct 25 12:52:44 2009
@@ -129,7 +129,7 @@
* @return the collection which holds the mappings.
* @throws VirtualUserTableManagementException TODO
*/
- public Collection getUserDomainMappings(String virtualUserTable, String user, String domain) throws VirtualUserTableManagementException;
+ public Collection<String> getUserDomainMappings(String virtualUserTable, String user, String domain) throws VirtualUserTableManagementException;
/**
* Try to identify the right method based on the prefix of the mapping and add it.
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/vut/management/VirtualUserTableManagementService.java Sun Oct 25 12:52:44 2009
@@ -114,7 +114,7 @@
* @return the collection which holds the mappings.
* @throws VirtualUserTableManagementException get thrown if an invalid use or domain was given
*/
- public Collection getUserDomainMappings(String virtualUserTable, String user, String domain) throws VirtualUserTableManagementException;
+ public Collection<String> getUserDomainMappings(String virtualUserTable, String user, String domain) throws VirtualUserTableManagementException;
/**
* Try to identify the right method based on the prefix of the mapping and add it.
@@ -147,7 +147,7 @@
* @return Map which holds all mappings
* @throws VirtualUserTableManagementException
*/
- public Map getAllMappings(String virtualUserTable) throws VirtualUserTableManagementException;
+ public Map<String,Collection<String>> getAllMappings(String virtualUserTable) throws VirtualUserTableManagementException;
/**
* Add aliasDomain mapping
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java Sun Oct 25 12:52:44 2009
@@ -61,7 +61,7 @@
return bean.getForwardAddress(userName, repositoryName);
}
- public List getUserRepositoryNames() {
+ public List<String> getUserRepositoryNames() {
return bean.getUserRepositoryNames();
}
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java Sun Oct 25 12:52:44 2009
@@ -137,7 +137,7 @@
/**
* @see org.apache.james.api.user.UsersRepository#list()
*/
- public Iterator list() {
+ public Iterator<String> list() {
return users.list();
}
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java?rev=829565&r1=829564&r2=829565&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java Sun Oct 25 12:52:44 2009
@@ -218,7 +218,7 @@
Iterator<String> repositoryNames = usersStore.getRepositoryNames();
while (repositoryNames.hasNext()) {
- String name = (String) repositoryNames.next();
+ String name = repositoryNames.next();
result.add(name);
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org