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 20:08:59 UTC
svn commit: r829632 - in /james/server/trunk:
avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/
avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/
avalon-spring-bridge-library/s...
Author: norman
Date: Sun Oct 25 19:08:56 2009
New Revision: 829632
URL: http://svn.apache.org/viewvc?rev=829632&view=rev
Log:
add Generics
Modified:
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ConfigurationProvider.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerFactory.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinition.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinitionReader.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/examples/configuration/StringRemapperConfigurationInterceptor.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/AbstractPropagator.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationPropagator.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ContextPropagator.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/InitializationPropagator.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/LoggerPropagator.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ServicePropagator.java
james/server/trunk/avalon-spring-bridge-library/src/test/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactoryTestCase.java
james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/StoreGateKeeperImpl.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UidToKeyBidiMap.java
james/server/trunk/core-function/src/test/java/org/apache/james/dnsserver/DNSServerTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/AbstractDNSServer.java
james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockUsersStore.java
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java Sun Oct 25 19:08:56 2009
@@ -38,7 +38,7 @@
*/
public class AvalonConfigurationFileProvider implements ConfigurationProvider, ResourceLoaderAware {
- private List configurationInterceptors;
+ private List<ConfigurationInterceptor> configurationInterceptors;
private String configuration;
private ResourceLoader resourceLoader;
@@ -71,9 +71,9 @@
// apply all interceptors
if (configuration != null && configurationInterceptors != null) {
- Iterator interceptorsIterator = configurationInterceptors.iterator();
+ Iterator<ConfigurationInterceptor> interceptorsIterator = configurationInterceptors.iterator();
while (interceptorsIterator.hasNext()) {
- ConfigurationInterceptor configurationInterceptor = (ConfigurationInterceptor) interceptorsIterator.next();
+ ConfigurationInterceptor configurationInterceptor = interceptorsIterator.next();
configuration = configurationInterceptor.intercept(configuration);
}
}
@@ -84,7 +84,7 @@
this.configuration = configuration;
}
- public void setConfigurationInterceptors(List configurationInterceptors) {
+ public void setConfigurationInterceptors(List<ConfigurationInterceptor> configurationInterceptors) {
this.configurationInterceptors = configurationInterceptors;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ConfigurationProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ConfigurationProvider.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ConfigurationProvider.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ConfigurationProvider.java Sun Oct 25 19:08:56 2009
@@ -19,6 +19,7 @@
package org.apache.james.container.spring.adaptor;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.james.container.spring.configuration.ConfigurationInterceptor;
import java.util.List;
@@ -30,6 +31,6 @@
Configuration getConfiguration();
- void setConfigurationInterceptors(List configurationInterceptors);
+ void setConfigurationInterceptors(List<ConfigurationInterceptor> configurationInterceptors);
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java Sun Oct 25 19:08:56 2009
@@ -38,25 +38,25 @@
public class DefaultServiceManagerFactory implements ApplicationContextAware, ServiceManagerFactory {
private ApplicationContext applicationContext;
- private final Map replacements = new HashMap();
+ private final Map<String,String> replacements = new HashMap<String,String>();
private class ServiceManagerBridge implements ServiceManager {
- private final Map avalonServices = new HashMap();
+ private final Map<String,Object> avalonServices = new HashMap<String,Object>();
- public ServiceManagerBridge(List avalonServiceReferences) {
+ public ServiceManagerBridge(List<AvalonServiceReference> avalonServiceReferences) {
populateServiceMap(avalonServiceReferences);
}
- private void populateServiceMap(List avalonServiceReferences) {
- Iterator iterator = avalonServiceReferences.iterator();
+ private void populateServiceMap(List<AvalonServiceReference> avalonServiceReferences) {
+ Iterator<AvalonServiceReference> iterator = avalonServiceReferences.iterator();
while (iterator.hasNext()) {
- AvalonServiceReference serviceReference = (AvalonServiceReference) iterator.next();
+ AvalonServiceReference serviceReference = iterator.next();
String name = serviceReference.getName();
String rolename = serviceReference.getRolename();
// the interface to be injected
- Class roleClass = null;
+ Class<?> roleClass = null;
try {
roleClass = Class.forName(rolename);
} catch (ClassNotFoundException e) {
@@ -65,7 +65,7 @@
// if the service should be replaced by a bean, update the name here.
if (replacements.containsKey(name)) {
- name = (String)replacements.get(name);
+ name = replacements.get(name);
}
// the object to be injected (reduced to roleClass)
@@ -119,7 +119,7 @@
* @param replacements - Map<String, String>, the key indicating the service reference to be replaced, the value
* indicating the replacement bean
*/
- public void setReplacements(Map replacements) {
+ public void setReplacements(Map<String,String> replacements) {
this.replacements.putAll(replacements);
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerFactory.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerFactory.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerFactory.java Sun Oct 25 19:08:56 2009
@@ -29,7 +29,7 @@
ServiceManager getInstanceFor(String beanName, BeanDefinition beanDefinition);
- void setReplacements(Map replacements);
+ void setReplacements(Map<String,String> replacements);
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonApplicationContext.java Sun Oct 25 19:08:56 2009
@@ -76,11 +76,10 @@
public static void loadAvalonBasedBeanDefinitions(DefaultListableBeanFactory defaultListableBeanFactory, Resource containerConfigurationResource, Resource applicationConfigurationResource) {
XmlBeanDefinitionReader containerBeanDefinitionReader = new XmlBeanDefinitionReader(defaultListableBeanFactory);
- int containerBeanCount = containerBeanDefinitionReader.loadBeanDefinitions(containerConfigurationResource);
+ containerBeanDefinitionReader.loadBeanDefinitions(containerConfigurationResource);
AvalonBeanDefinitionReader applicationBeanDefinitionReader = new AvalonBeanDefinitionReader(defaultListableBeanFactory);
- int applicationBeanCount = applicationBeanDefinitionReader.loadBeanDefinitions(applicationConfigurationResource);
+ applicationBeanDefinitionReader.loadBeanDefinitions(applicationConfigurationResource);
- int totalBeanCount = containerBeanCount + applicationBeanCount;
}
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinition.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinition.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinition.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinition.java Sun Oct 25 19:08:56 2009
@@ -25,22 +25,23 @@
/**
*/
+@SuppressWarnings("serial")
public class AvalonBeanDefinition extends RootBeanDefinition {
- protected final List serviceReferences = new ArrayList();
+ protected final List<AvalonServiceReference> serviceReferences = new ArrayList<AvalonServiceReference>();
public AvalonBeanDefinition() {
super();
}
- public void addAllServiceReferences(List serviceReferences) {
+ public void addAllServiceReferences(List<AvalonServiceReference> serviceReferences) {
this.serviceReferences.addAll(serviceReferences);
}
public void addServiceReference(AvalonServiceReference serviceReference) {
serviceReferences.add(serviceReference);
}
- public List getServiceReferences() {
+ public List<AvalonServiceReference> getServiceReferences() {
return serviceReferences;
}
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinitionReader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinitionReader.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinitionReader.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonBeanDefinitionReader.java Sun Oct 25 19:08:56 2009
@@ -104,8 +104,8 @@
return bd;
}
- private List loadServiceReferences(Configuration block) {
- List serviceReferences = new ArrayList();
+ private List<AvalonServiceReference> loadServiceReferences(Configuration block) {
+ List<AvalonServiceReference> serviceReferences = new ArrayList<AvalonServiceReference>();
Configuration[] referencedComponentDefs = block.getChildren("provide");
if (referencedComponentDefs == null) return serviceReferences;
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/examples/configuration/StringRemapperConfigurationInterceptor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/examples/configuration/StringRemapperConfigurationInterceptor.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/examples/configuration/StringRemapperConfigurationInterceptor.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/examples/configuration/StringRemapperConfigurationInterceptor.java Sun Oct 25 19:08:56 2009
@@ -31,12 +31,12 @@
*/
public class StringRemapperConfigurationInterceptor extends TraversingConfigurationInterceptor {
- private final Map mappings = new LinkedHashMap();
+ private final Map<String,String> mappings = new LinkedHashMap<String,String>();
/**
* @param mappings - Map<String, String>, key being the string to be replaced, value being the replacement
*/
- public void setMappings(Map mappings) {
+ public void setMappings(Map<String,String> mappings) {
this.mappings.putAll(mappings);
}
@@ -57,10 +57,10 @@
continue; // if value is not accessible, skip it
}
- Iterator iterator = mappings.keySet().iterator();
+ Iterator<String> iterator = mappings.keySet().iterator();
while (iterator.hasNext()) {
- String find = (String) iterator.next();
- String replacement = (String) mappings.get(find);
+ String find = iterator.next();
+ String replacement = mappings.get(find);
String replaced = StringUtils.replace(attributeValue, find, replacement);
mutableConfiguration.setAttribute(attributeName, replaced);
}
@@ -76,9 +76,9 @@
}
if (value == null) return;
- Iterator iterator = mappings.keySet().iterator();
+ Iterator<String> iterator = mappings.keySet().iterator();
while (iterator.hasNext()) {
- String find = (String) iterator.next();
+ String find = iterator.next();
String replacement = (String) mappings.get(find);
String replaced = StringUtils.replace(value, find, replacement);
mutableConfiguration.setValue(replaced);
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/AbstractPropagator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/AbstractPropagator.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/AbstractPropagator.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/AbstractPropagator.java Sun Oct 25 19:08:56 2009
@@ -31,7 +31,7 @@
*/
public abstract class AbstractPropagator implements BeanFactoryAware {
- private Collection excludeBeans;
+ private Collection<String> excludeBeans;
private BeanFactory beanFactory;
@@ -67,11 +67,11 @@
return bean;
}
- public void setExcludeBeans(Collection excludeBeans) {
+ public void setExcludeBeans(Collection<String> excludeBeans) {
this.excludeBeans=excludeBeans;
}
- protected abstract Class getLifecycleInterface();
+ protected abstract Class<?> getLifecycleInterface();
protected abstract void invokeLifecycleWorker(String beanName, Object bean, BeanDefinition beanDefinition);
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationPropagator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationPropagator.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationPropagator.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationPropagator.java Sun Oct 25 19:08:56 2009
@@ -46,7 +46,7 @@
return 3;
}
- protected Class getLifecycleInterface() {
+ protected Class<?> getLifecycleInterface() {
return Configurable.class;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ContextPropagator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ContextPropagator.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ContextPropagator.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ContextPropagator.java Sun Oct 25 19:08:56 2009
@@ -37,7 +37,7 @@
this.context = context;
}
- protected Class getLifecycleInterface() {
+ protected Class<?> getLifecycleInterface() {
return Contextualizable.class;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/InitializationPropagator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/InitializationPropagator.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/InitializationPropagator.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/InitializationPropagator.java Sun Oct 25 19:08:56 2009
@@ -36,7 +36,7 @@
*/
public class InitializationPropagator extends AbstractPropagator implements BeanPostProcessor, Ordered, LoaderService {
- protected Class getLifecycleInterface() {
+ protected Class<?> getLifecycleInterface() {
return Initializable.class;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/LoggerPropagator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/LoggerPropagator.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/LoggerPropagator.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/LoggerPropagator.java Sun Oct 25 19:08:56 2009
@@ -32,7 +32,7 @@
private LoggerToComponentMapper loggerFactory;
- protected Class getLifecycleInterface() {
+ protected Class<?> getLifecycleInterface() {
return LogEnabled.class;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ServicePropagator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ServicePropagator.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ServicePropagator.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/lifecycle/ServicePropagator.java Sun Oct 25 19:08:56 2009
@@ -38,7 +38,7 @@
this.serviceManagerFactory = serviceManagerFactory;
}
- protected Class getLifecycleInterface() {
+ protected Class<?> getLifecycleInterface() {
return Serviceable.class;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/test/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactoryTestCase.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/test/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactoryTestCase.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/test/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactoryTestCase.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/test/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactoryTestCase.java Sun Oct 25 19:08:56 2009
@@ -40,16 +40,16 @@
private class TestApplicationContext extends AbstractRefreshableApplicationContext {
- private HashMap beannameToDefinitionMap = new HashMap();
+ private HashMap<String,BeanDefinition> beannameToDefinitionMap = new HashMap<String,BeanDefinition>();
public void addBean(String beanName, BeanDefinition beanDefinition) {
beannameToDefinitionMap.put(beanName, beanDefinition);
}
protected void loadBeanDefinitions(DefaultListableBeanFactory defaultListableBeanFactory) throws IOException, BeansException {
- Iterator iterator = beannameToDefinitionMap.keySet().iterator();
+ Iterator<String> iterator = beannameToDefinitionMap.keySet().iterator();
while (iterator.hasNext()) {
- String beanname = (String) iterator.next();
+ String beanname = iterator.next();
BeanDefinition beanDefinition = (BeanDefinition) beannameToDefinitionMap.get(beanname);
defaultListableBeanFactory.registerBeanDefinition(beanname, beanDefinition);
}
@@ -120,7 +120,7 @@
DefaultServiceManagerFactory managerFactory = new DefaultServiceManagerFactory();
managerFactory.setApplicationContext(testApplicationContext);
try {
- ServiceManager manager = managerFactory.getInstanceFor("referencingBean", referencingBeanDefinition);
+ managerFactory.getInstanceFor("referencingBean", referencingBeanDefinition);
fail("must throw exception");
} catch (Exception e) {
assertTrue("cannot have 2 references of same type!", true);
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/dnsserver/DNSServer.java Sun Oct 25 19:08:56 2009
@@ -27,6 +27,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
+import org.apache.mailet.HostAddress;
import org.xbill.DNS.ARecord;
import org.xbill.DNS.Cache;
import org.xbill.DNS.Credibility;
@@ -89,7 +90,7 @@
/**
* The DNS servers to be used by this service
*/
- private List dnsServers = new ArrayList();
+ private List<String> dnsServers = new ArrayList<String>();
/**
* The search paths to be used
@@ -99,7 +100,7 @@
/**
* The MX Comparator used in the MX sort.
*/
- private Comparator mxComparator = new MXRecordComparator();
+ private Comparator<MXRecord> mxComparator = new MXRecordComparator();
/**
* If true than the DNS server will return only a single IP per each MX record
@@ -129,7 +130,7 @@
final boolean autodiscover =
configuration.getChild( "autodiscover" ).getValueAsBoolean( true );
- List sPaths = new ArrayList();
+ List<Name> sPaths = new ArrayList<Name>();
if (autodiscover) {
getLogger().info("Autodiscovery is enabled - trying to discover your system's DNS Servers");
String[] serversArray = ResolverConfig.getCurrentConfig().servers();
@@ -144,8 +145,8 @@
sPaths.addAll(Arrays.asList(systemSearchPath));
}
if (getLogger().isInfoEnabled()) {
- for (Iterator i = sPaths.iterator(); i.hasNext();) {
- Name searchPath = (Name) i.next();
+ for (Iterator<Name> i = sPaths.iterator(); i.hasNext();) {
+ Name searchPath = i.next();
getLogger().info("Adding autodiscovered search path " + searchPath.toString());
}
}
@@ -276,9 +277,9 @@
* @return a list of MX records corresponding to this mail domain
* @throws TemporaryResolutionException get thrown on temporary problems
*/
- private List findMXRecordsRaw(String hostname) throws TemporaryResolutionException {
+ private List<String> findMXRecordsRaw(String hostname) throws TemporaryResolutionException {
Record answers[] = lookup(hostname, Type.MX, "MX");
- List servers = new ArrayList();
+ List<String> servers = new ArrayList<String>();
if (answers == null) {
return servers;
}
@@ -300,8 +301,8 @@
/**
* @see org.apache.james.api.dnsservice.DNSService#findMXRecords(String)
*/
- public Collection findMXRecords(String hostname) throws TemporaryResolutionException {
- List servers = new ArrayList();
+ public Collection<String> findMXRecords(String hostname) throws TemporaryResolutionException {
+ List<String> servers = new ArrayList<String>();
try {
servers = findMXRecordsRaw(hostname);
return Collections.unmodifiableCollection(servers);
@@ -402,11 +403,11 @@
* = 0 ==> a = b
* > 0 ==> a > b
*/
- private static class MXRecordComparator implements Comparator {
+ private static class MXRecordComparator implements Comparator<MXRecord> {
private final static Random random = new Random();
- public int compare (Object a, Object b) {
- int pa = ((MXRecord)a).getPriority();
- int pb = ((MXRecord)b).getPriority();
+ public int compare (MXRecord a, MXRecord b) {
+ int pa = a.getPriority();
+ int pb = b.getPriority();
return (pa == pb) ? (512 - random.nextInt(1024)) : pa - pb;
}
}
@@ -414,10 +415,10 @@
/**
* @see org.apache.james.api.dnsservice.DNSService#getSMTPHostAddresses(String)
*/
- public Iterator getSMTPHostAddresses(final String domainName) throws TemporaryResolutionException {
- return new Iterator() {
- private Iterator mxHosts = findMXRecords(domainName).iterator();
- private Iterator addresses = null;
+ public Iterator<HostAddress> getSMTPHostAddresses(final String domainName) throws TemporaryResolutionException {
+ return new Iterator<HostAddress>() {
+ private Iterator<String> mxHosts = findMXRecords(domainName).iterator();
+ private Iterator<HostAddress> addresses = null;
public boolean hasNext() {
/* Make sure that when next() is called, that we can
@@ -448,14 +449,14 @@
}
final InetAddress[] ipAddresses = addrs;
- addresses = new Iterator() {
+ addresses = new Iterator<HostAddress>() {
int i = 0;
public boolean hasNext() {
return ipAddresses != null && i < ipAddresses.length;
}
- public Object next() {
+ public HostAddress next() {
return new org.apache.mailet.HostAddress(nextHostname, "smtp://" + ipAddresses[i++].getHostAddress());
}
@@ -468,7 +469,7 @@
return addresses != null && addresses.hasNext();
}
- public Object next() {
+ public HostAddress next() {
return addresses != null ? addresses.next() : null;
}
@@ -557,8 +558,8 @@
/**
* @see org.apache.james.api.dnsservice.DNSService#findTXTRecords(String)
*/
- public Collection findTXTRecords(String hostname){
- List txtR = new ArrayList();
+ public Collection<String> findTXTRecords(String hostname){
+ List<String> txtR = new ArrayList<String>();
Record[] records = lookupNoException(hostname, Type.TXT, "TXT");
if (records != null) {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java Sun Oct 25 19:08:56 2009
@@ -55,8 +55,8 @@
/**
* @see org.apache.james.api.domainlist.DomainList#getDomains()
*/
- public List getDomains() {
- List domains = getDomainListInternal();
+ public List<String> getDomains() {
+ List<String> domains = getDomainListInternal();
if (domains != null) {
String hostName = null;
@@ -78,7 +78,7 @@
}
if (getLogger().isInfoEnabled()) {
- for (Iterator i = domains.iterator(); i.hasNext(); ) {
+ for (Iterator<String> i = domains.iterator(); i.hasNext(); ) {
getLogger().debug("Handling mail for: " + i.next());
}
}
@@ -95,11 +95,11 @@
* @param domains List of domains
* @return domainIP List of ipaddress for domains
*/
- private static List getDomainsIP(List domains,DNSService dns,Logger log) {
- List domainIP = new ArrayList();
+ private static List<String> getDomainsIP(List<String> domains,DNSService dns,Logger log) {
+ List<String> domainIP = new ArrayList<String>();
if (domains.size() > 0 ) {
for (int i = 0; i < domains.size(); i++) {
- List domList = getDomainIP(domains.get(i).toString(),dns,log);
+ List<String> domList = getDomainIP(domains.get(i).toString(),dns,log);
for(int i2 = 0; i2 < domList.size();i2++) {
if(domainIP.contains(domList.get(i2)) == false) {
@@ -114,8 +114,8 @@
/**
* @see #getDomainsIP(List, DNSService, Logger)
*/
- private static List getDomainIP(String domain, DNSService dns, Logger log) {
- List domainIP = new ArrayList();
+ private static List<String> getDomainIP(String domain, DNSService dns, Logger log) {
+ List<String> domainIP = new ArrayList<String>();
try {
InetAddress[] addrs = dns.getAllByName(domain);
for (int j = 0; j < addrs.length ; j++) {
@@ -181,7 +181,7 @@
*
* @return List
*/
- protected abstract List getDomainListInternal();
+ protected abstract List<String> getDomainListInternal();
/**
* Add domain
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java Sun Oct 25 19:08:56 2009
@@ -96,7 +96,7 @@
// Parse the DestinationURL for the name of the datasource,
// the table to use, and the (optional) repository Key.
// Split on "/", starting after "db://"
- List urlParams = new ArrayList();
+ List<String> urlParams = new ArrayList<String>();
int start = 5;
int end = destination.indexOf('/', start);
@@ -181,7 +181,7 @@
}
// Build the statement parameters
- Map sqlParameters = new HashMap();
+ Map<String,String> sqlParameters = new HashMap<String,String>();
if (tableName != null) {
sqlParameters.put("table", tableName);
}
@@ -240,8 +240,8 @@
/**
* @see org.apache.james.domain.AbstractDomainList#getDomainListInternal()
*/
- protected List getDomainListInternal() {
- List domains = new ArrayList();
+ protected List<String> getDomainListInternal() {
+ List<String> domains = new ArrayList<String>();
Connection conn = null;
PreparedStatement mappingStmt = null;
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/XMLDomainList.java Sun Oct 25 19:08:56 2009
@@ -34,7 +34,7 @@
*/
public class XMLDomainList extends AbstractDomainList implements Configurable {
- private List domainNames = null;
+ private List<String> domainNames = null;
private boolean managementDisabled = false;
@@ -66,12 +66,12 @@
/**
* @see org.apache.james.domain.AbstractDomainList#getDomainListInternal()
*/
- protected List getDomainListInternal() {
+ protected List<String> getDomainListInternal() {
// TODO: Remove temporary fix!
// This is set to true to get sure now new domain can get added or removed
// after the domains were retrieved by James.java. See is a workaround!
managementDisabled = true;
- return new ArrayList(domainNames);
+ return new ArrayList<String>(domainNames);
}
/**
@@ -92,7 +92,7 @@
if (managementDisabled) throw new UnsupportedOperationException("Management not supported");
if (domainNames == null) {
- domainNames = new ArrayList();
+ domainNames = new ArrayList<String>();
}
String newDomain = domain.toLowerCase(Locale.US);
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java Sun Oct 25 19:08:56 2009
@@ -186,10 +186,10 @@
/**
* @see org.apache.james.services.MailRepository#remove(Collection)
*/
- public void remove(Collection mails) throws MessagingException {
- Iterator delList = mails.iterator();
+ public void remove(Collection<Mail> mails) throws MessagingException {
+ Iterator<Mail>delList = mails.iterator();
while (delList.hasNext()) {
- remove((Mail)delList.next());
+ remove(delList.next());
}
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java Sun Oct 25 19:08:56 2009
@@ -55,13 +55,14 @@
private static long id;
// map of [destinationURL + type]->Repository
+ @SuppressWarnings("unchecked")
private Map repositories;
// map of [protocol(destinationURL) + type ]->classname of repository;
- private Map classes;
+ private Map<String,String> classes;
// map of [protocol(destinationURL) + type ]->default config for repository.
- private Map defaultConfigs;
+ private Map<String,Configuration> defaultConfigs;
/**
* The Avalon configuration used by the instance
@@ -102,8 +103,8 @@
getLogger().info("JamesMailStore init...");
repositories = new ReferenceMap();
- classes = new HashMap();
- defaultConfigs = new HashMap();
+ classes = new HashMap<String,String>();
+ defaultConfigs = new HashMap<String,Configuration>();
Configuration[] registeredClasses
= configuration.getChild("repositories").getChildren("repository");
for ( int i = 0; i < registeredClasses.length; i++ )
@@ -185,6 +186,7 @@
* Configuration or retrieving the
* MailRepository
*/
+ @SuppressWarnings("unchecked")
public synchronized Object select(Object hint) throws ServiceException {
Configuration repConf = null;
try {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java Sun Oct 25 19:08:56 2009
@@ -183,7 +183,7 @@
// Parse the DestinationURL for the name of the datasource,
// the table to use, and the (optional) repository Key.
// Split on "/", starting after "db://"
- List urlParams = new ArrayList();
+ List<String> urlParams = new ArrayList<String>();
int start = 5;
if (destination.startsWith("dbfile")) {
//this is dbfile:// instead of db://
@@ -321,7 +321,7 @@
}
// Build the statement parameters
- Map sqlParameters = new HashMap();
+ Map<String,String> sqlParameters = new HashMap<String,String>();
if (tableName != null) {
sqlParameters.put("table", tableName);
}
@@ -492,7 +492,7 @@
updateMessage.setString(3, mc.getSender().toString());
}
StringBuffer recipients = new StringBuffer();
- for (Iterator i = mc.getRecipients().iterator(); i.hasNext(); ) {
+ for (Iterator<MailAddress> i = mc.getRecipients().iterator(); i.hasNext(); ) {
recipients.append(i.next().toString());
if (i.hasNext()) {
recipients.append("\r\n");
@@ -607,7 +607,7 @@
insertMessage.setString(5, mc.getSender().toString());
}
StringBuffer recipients = new StringBuffer();
- for (Iterator i = mc.getRecipients().iterator(); i.hasNext(); ) {
+ for (Iterator<MailAddress> i = mc.getRecipients().iterator(); i.hasNext(); ) {
recipients.append(i.next().toString());
if (i.hasNext()) {
recipients.append("\r\n");
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCSpoolRepository.java Sun Oct 25 19:08:56 2009
@@ -101,7 +101,7 @@
/**
* A queue in memory of messages that need processing
*/
- private LinkedList pendingMessages = new LinkedList();
+ private LinkedList<PendingMessage> pendingMessages = new LinkedList<PendingMessage>();
/**
* When the queue was last read
*/
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MBoxMailRepository.java Sun Oct 25 19:08:56 2009
@@ -137,7 +137,7 @@
* The internal list of the emails
* The key is an adapted MD5 checksum of the mail
*/
- private Hashtable mList = null;
+ private Hashtable<String,Long> mList = null;
/**
* The filename to read & write the mbox from/to
*/
@@ -464,7 +464,7 @@
if (initialCapacity > Integer.MAX_VALUE) {
initialCapacity = Integer.MAX_VALUE - 1;
}
- this.mList = new Hashtable((int)initialCapacity);
+ this.mList = new Hashtable<String,Long>((int)initialCapacity);
this.parseMboxFile(ins, new MessageAction() {
public boolean isComplete() { return false; }
public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) {
@@ -484,7 +484,7 @@
//System.out.println("Done Load keys!");
} catch (FileNotFoundException e) {
getLogger().error("Unable to save(open) file (File not found) " + mboxFile, e);
- this.mList = new Hashtable((int)DEFAULTMLISTCAPACITY);
+ this.mList = new Hashtable<String,Long>((int)DEFAULTMLISTCAPACITY);
} catch (IOException e) {
getLogger().error("Unable to write file (General I/O problem) " + mboxFile, e);
} finally {
@@ -545,9 +545,9 @@
/**
* @see org.apache.james.services.MailRepository#list()
*/
- public Iterator list() {
+ public Iterator<String> list() {
loadKeys();
- ArrayList keys = new ArrayList(mList.keySet());
+ ArrayList<String> keys = new ArrayList<String>(mList.keySet());
if (keys.isEmpty() == false) {
// find the first message. This is a trick to make sure that if
@@ -601,7 +601,7 @@
* @see org.apache.james.services.MailRepository#remove(Mail)
*/
public void remove(Mail mail) {
- ArrayList remArray = new ArrayList();
+ ArrayList<Mail> remArray = new ArrayList<Mail>();
remArray.add(mail);
remove(remArray);
}
@@ -666,7 +666,7 @@
/**
* @see org.apache.james.services.MailRepository#remove(Collection)
*/
- public void remove(final Collection mails)
+ public void remove(final Collection<Mail> mails)
{
if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
StringBuffer logBuffer =
@@ -691,11 +691,11 @@
try {
String currentKey=generateKeyValue(bodyText);
boolean foundKey=false;
- Iterator mailList = mails.iterator();
+ Iterator<Mail> mailList = mails.iterator();
String key;
while (mailList.hasNext()) {
// Attempt to find the current key in the array
- key = ((Mail)mailList.next()).getName();
+ key = mailList.next().getName();
if (key.equals(currentKey)) {
// Don't write the message to disk
foundKey = true;
@@ -730,11 +730,11 @@
}
// Now delete the keys in mails from the main hash
- Iterator mailList = mails.iterator();
+ Iterator<Mail> mailList = mails.iterator();
String key;
while (mailList.hasNext()) {
// Attempt to find the current key in the array
- key = ((Mail)mailList.next()).getName();
+ key = mailList.next().getName();
mList.remove(key);
}
@@ -757,7 +757,7 @@
getLogger().error("Lock failed!",e);
return; // No lock, so exit
}
- ArrayList keys = new ArrayList();
+ ArrayList<Mail> keys = new ArrayList<Mail>();
keys.add(retrieve(key));
this.remove(keys);
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java Sun Oct 25 19:08:56 2009
@@ -136,7 +136,7 @@
/**
* @see org.apache.james.services.MailRepository#list()
*/
- public Iterator list() throws MessagingException {
+ public Iterator<String> list() throws MessagingException {
return spoolRep.list();
}
@@ -157,7 +157,7 @@
/**
* @see org.apache.james.services.MailRepository#remove(java.util.Collection)
*/
- public void remove(Collection mails) throws MessagingException {
+ public void remove(Collection<Mail> mails) throws MessagingException {
spoolRep.remove(mails);
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MessageInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MessageInputStream.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MessageInputStream.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MessageInputStream.java Sun Oct 25 19:08:56 2009
@@ -153,6 +153,7 @@
}
}
+ @SuppressWarnings("serial")
private void throwException() throws IOException {
try {
if (wrapped == null) {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java Sun Oct 25 19:08:56 2009
@@ -306,7 +306,7 @@
* @param mails
* @throws MessagingException
*/
- public void remove(final Collection mails) throws MessagingException {
+ public void remove(final Collection<Mail> mails) throws MessagingException {
log.debug("UIDPlusFolder remove by Collection " + mails.size());
if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
StringBuffer logBuffer = new StringBuffer(128).append(
@@ -315,13 +315,13 @@
getLogger().debug(logBuffer.toString());
}
- Iterator mailList = mails.iterator();
+ Iterator<Mail> mailList = mails.iterator();
/*
* remove every email from the Collection
*/
while (mailList.hasNext()) {
- remove(((Mail) mailList.next()).getName());
+ remove(mailList.next().getName());
}
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java Sun Oct 25 19:08:56 2009
@@ -171,13 +171,13 @@
*
* @see org.apache.james.services.MailRepository#list()
*/
- public Iterator list() throws MessagingException {
+ public Iterator<String> list() throws MessagingException {
try {
getFolderGateKeeper().use();
log.debug("list()");
rehash(null);
final String[] keys = getKeyToMsgMap().getKeys();
- final Iterator it = Arrays.asList(keys).iterator();
+ final Iterator<String> it = Arrays.asList(keys).iterator();
return it;
} catch (MessagingException e) {
throw e;
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/StoreGateKeeperImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/StoreGateKeeperImpl.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/StoreGateKeeperImpl.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/StoreGateKeeperImpl.java Sun Oct 25 19:08:56 2009
@@ -30,7 +30,7 @@
private Store store;
- Map folderGateKeeperMap = new HashMap();
+ Map<String, FolderGateKeeper> folderGateKeeperMap = new HashMap<String, FolderGateKeeper>();
FolderGateKeeper defaultFolder = null;
private FolderAdapterFactory folderFactory;
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java Sun Oct 25 19:08:56 2009
@@ -235,7 +235,7 @@
* @throws MessagingException
*
*/
- public Iterator list() throws MessagingException {
+ public Iterator<String> list() throws MessagingException {
log.debug("UIDPlusFolder list");
try {
getFolderGateKeeper().use();
@@ -243,7 +243,7 @@
String[] keysBefore = getUidToKeyBidiMap().getKeys();
// get the messages
Message[] msgs = getFolderGateKeeper().getOpenFolder().getMessages();
- Collection keys = new ArrayList(msgs.length);
+ Collection<String> keys = new ArrayList<String>(msgs.length);
if (msgs == null)
throw new RuntimeException("inbox.getMessages returned null");
for (int i = 0; i < msgs.length; i++) {
@@ -304,26 +304,26 @@
*/
private class UidToKeyBidiMapImpl implements UidToKeyBidiMap {
- private Map keyToUid;
+ private Map<String,Long> keyToUid;
- private Map uidToKey;
+ private Map<Long,String> uidToKey;
public UidToKeyBidiMapImpl() {
- keyToUid = new HashMap();
- uidToKey = new HashMap();
+ keyToUid = new HashMap<String,Long>();
+ uidToKey = new HashMap<Long,String>();
}
public synchronized String[] getKeys() {
- final ArrayList al = new ArrayList(keyToUid.keySet());
+ final ArrayList<String> al = new ArrayList<String>(keyToUid.keySet());
final String[] keys = (String[]) al.toArray(new String[0]);
return keys;
}
public synchronized void retainAllListedAndAddedByKeys(
- final String[] before, final Collection listed) {
- Collection added = new HashSet(keyToUid.keySet());
+ final String[] before, final Collection<String> listed) {
+ Collection<String> added = new HashSet<String>(keyToUid.keySet());
added.removeAll(Arrays.asList(before));
- Collection retain = new HashSet(listed);
+ Collection<String> retain = new HashSet<String>(listed);
retain.addAll(added);
keyToUid.keySet().retainAll(retain);
uidToKey.keySet().retainAll(keyToUid.values());
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UidToKeyBidiMap.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UidToKeyBidiMap.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UidToKeyBidiMap.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/UidToKeyBidiMap.java Sun Oct 25 19:08:56 2009
@@ -38,7 +38,7 @@
String getByUid(long uid);
- void retainAllListedAndAddedByKeys(String[] keysBefore, Collection keys);
+ void retainAllListedAndAddedByKeys(String[] keysBefore, Collection<String> keys);
long getByKey(String key);
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/dnsserver/DNSServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/dnsserver/DNSServerTest.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/dnsserver/DNSServerTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/dnsserver/DNSServerTest.java Sun Oct 25 19:08:56 2009
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.test.mock.avalon.MockLogger;
+import org.apache.mailet.HostAddress;
import org.xbill.DNS.Cache;
import org.xbill.DNS.DClass;
import org.xbill.DNS.Lookup;
@@ -54,7 +55,7 @@
dnsServer.setResolver(null);
dnsServer.setCache(new ZoneCache("dnstest.com."));
//a.setSearchPath(new String[] { "searchdomain.com." });
- Collection records = dnsServer.findMXRecords("nomx.dnstest.com.");
+ Collection<String> records = dnsServer.findMXRecords("nomx.dnstest.com.");
assertEquals(1, records.size());
assertEquals("nomx.dnstest.com.", records.iterator()
.next());
@@ -64,11 +65,11 @@
dnsServer.setResolver(null);
dnsServer.setCache(new ZoneCache("dnstest.com."));
//a.setSearchPath(new String[] { "searchdomain.com." });
- Collection records = dnsServer.findMXRecords("badmx.dnstest.com.");
+ Collection<String> records = dnsServer.findMXRecords("badmx.dnstest.com.");
assertEquals(1, records.size());
assertEquals("badhost.dnstest.com.", records.iterator()
.next());
- Iterator it = dnsServer.getSMTPHostAddresses("badmx.dnstest.com.");
+ Iterator<HostAddress> it = dnsServer.getSMTPHostAddresses("badmx.dnstest.com.");
assertFalse(it.hasNext());
}
@@ -77,7 +78,7 @@
dnsServer.setResolver(null);
dnsServer.setCache(new ZoneCache("pippo.com."));
// dnsServer.setLookupper(new ZoneLookupper(z));
- Collection records = dnsServer.findMXRecords("www.pippo.com.");
+ Collection<String> records = dnsServer.findMXRecords("www.pippo.com.");
assertEquals(1, records.size());
assertEquals("pippo.com.inbound.mxlogic.net.", records.iterator()
.next());
@@ -88,9 +89,9 @@
dnsServer.setResolver(null);
dnsServer.setCache(new ZoneCache("test-zone.com."));
// dnsServer.setLookupper(new ZoneLookupper(z));
- Collection res = dnsServer.findMXRecords("test-zone.com.");
+ Collection<String> res = dnsServer.findMXRecords("test-zone.com.");
try {
- res.add(new Object());
+ res.add(new String());
fail("MX Collection should not be modifiable");
} catch (UnsupportedOperationException e) {
}
@@ -103,7 +104,7 @@
dnsServer.setResolver(null);
dnsServer.setCache(new ZoneCache("brandilyncollins.com."));
// dnsServer.setLookupper(new ZoneLookupper(z));
- Iterator records = dnsServer.getSMTPHostAddresses("brandilyncollins.com.");
+ Iterator<HostAddress> records = dnsServer.getSMTPHostAddresses("brandilyncollins.com.");
assertEquals(true, records.hasNext());
}
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/domain/XMLDomainListTest.java Sun Oct 25 19:08:56 2009
@@ -25,6 +25,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.List;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
@@ -39,7 +40,7 @@
public class XMLDomainListTest extends TestCase {
- private Configuration setUpConfiguration(boolean auto,boolean autoIP,ArrayList names) {
+ private Configuration setUpConfiguration(boolean auto,boolean autoIP, List<String> names) {
DefaultConfiguration configuration = new DefaultConfiguration("test");
DefaultConfiguration sNamesConf = new DefaultConfiguration("domainnames");
DefaultConfiguration autoConf = new DefaultConfiguration("autodetect");
@@ -85,7 +86,7 @@
}
public void testGetDomains() throws Exception {
- ArrayList domains = new ArrayList();
+ List<String> domains = new ArrayList<String>();
domains.add("domain1.");
domains.add("domain2.");
@@ -99,7 +100,7 @@
}
public void testGetDomainsAutoDetectNotLocalHost() throws Exception {
- ArrayList domains = new ArrayList();
+ List<String> domains = new ArrayList<String>();
domains.add("domain1.");
XMLDomainList dom = new XMLDomainList();
@@ -112,7 +113,7 @@
}
public void testGetDomainsAutoDetectLocalHost() throws Exception {
- ArrayList domains = new ArrayList();
+ List<String> domains = new ArrayList<String>();
domains.add("domain1.");
ManageableDomainList dom = new XMLDomainList();
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java Sun Oct 25 19:08:56 2009
@@ -61,7 +61,7 @@
} catch (MessagingException e) {
}
mimeMessage = new MimeMessageCopyOnWriteProxy(mmis);
- Collection recipients = new ArrayList();
+ Collection<MailAddress> recipients = new ArrayList<MailAddress>();
recipients.add(new MailAddress("rec1","domain.com"));
recipients.add(new MailAddress("rec2","domain.com"));
mail = new MailImpl("mail1",new MailAddress("sender","domain.com"),recipients,mimeMessage);
@@ -71,8 +71,8 @@
protected abstract MailRepository getMailRepository() throws Exception;
protected void tearDown() throws Exception {
- for (Iterator i = mailRepository.list(); i.hasNext(); ) {
- mailRepository.remove((String) i.next());
+ for (Iterator<String> i = mailRepository.list(); i.hasNext(); ) {
+ mailRepository.remove(i.next());
}
ContainerUtil.dispose(mail);
ContainerUtil.dispose(mimeMessage);
@@ -109,7 +109,7 @@
public void testListMail() throws MessagingException {
mailRepository.store(mail);
mailRepository.store(mail);
- Iterator i = mailRepository.list();
+ Iterator<String> i = mailRepository.list();
assertTrue(i.hasNext());
assertEquals(mail.getName(),i.next());
assertFalse("Found more than one message after storing 2 times the SAME message: it MUST update the previous", i.hasNext());
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java Sun Oct 25 19:08:56 2009
@@ -61,7 +61,7 @@
public void testReadMboxrdFile() throws ServiceException, ConfigurationException, Exception {
MailRepository mr = getMailRepository();
- Iterator keys = mr.list();
+ Iterator<String> keys = mr.list();
assertTrue("Two messages in list", keys.hasNext());
keys.next();
Modified: james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/AbstractDNSServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/AbstractDNSServer.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/AbstractDNSServer.java (original)
+++ james/server/trunk/domain-api/src/main/java/org/apache/james/api/dnsservice/AbstractDNSServer.java Sun Oct 25 19:08:56 2009
@@ -27,6 +27,8 @@
import java.util.Collection;
import java.util.Iterator;
+import org.apache.mailet.HostAddress;
+
/**
* Abstract class to simplify the mocks
*/
@@ -35,14 +37,14 @@
/**
* @see org.apache.james.api.dnsservice.DNSService#findMXRecords(String)
*/
- public Collection findMXRecords(String hostname) {
+ public Collection<String> findMXRecords(String hostname) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
* @see org.apache.james.api.dnsservice.DNSService#findTXTRecords(String)
*/
- public Collection findTXTRecords(String hostname) {
+ public Collection<String> findTXTRecords(String hostname) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
@@ -63,7 +65,7 @@
/**
* @see org.apache.james.api.dnsservice.DNSService#getSMTPHostAddresses(String)
*/
- public Iterator getSMTPHostAddresses(String domainName) {
+ public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockUsersStore.java?rev=829632&r1=829631&r2=829632&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockUsersStore.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/test/mock/james/MockUsersStore.java Sun Oct 25 19:08:56 2009
@@ -39,8 +39,8 @@
return m_usersRepository;
}
- public Iterator getRepositoryNames() {
- ArrayList repositoryList = new ArrayList();
+ public Iterator<String> getRepositoryNames() {
+ ArrayList<String> repositoryList = new ArrayList<String>();
repositoryList.add("LocalUsers");
return repositoryList.iterator();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org