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 ba...@apache.org on 2008/09/21 19:04:01 UTC
svn commit: r697551 - in
/james/postage/trunk/src/main/java/org/apache/james/postage: ./
classloading/ client/ configuration/ jmx/ mail/ result/ smtpserver/ user/
Author: bago
Date: Sun Sep 21 10:04:00 2008
New Revision: 697551
URL: http://svn.apache.org/viewvc?rev=697551&view=rev
Log:
First pass at using generics (POSTAGE-21)
Modified:
james/postage/trunk/src/main/java/org/apache/james/postage/Main.java
james/postage/trunk/src/main/java/org/apache/james/postage/PostageRunner.java
james/postage/trunk/src/main/java/org/apache/james/postage/classloading/CachedInstanceFactory.java
james/postage/trunk/src/main/java/org/apache/james/postage/client/POP3Client.java
james/postage/trunk/src/main/java/org/apache/james/postage/client/RemoteManagerClient.java
james/postage/trunk/src/main/java/org/apache/james/postage/configuration/ConfigurationLoader.java
james/postage/trunk/src/main/java/org/apache/james/postage/configuration/MailSender.java
james/postage/trunk/src/main/java/org/apache/james/postage/configuration/PostageConfiguration.java
james/postage/trunk/src/main/java/org/apache/james/postage/configuration/SendProfile.java
james/postage/trunk/src/main/java/org/apache/james/postage/jmx/JVMResourceSamplerWorker.java
james/postage/trunk/src/main/java/org/apache/james/postage/mail/AbstractMailFactory.java
james/postage/trunk/src/main/java/org/apache/james/postage/mail/DefaultMailFactory.java
james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResult.java
james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResultImpl.java
james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleMailServer.java
james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleServiceManager.java
james/postage/trunk/src/main/java/org/apache/james/postage/user/UserList.java
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/Main.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/Main.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/Main.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/Main.java Sun Sep 21 10:04:00 2008
@@ -42,7 +42,7 @@
String filename = args[0];
- List scenariosToRun = new ArrayList();
+ List<String> scenariosToRun = new ArrayList<String>();
for (int i = 1; i < args.length; i++)
{
scenariosToRun.add(args[i]);
@@ -50,7 +50,7 @@
// load all scenarios from configuration file
ConfigurationLoader configurationLoader = new ConfigurationLoader();
- Map configurations;
+ Map<String, PostageConfiguration> configurations;
try {
// TODO allow different (non-xml) configs - as Common-Configuration supports it
XMLConfiguration xmlConfiguration = new XMLConfiguration(filename);
@@ -68,18 +68,18 @@
runScenarios(configurations, scenariosToRun);
}
- private static void runScenarios(Map configurations, List scenariosToRun) {
+ private static void runScenarios(Map<String, PostageConfiguration> configurations, List<String> scenariosToRun) {
// run all scenarios which are requested to be run.
int playedScenarioCounter = 0;
- Iterator iterator = configurations.keySet().iterator();
+ Iterator<String> iterator = configurations.keySet().iterator();
while (iterator.hasNext()) {
- String id = (String)iterator.next();
+ String id = iterator.next();
// if no scenario is given on the command line, all get executed
// if one or more is given, all others are skipped
if (!scenariosToRun.isEmpty() && !scenariosToRun.contains(id)) continue;
playedScenarioCounter++;
- PostageConfiguration postageConfiguration = (PostageConfiguration) configurations.get(id);
+ PostageConfiguration postageConfiguration = configurations.get(id);
m_currentPostageRunner = new PostageRunner(postageConfiguration);
m_currentPostageRunner.run(); // TODO maybe we want to run this Runnable in its own thread, but maybe not
}
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/PostageRunner.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/PostageRunner.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/PostageRunner.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/PostageRunner.java Sun Sep 21 10:04:00 2008
@@ -66,7 +66,7 @@
private SMTPMailSink m_smtpMailSink;
private SampleController m_outboundMailingInterceptorController;
- private List m_sendControllers = new ArrayList();
+ private List<SampleController> m_sendControllers = new ArrayList<SampleController>();
private JVMResourceSamplerWorker m_jvmResourceSampler = null;
private SampleController m_jvmResourceController = null;
@@ -216,9 +216,9 @@
private void stopRecording() {
log.info("stopping");
if (m_sendControllers != null) {
- Iterator iterator = m_sendControllers.iterator();
+ Iterator<SampleController> iterator = m_sendControllers.iterator();
while (iterator.hasNext()) {
- SampleController sendController = (SampleController)iterator.next();
+ SampleController sendController = iterator.next();
sendController.stop();
}
}
@@ -267,9 +267,9 @@
private void recordData() {
- Iterator iterator = m_sendControllers.iterator();
+ Iterator<SampleController> iterator = m_sendControllers.iterator();
while (iterator.hasNext()) {
- SampleController sendController = (SampleController)iterator.next();
+ SampleController sendController = iterator.next();
sendController.runThreaded();
}
@@ -307,7 +307,7 @@
int externalUserCount = m_postageConfiguration.getExternalUsers().getCount();
String externalUsernamePrefix = m_postageConfiguration.getExternalUsers().getNamePrefix();
- ArrayList externalUsers = new ArrayList();
+ ArrayList<String> externalUsers = new ArrayList<String>();
for (int i = 1; i <= externalUserCount; i++) {
String username = externalUsernamePrefix + i;
externalUsers.add(username);
@@ -322,12 +322,12 @@
private void setupInboundMailing() throws StartupException {
if (m_postageConfiguration.getTestserverPortSMTPInbound() <= 0) return;
- Iterator profileIterator = m_postageConfiguration.getProfiles().iterator();
+ Iterator<SendProfile> profileIterator = m_postageConfiguration.getProfiles().iterator();
while (profileIterator.hasNext()) {
- SendProfile sendProfile = (SendProfile)profileIterator.next();
- Iterator mailSenderIterator = sendProfile.mailSenderIterator();
+ SendProfile sendProfile = profileIterator.next();
+ Iterator<MailSender> mailSenderIterator = sendProfile.mailSenderIterator();
while (mailSenderIterator.hasNext()) {
- MailSender mailSender = (MailSender)mailSenderIterator.next();
+ MailSender mailSender = mailSenderIterator.next();
int sendPerMinute = mailSender.getSendPerMinute();
if (sendPerMinute < 1) continue;
@@ -381,11 +381,11 @@
String internalUsernamePrefix = m_postageConfiguration.getInternalUsers().getNamePrefix();
String internalPassword = m_postageConfiguration.getInternalUsers().getPassword();
- Set existingUsers = getExistingUsers(host, remoteManagerPort, remoteManagerUsername, remoteManagerPassword);
+ Set<String> existingUsers = getExistingUsers(host, remoteManagerPort, remoteManagerUsername, remoteManagerPassword);
RemoteManagerClient remoteManagerClient = new RemoteManagerClient(host, remoteManagerPort, remoteManagerUsername, remoteManagerPassword);
remoteManagerClient.login();
- ArrayList internalUsers = new ArrayList();
+ ArrayList<String> internalUsers = new ArrayList<String>();
for (int i = 1; i <= internalUserCount; i++) {
String username = internalUsernamePrefix + i;
if (existingUsers.contains(username)) {
@@ -450,17 +450,17 @@
* aquire a list of all existing internal James accounts
* @return Set<String>, each String a username
*/
- private Set getExistingUsers(String host, int remoteManagerPort, String remoteManagerUsername, String remoteManagerPassword) {
+ private Set<String> getExistingUsers(String host, int remoteManagerPort, String remoteManagerUsername, String remoteManagerPassword) {
RemoteManagerClient remoteManagerClient = new RemoteManagerClient(host, remoteManagerPort, remoteManagerUsername, remoteManagerPassword);
boolean loginSuccess = remoteManagerClient.login();
if (!loginSuccess) throw new Error("failed to login to remote manager");
- List rawUserList = remoteManagerClient.executeCommand("listusers");
+ List<String> rawUserList = remoteManagerClient.executeCommand("listusers");
remoteManagerClient.disconnect();
- Set existingUsers = new LinkedHashSet();
- Iterator iterator = rawUserList.iterator();
+ Set<String> existingUsers = new LinkedHashSet<String>();
+ Iterator<String> iterator = rawUserList.iterator();
while (iterator.hasNext()) {
- String line = (String)iterator.next();
+ String line = iterator.next();
if (!line.startsWith("user: ")) continue;
existingUsers.add(line.substring(6));
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/classloading/CachedInstanceFactory.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/classloading/CachedInstanceFactory.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/classloading/CachedInstanceFactory.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/classloading/CachedInstanceFactory.java Sun Sep 21 10:04:00 2008
@@ -31,12 +31,12 @@
private static Log log = LogFactory.getLog(CachedInstanceFactory.class);
- private final static Map m_classes = new HashMap();
+ private final static Map<String, Class<?>> m_classes = new HashMap<String, Class<?>>();
public static Object createInstance(String classname) {
Object object = null;
- Class clazz = null;
+ Class<?> clazz = null;
// class is configured, but not yet loaded
if (classname != null && m_classes.get(classname) == null) {
try {
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/client/POP3Client.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/client/POP3Client.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/client/POP3Client.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/client/POP3Client.java Sun Sep 21 10:04:00 2008
@@ -105,9 +105,9 @@
* unprocessed by the random access. this is done by iterating over all user accounts, looking for mail
*/
public void doMatchMailForAllUsers() {
- Iterator usernames = m_internalUsers.getUsernames();
+ Iterator<String> usernames = m_internalUsers.getUsernames();
while (usernames.hasNext()) {
- String username = (String)usernames.next();
+ String username = usernames.next();
try {
findAllMatchingTestMail(username);
} catch (SamplingException e) {
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/client/RemoteManagerClient.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/client/RemoteManagerClient.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/client/RemoteManagerClient.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/client/RemoteManagerClient.java Sun Sep 21 10:04:00 2008
@@ -71,8 +71,8 @@
e.printStackTrace();
}
- List answers = readAnswer();
- if (answers == null || answers.size() == 0 || !((String)answers.get(answers.size() - 1)).startsWith("Welcome"))
+ List<String> answers = readAnswer();
+ if (answers == null || answers.size() == 0 || !answers.get(answers.size() - 1).startsWith("Welcome"))
{
disconnect();
return false;
@@ -93,7 +93,7 @@
}
}
- public List executeCommand(String command) {
+ public List<String> executeCommand(String command) {
try {
sendCommand(command);
} catch (IOException e) {
@@ -101,7 +101,7 @@
return null;
}
- List list = readAnswer();
+ List<String> list = readAnswer();
return list;
}
@@ -110,12 +110,12 @@
m_writer.flush();
}
- public List readAnswer() {
+ public List<String> readAnswer() {
return readAnswer(0);
}
- protected List readAnswer(int numLines) {
- List allAnswerLines = new ArrayList();
+ protected List<String> readAnswer(int numLines) {
+ List<String> allAnswerLines = new ArrayList<String>();
try {
delay();
if (numLines > 0) {
@@ -140,7 +140,7 @@
}
}
- private void readline(List allAnswerLines) throws IOException {
+ private void readline(List<String> allAnswerLines) throws IOException {
if (!m_reader.ready()) return;
String line = m_reader.readLine();
if (line != null) allAnswerLines.add(line);
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/configuration/ConfigurationLoader.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/configuration/ConfigurationLoader.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/configuration/ConfigurationLoader.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/configuration/ConfigurationLoader.java Sun Sep 21 10:04:00 2008
@@ -37,18 +37,18 @@
private static Log log = LogFactory.getLog(ConfigurationLoader.class);
- public Map create(Configuration configuration) {
+ public Map<String, PostageConfiguration> create(Configuration configuration) {
log.debug("reading configuration.");
- Map postageConfigurations = new LinkedHashMap();
+ Map<String, PostageConfiguration> postageConfigurations = new LinkedHashMap<String, PostageConfiguration>();
- List scenariosIds = configuration.getList("scenario[@id]");
+ List<String> scenariosIds = configuration.getList("scenario[@id]");
log.debug("scenarios contained in configuration: " + scenariosIds.size());
- Iterator scenarioIter = scenariosIds.iterator();
+ Iterator<String> scenarioIter = scenariosIds.iterator();
int scenarioCount = 0;
while (scenarioIter.hasNext()) {
- String scenarioId = (String) scenarioIter.next();
+ String scenarioId = scenarioIter.next();
if (postageConfigurations.containsKey(scenarioId)) {
log.error("found in configuration more than one scenario which is named: " + scenarioId);
@@ -102,11 +102,11 @@
}
private void addDescription(PostageConfiguration postageConfiguration, Configuration configuration) {
- Iterator keys = configuration.getKeys();
+ Iterator<String> keys = configuration.getKeys();
while (keys.hasNext()) {
- String itemName = (String) keys.next();
+ String itemName = keys.next();
String itemContent = configuration.getString(itemName);
postageConfiguration.addDescriptionItem(itemName, itemContent);
@@ -114,13 +114,13 @@
}
private void addSendProfiles(PostageConfiguration postageConfiguration, Configuration configuration, String scenario) {
- List profileNames = configuration.getList(scenario + ".profiles.profile[@name]");
+ List<String> profileNames = configuration.getList(scenario + ".profiles.profile[@name]");
log.debug("profiles contained in scenario " + postageConfiguration.getId() + ": " + profileNames.size());
- Iterator profileIter = profileNames.iterator();
+ Iterator<String> profileIter = profileNames.iterator();
int profileCount = 0;
while (profileIter.hasNext()) {
- String profileName = (String) profileIter.next();
+ String profileName = profileIter.next();
SendProfile profile = new SendProfile(profileName);
@@ -138,9 +138,9 @@
}
private void addMailSender(SendProfile profile, Configuration configuration, String profilePath) {
- List mailSenders = configuration.getList(profilePath + ".send[@count-per-min]");
+ List<String> mailSenders = configuration.getList(profilePath + ".send[@count-per-min]");
- Iterator mailSenderIter = mailSenders.iterator();
+ Iterator<String> mailSenderIter = mailSenders.iterator();
int mailSenderCount = 0;
while (mailSenderIter.hasNext()) {
mailSenderIter.next(); // ignore
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/configuration/MailSender.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/configuration/MailSender.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/configuration/MailSender.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/configuration/MailSender.java Sun Sep 21 10:04:00 2008
@@ -50,7 +50,7 @@
private SendProfile m_parentProfile;
private String m_mailFactoryClassname = null;
- private Class m_mailFactoryClass = null;
+ private Class<? extends MailFactory> m_mailFactoryClass = null;
public MailSender(SendProfile parent) {
m_parentProfile = parent;
@@ -165,7 +165,7 @@
// class is configured, but not yet loaded
if (m_mailFactoryClassname != null && m_mailFactoryClass == null) {
try {
- m_mailFactoryClass = Class.forName(m_mailFactoryClassname);
+ m_mailFactoryClass = (Class<? extends MailFactory>) Class.forName(m_mailFactoryClassname);
} catch (ClassNotFoundException e) {
log.error("failed to load MailFactory class " + m_mailFactoryClassname, e);
}
@@ -174,7 +174,7 @@
// create instance, if custom class is given
if (m_mailFactoryClass != null) {
try {
- mailFactory = (MailFactory)m_mailFactoryClass.newInstance();
+ mailFactory = m_mailFactoryClass.newInstance();
} catch (Exception e) {
log.error("failed to create instance if MailFactory class " + m_mailFactoryClassname, e);
}
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/configuration/PostageConfiguration.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/configuration/PostageConfiguration.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/configuration/PostageConfiguration.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/configuration/PostageConfiguration.java Sun Sep 21 10:04:00 2008
@@ -36,7 +36,7 @@
private boolean m_internalReuseExisting = true;
- private Map m_descriptionItems = new LinkedHashMap();
+ private Map<String, String> m_descriptionItems = new LinkedHashMap<String, String>();
private UserList m_externalUsers = null;
@@ -66,7 +66,7 @@
private int m_testserverJMXRemotingPort = -1;
- private List m_profiles = new ArrayList();
+ private List<SendProfile> m_profiles = new ArrayList<SendProfile>();
public PostageConfiguration(String id) {
m_id = id;
@@ -92,7 +92,7 @@
m_descriptionItems.put(name, value);
}
- public Map getDescriptionItems() {
+ public Map<String, String> getDescriptionItems() {
return Collections.unmodifiableMap(m_descriptionItems);
}
@@ -216,14 +216,14 @@
m_profiles.add(profile);
}
- public List getProfiles() {
+ public List<SendProfile> getProfiles() {
return Collections.unmodifiableList(m_profiles);
}
public SendProfile findProfile(boolean sourceInternal, boolean targetInternal) {
- Iterator iterator = m_profiles.iterator();
+ Iterator<SendProfile> iterator = m_profiles.iterator();
while (iterator.hasNext()) {
- SendProfile sendProfile = (SendProfile)iterator.next();
+ SendProfile sendProfile = iterator.next();
if (sendProfile.isSourceInternal() == sourceInternal && sendProfile.isTargetInternal() == targetInternal) {
return sendProfile;
}
@@ -232,10 +232,10 @@
}
public int getTotalMailsPerMin() {
- Iterator iterator = m_profiles.iterator();
+ Iterator<SendProfile> iterator = m_profiles.iterator();
int total = 0;
while (iterator.hasNext()) {
- SendProfile sendProfile = (SendProfile)iterator.next();
+ SendProfile sendProfile = iterator.next();
total += sendProfile.getTotalMailsPerMin();
}
return total;
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/configuration/SendProfile.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/configuration/SendProfile.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/configuration/SendProfile.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/configuration/SendProfile.java Sun Sep 21 10:04:00 2008
@@ -32,7 +32,7 @@
private boolean m_sourceInternal = true;
private boolean m_targetInternal = true;
- private final List m_mailSenders = new ArrayList();
+ private final List<MailSender> m_mailSenders = new ArrayList<MailSender>();
public SendProfile(String profileName) {
m_profileName = profileName;
@@ -62,15 +62,15 @@
m_mailSenders.add(mailSender);
}
- public Iterator mailSenderIterator() {
+ public Iterator<MailSender> mailSenderIterator() {
return m_mailSenders.iterator();
}
public int getTotalMailsPerMin() {
- Iterator iterator = m_mailSenders.iterator();
+ Iterator<MailSender> iterator = m_mailSenders.iterator();
int total = 0;
while (iterator.hasNext()) {
- MailSender mailSender = (MailSender)iterator.next();
+ MailSender mailSender = iterator.next();
total += mailSender.getSendPerMinute();
}
return total;
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/jmx/JVMResourceSamplerWorker.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/jmx/JVMResourceSamplerWorker.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/jmx/JVMResourceSamplerWorker.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/jmx/JVMResourceSamplerWorker.java Sun Sep 21 10:04:00 2008
@@ -119,7 +119,7 @@
}
private Object getAttributeValue(AttributeList attributeList, String key) {
- for (Iterator iterator = attributeList.iterator(); iterator.hasNext();) {
+ for (Iterator<?> iterator = attributeList.iterator(); iterator.hasNext();) {
Attribute attribute = (Attribute)iterator.next();
if (attribute.getName().equals(key)) return attribute.getValue();
}
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/mail/AbstractMailFactory.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/mail/AbstractMailFactory.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/mail/AbstractMailFactory.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/mail/AbstractMailFactory.java Sun Sep 21 10:04:00 2008
@@ -106,7 +106,7 @@
*
* @return validator class
*/
- abstract protected Class getValidatorClass();
+ abstract protected Class<? extends MailValidator> getValidatorClass();
protected int generateRandomPartSize(int sizeMin, int sizeMax) {
return (int)(Math.random() * (sizeMax - sizeMin)) + sizeMin;
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/mail/DefaultMailFactory.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/mail/DefaultMailFactory.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/mail/DefaultMailFactory.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/mail/DefaultMailFactory.java Sun Sep 21 10:04:00 2008
@@ -77,7 +77,7 @@
message.setContent(multipart);
}
- protected Class getValidatorClass() {
+ protected Class<? extends MailValidator> getValidatorClass() {
return DefaultMailValidator.class;
}
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResult.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResult.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResult.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResult.java Sun Sep 21 10:04:00 2008
@@ -27,7 +27,7 @@
*/
public interface PostageRunnerResult {
- void setEnvironmentDescription(Map descriptionItems);
+ void setEnvironmentDescription(Map<String, String> descriptionItems);
/**
* add a record to be matched later on
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResultImpl.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResultImpl.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResultImpl.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/result/PostageRunnerResultImpl.java Sun Sep 21 10:04:00 2008
@@ -39,13 +39,13 @@
private static Log log = LogFactory.getLog(PostageRunnerResultImpl.class);
- private Map m_matchedMailResults = initMatchedMailResultContainer();
+ private Map<String, MailProcessingRecord> m_matchedMailResults = initMatchedMailResultContainer();
- private final Map m_unmatchedMailResults = new HashedMap();
+ private final Map<String, MailProcessingRecord> m_unmatchedMailResults = new HashedMap();
- private List m_errors = initErrorResultContainer();
+ private List<ErrorRecord> m_errors = initErrorResultContainer();
- private List m_jvmStatistics = initMatchedJVMStatisticsResultContainer();
+ private List<JVMResourcesRecord> m_jvmStatistics = initMatchedJVMStatisticsResultContainer();
private long m_TimestampFirstResult = -1;
@@ -55,14 +55,14 @@
private long m_validMailCounter = 0;
- private Map m_environmentInfo = new LinkedHashMap();
+ private Map<String, String> m_environmentInfo = new LinkedHashMap<String, String>();
public void addNewMailRecord(MailProcessingRecord mailProcessingRecord) {
if (m_TimestampFirstResult <= 0) m_TimestampFirstResult = System.currentTimeMillis();
m_TimestampLastResult = System.currentTimeMillis();
- MailProcessingRecord prevMailProcessingRecord = (MailProcessingRecord)m_unmatchedMailResults.put(mailProcessingRecord.getMailId(), mailProcessingRecord);
+ MailProcessingRecord prevMailProcessingRecord = m_unmatchedMailResults.put(mailProcessingRecord.getMailId(), mailProcessingRecord);
if (prevMailProcessingRecord != null) {
log.error("mail result already contained in unmatched list!");
}
@@ -75,7 +75,7 @@
if (m_unmatchedMailResults.containsKey(mailId)) {
// merge both mail result objects into one and move it to matched list
- MailProcessingRecord match = (MailProcessingRecord)m_unmatchedMailResults.remove(mailId);
+ MailProcessingRecord match = m_unmatchedMailResults.remove(mailId);
log.info("matched test mail having id = " + mailId + " received by queue = " + mailProcessingRecord.getReceivingQueue());
match.merge(mailProcessingRecord); // copy new data to saved record
@@ -106,7 +106,7 @@
m_jvmStatistics.add(jvmResourcesRecord);
}
- public void setEnvironmentDescription(Map descriptionItems) {
+ public void setEnvironmentDescription(Map<String, String> descriptionItems) {
m_environmentInfo.putAll(descriptionItems);
}
@@ -136,7 +136,7 @@
}
private void writeMatchedMailResults(OutputStreamWriter outputStreamWriter) throws IOException {
- Map writeResults = m_matchedMailResults; // keep current results for writing
+ Map<String, MailProcessingRecord> writeResults = m_matchedMailResults; // keep current results for writing
m_matchedMailResults = initMatchedMailResultContainer(); // establish new map for further unwritten results
writeMailResults(writeResults, outputStreamWriter);
outputStreamWriter.flush();
@@ -147,10 +147,10 @@
outputStreamWriter.write("end," + m_TimestampLastResult + "," + new Date(m_TimestampLastResult) + "\r\n");
outputStreamWriter.write("current," + System.currentTimeMillis() + "," + new Date() + "\r\n");
- Iterator iterator = m_environmentInfo.keySet().iterator();
+ Iterator<String> iterator = m_environmentInfo.keySet().iterator();
while (iterator.hasNext()) {
- String elementName = (String)iterator.next();
- String elementValue = (String)m_environmentInfo.get(elementName);
+ String elementName = iterator.next();
+ String elementValue = m_environmentInfo.get(elementName);
outputStreamWriter.write(elementName + "," + elementValue + "\r\n");
}
}
@@ -171,25 +171,25 @@
return m_errors.size();
}
- private void writeMailResults(Map mailResults, OutputStreamWriter outputStreamWriter) throws IOException {
- Iterator iterator = mailResults.values().iterator();
+ private void writeMailResults(Map<String, MailProcessingRecord> mailResults, OutputStreamWriter outputStreamWriter) throws IOException {
+ Iterator<MailProcessingRecord> iterator = mailResults.values().iterator();
while (iterator.hasNext()) {
- MailProcessingRecord record = (MailProcessingRecord)iterator.next();
+ MailProcessingRecord record = iterator.next();
String resultString = record.writeData().toString();
outputStreamWriter.write(resultString);
}
}
- private HashedMap initMatchedMailResultContainer() {
+ private Map<String, MailProcessingRecord> initMatchedMailResultContainer() {
return new HashedMap();
}
- private List initMatchedJVMStatisticsResultContainer() {
- return new ArrayList();
+ private List<JVMResourcesRecord> initMatchedJVMStatisticsResultContainer() {
+ return new ArrayList<JVMResourcesRecord>();
}
- private List initErrorResultContainer() {
- return new ArrayList();
+ private List<ErrorRecord> initErrorResultContainer() {
+ return new ArrayList<ErrorRecord>();
}
public void writeResults(String filenameMailResults, String filenameJVMStatistics, String filenameErrors, boolean flushMatchedMailOnly) {
@@ -241,11 +241,11 @@
}
private void writeJVMStatisticsResults(OutputStreamWriter outputStreamWriter) throws IOException {
- List unwrittenResults = m_jvmStatistics;
+ List<JVMResourcesRecord> unwrittenResults = m_jvmStatistics;
m_jvmStatistics = initMatchedJVMStatisticsResultContainer();
- Iterator iterator = unwrittenResults.iterator();
+ Iterator<JVMResourcesRecord> iterator = unwrittenResults.iterator();
while (iterator.hasNext()) {
- JVMResourcesRecord record = (JVMResourcesRecord)iterator.next();
+ JVMResourcesRecord record = iterator.next();
String resultString = record.writeData().toString();
outputStreamWriter.write(resultString);
}
@@ -262,11 +262,11 @@
outputStreamWriter.write("timestamp,number,message\r\n");
}
- List unwrittenResults = m_errors;
+ List<ErrorRecord> unwrittenResults = m_errors;
m_errors = initErrorResultContainer();
- Iterator iterator = unwrittenResults.iterator();
+ Iterator<ErrorRecord> iterator = unwrittenResults.iterator();
while (iterator.hasNext()) {
- ErrorRecord record = (ErrorRecord)iterator.next();
+ ErrorRecord record = iterator.next();
StringBuffer resultString = new StringBuffer();
resultString.append(record.m_timestamp).append(",");
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleMailServer.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleMailServer.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleMailServer.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleMailServer.java Sun Sep 21 10:04:00 2008
@@ -65,7 +65,7 @@
public void sendMail(MimeMessage message) throws MessagingException {
// taken from class org.apache.james.James
MailAddress sender = new MailAddress((InternetAddress)message.getFrom()[0]);
- Collection recipients = new HashSet();
+ Collection<MailAddress> recipients = new HashSet<MailAddress>();
Address addresses[] = message.getAllRecipients();
if (addresses != null) {
for (int i = 0; i < addresses.length; i++) {
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleServiceManager.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleServiceManager.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleServiceManager.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SimpleServiceManager.java Sun Sep 21 10:04:00 2008
@@ -29,7 +29,7 @@
*/
public class SimpleServiceManager implements org.apache.avalon.framework.service.ServiceManager {
- private HashMap m_serviceMap = new HashMap();
+ private HashMap<String, Object> m_serviceMap = new HashMap<String, Object>();
public Object lookup(String serviceName) throws ServiceException {
return m_serviceMap.get(serviceName);
Modified: james/postage/trunk/src/main/java/org/apache/james/postage/user/UserList.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/user/UserList.java?rev=697551&r1=697550&r2=697551&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/user/UserList.java (original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/user/UserList.java Sun Sep 21 10:04:00 2008
@@ -32,7 +32,7 @@
int m_count = 0;
String m_namePrefix = null;
- List m_users = new ArrayList();
+ List<String> m_users = new ArrayList<String>();
String m_password = null; // common to all users, if set
String m_domain = null; // domain, common to all users
@@ -55,11 +55,11 @@
return m_namePrefix;
}
- public Iterator getUsernames() {
+ public Iterator<String> getUsernames() {
return m_users.iterator();
}
- public void setExistingUsers(List existingUsers) {
+ public void setExistingUsers(List<String> existingUsers) {
m_users.clear();
m_users.addAll(existingUsers);
}
@@ -74,7 +74,7 @@
public String getRandomUsername() {
if (m_users.isEmpty()) return null;
- return (String)m_users.get((int)(Math.random() * (m_users.size() - 1)));
+ return m_users.get((int)(Math.random() * (m_users.size() - 1)));
}
public String getEmailAddress(String username) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org