You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/09/18 18:07:21 UTC
svn commit: r816692 - in /james/server/trunk:
fetchmail-function/src/main/java/org/apache/james/fetchmail/
user-api/src/main/java/org/apache/james/api/user/
Author: rdonkin
Date: Fri Sep 18 16:07:20 2009
New Revision: 816692
URL: http://svn.apache.org/viewvc?rev=816692&view=rev
Log:
Convert to Java 1.5
Modified:
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/Account.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/Account.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/Account.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/Account.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/Account.java Fri Sep 18 16:07:20 2009
@@ -34,12 +34,12 @@
* <p>Class <code>Account</code> encapsulates the account details required to
* fetch mail from a message store.</p>
*
- * <p>Instances are <code>Comparable</code> based on their sequence number.</p>
- *
- * <p>Creation Date: 05-Jun-03</p>
+ * <p>Instances are <code>Comparable</code> based on their sequence number.</p>
*/
-class Account implements Comparable
+class Account implements Comparable<Account>
{
+ private static final int DEFAULT_INITIAL_SIZE_OF_DEFERRED_RECIPIENT_ARRAY = 16;
+
/**
* The user password for this account
*/
@@ -64,7 +64,7 @@
* List of MessageIDs for which processing has been deferred
* because the intended recipient could not be found.
*/
- private List fieldDeferredRecipientNotFoundMessageIDs;
+ private List<String> fieldDeferredRecipientNotFoundMessageIDs;
/**
* The sequence number for this account
@@ -268,18 +268,18 @@
*
* @see java.lang.Comparable#compareTo(Object)
*/
- public int compareTo(Object o)
+ public int compareTo(Account account)
{
- return getSequenceNumber() - ((Account) o).getSequenceNumber();
+ return getSequenceNumber() - account.getSequenceNumber();
}
/**
* Returns the deferredRecipientNotFoundMessageIDs. lazily initialised.
* @return List
*/
- public List getDeferredRecipientNotFoundMessageIDs()
+ public List<String> getDeferredRecipientNotFoundMessageIDs()
{
- List messageIDs = null;
+ List<String> messageIDs = null;
if (null
== (messageIDs = getDeferredRecipientNotFoundMessageIDsBasic()))
{
@@ -293,7 +293,7 @@
* Returns the deferredRecipientNotFoundMessageIDs.
* @return List
*/
- private List getDeferredRecipientNotFoundMessageIDsBasic()
+ private List<String> getDeferredRecipientNotFoundMessageIDsBasic()
{
return fieldDeferredRecipientNotFoundMessageIDs;
}
@@ -302,9 +302,9 @@
* Returns a new List of deferredRecipientNotFoundMessageIDs.
* @return List
*/
- protected List computeDeferredRecipientNotFoundMessageIDs()
+ protected List<String> computeDeferredRecipientNotFoundMessageIDs()
{
- return new ArrayList(16);
+ return new ArrayList<String>(DEFAULT_INITIAL_SIZE_OF_DEFERRED_RECIPIENT_ARRAY);
}
/**
@@ -319,10 +319,9 @@
* Sets the defferedRecipientNotFoundMessageIDs.
* @param defferedRecipientNotFoundMessageIDs The defferedRecipientNotFoundMessageIDs to set
*/
- protected void setDeferredRecipientNotFoundMessageIDs(List defferedRecipientNotFoundMessageIDs)
+ protected void setDeferredRecipientNotFoundMessageIDs(List<String> defferedRecipientNotFoundMessageIDs)
{
- fieldDeferredRecipientNotFoundMessageIDs =
- defferedRecipientNotFoundMessageIDs;
+ fieldDeferredRecipientNotFoundMessageIDs = defferedRecipientNotFoundMessageIDs;
}
/**
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java Fri Sep 18 16:07:20 2009
@@ -79,7 +79,7 @@
/**
* Key fields for DynamicAccounts.
*/
- private class DynamicAccountKey
+ private final static class DynamicAccountKey
{
/**
* The base user name without prfix or suffix
@@ -169,10 +169,8 @@
}
}
- /**
- * Creation Date: 06-Jun-03
- */
- private class ParsedDynamicAccountParameters
+
+ private final static class ParsedDynamicAccountParameters
{
private String fieldUserPrefix;
private String fieldUserSuffix;
@@ -371,13 +369,13 @@
* A List of ParsedDynamicAccountParameters, one for every <alllocal> entry
* in the configuration.
*/
- private List fieldParsedDynamicAccountParameters;
+ private List<ParsedDynamicAccountParameters> fieldParsedDynamicAccountParameters;
/**
* The Static Accounts for this task.
* These are setup when the task is configured.
*/
- private List fieldStaticAccounts;
+ private List<Account> fieldStaticAccounts;
/**
* The JavaMail Session for this fetch task.
@@ -389,7 +387,7 @@
* The Dynamic Accounts for this task.
* These are setup each time the fetchtask is run.
*/
- private Map fieldDynamicAccounts;
+ private Map<DynamicAccountKey, DynamicAccount> fieldDynamicAccounts;
/**
* The MailServer service
@@ -510,39 +508,21 @@
setFetching(true);
getLogger().info("Fetcher starting fetches");
- // if debugging, list the JavaMail property key/value pairs
- // for this Session
- if (getLogger().isDebugEnabled())
- {
- getLogger().debug("Session properties:");
- Properties properties = getSession().getProperties();
- Enumeration e = properties.keys();
- while (e.hasMoreElements())
- {
- String key = (String) e.nextElement();
- String val = (String) properties.get(key);
- if (val.length() > 40)
- {
- val = val.substring(0, 37) + "...";
- }
- getLogger().debug(key + "=" + val);
-
- }
- }
+ logJavaMailProperties();
// Update the dynamic accounts,
// merge with the static accounts and
// sort the accounts so they are in the order
// they were entered in config.xml
updateDynamicAccounts();
- ArrayList mergedAccounts =
- new ArrayList(
+ ArrayList<Account> mergedAccounts =
+ new ArrayList<Account>(
getDynamicAccounts().size() + getStaticAccounts().size());
mergedAccounts.addAll(getDynamicAccounts().values());
mergedAccounts.addAll(getStaticAccounts());
Collections.sort(mergedAccounts);
- StringBuffer logMessage = new StringBuffer(64);
+ StringBuilder logMessage = new StringBuilder(64);
logMessage.append("Processing ");
logMessage.append(getStaticAccounts().size());
logMessage.append(" static accounts and ");
@@ -551,12 +531,12 @@
getLogger().info(logMessage.toString());
// Fetch each account
- Iterator accounts = mergedAccounts.iterator();
+ Iterator<Account> accounts = mergedAccounts.iterator();
while (accounts.hasNext())
{
try
{
- new StoreProcessor((Account) accounts.next()).process();
+ new StoreProcessor(accounts.next()).process();
}
catch (MessagingException ex)
{
@@ -579,6 +559,29 @@
}
}
+ @SuppressWarnings("unchecked")
+ private void logJavaMailProperties() {
+ // if debugging, list the JavaMail property key/value pairs
+ // for this Session
+ if (getLogger().isDebugEnabled())
+ {
+ getLogger().debug("Session properties:");
+ Properties properties = getSession().getProperties();
+ Enumeration e = properties.keys();
+ while (e.hasMoreElements())
+ {
+ String key = (String) e.nextElement();
+ String val = (String) properties.get(key);
+ if (val.length() > 40)
+ {
+ val = val.substring(0, 37) + "...";
+ }
+ getLogger().debug(key + "=" + val);
+
+ }
+ }
+ }
+
/**
* Returns the fetching.
* @return boolean
@@ -599,8 +602,8 @@
}
catch (ClassCastException cce)
{
- StringBuffer errorBuffer =
- new StringBuffer(128).append("Component ").append(
+ StringBuilder errorBuffer =
+ new StringBuilder(128).append("Component ").append(
MailServer.ROLE).append(
"does not implement the required interface.");
throw new ServiceException("", errorBuffer.toString());
@@ -705,7 +708,7 @@
* Returns the accounts. Initializes if required.
* @return List
*/
- protected List getStaticAccounts()
+ protected List<Account> getStaticAccounts()
{
if (null == getStaticAccountsBasic())
{
@@ -719,7 +722,7 @@
* Returns the staticAccounts.
* @return List
*/
- private List getStaticAccountsBasic()
+ private List<Account> getStaticAccountsBasic()
{
return fieldStaticAccounts;
}
@@ -728,7 +731,7 @@
* Sets the accounts.
* @param accounts The accounts to set
*/
- protected void setStaticAccounts(List accounts)
+ protected void setStaticAccounts(List<Account> accounts)
{
fieldStaticAccounts = accounts;
}
@@ -760,46 +763,46 @@
/**
* Computes the staticAccounts.
*/
- protected List computeStaticAccounts()
+ protected List<Account> computeStaticAccounts()
{
- return new ArrayList();
+ return new ArrayList<Account>();
}
/**
* Computes the ParsedDynamicAccountParameters.
*/
- protected List computeParsedDynamicAccountParameters()
+ protected List<ParsedDynamicAccountParameters> computeParsedDynamicAccountParameters()
{
- return new ArrayList();
+ return new ArrayList<ParsedDynamicAccountParameters>();
}
/**
* Computes the dynamicAccounts.
*/
- protected Map computeDynamicAccounts() throws ConfigurationException
+ protected Map<DynamicAccountKey, DynamicAccount> computeDynamicAccounts() throws ConfigurationException
{
- Map newAccounts =
- new HashMap(
+ Map<DynamicAccountKey, DynamicAccount> newAccounts =
+ new HashMap<DynamicAccountKey, DynamicAccount> (
getLocalUsers().countUsers()
* getParsedDynamicAccountParameters().size());
- Map oldAccounts = getDynamicAccountsBasic();
+ Map<DynamicAccountKey, DynamicAccount> oldAccounts = getDynamicAccountsBasic();
if (null == oldAccounts)
- oldAccounts = new HashMap(0);
+ oldAccounts = new HashMap<DynamicAccountKey, DynamicAccount> (0);
- Iterator parameterIterator =
+ Iterator<ParsedDynamicAccountParameters> parameterIterator =
getParsedDynamicAccountParameters().iterator();
// Process each ParsedDynamicParameters
while (parameterIterator.hasNext())
{
- Map accounts =
+ Map<DynamicAccountKey, DynamicAccount> accounts =
computeDynamicAccounts(
oldAccounts,
(ParsedDynamicAccountParameters) parameterIterator.next());
// Remove accounts from oldAccounts.
// This avoids an average 2*N increase in heapspace used as the
// newAccounts are created.
- Iterator oldAccountsIterator = oldAccounts.keySet().iterator();
+ Iterator<DynamicAccountKey> oldAccountsIterator = oldAccounts.keySet().iterator();
while (oldAccountsIterator.hasNext())
{
if (accounts.containsKey(oldAccountsIterator.next()))
@@ -815,7 +818,7 @@
* Returns the dynamicAccounts. Initializes if required.
* @return Map
*/
- protected Map getDynamicAccounts() throws ConfigurationException
+ protected Map<DynamicAccountKey, DynamicAccount> getDynamicAccounts() throws ConfigurationException
{
if (null == getDynamicAccountsBasic())
{
@@ -829,7 +832,7 @@
* Returns the dynamicAccounts.
* @return Map
*/
- private Map getDynamicAccountsBasic()
+ private Map<DynamicAccountKey, DynamicAccount> getDynamicAccountsBasic()
{
return fieldDynamicAccounts;
}
@@ -838,7 +841,7 @@
* Sets the dynamicAccounts.
* @param dynamicAccounts The dynamicAccounts to set
*/
- protected void setDynamicAccounts(Map dynamicAccounts)
+ protected void setDynamicAccounts(Map<DynamicAccountKey, DynamicAccount> dynamicAccounts)
{
fieldDynamicAccounts = dynamicAccounts;
}
@@ -852,19 +855,19 @@
* @return Map - The current Accounts
* @throws ConfigurationException
*/
- protected Map computeDynamicAccounts(
- Map oldAccounts,
+ protected Map<DynamicAccountKey, DynamicAccount> computeDynamicAccounts(
+ Map<DynamicAccountKey, DynamicAccount> oldAccounts,
ParsedDynamicAccountParameters parameters)
throws ConfigurationException
{
- Map accounts = new HashMap(getLocalUsers().countUsers());
- Iterator usersIterator = getLocalUsers().list();
+ Map<DynamicAccountKey, DynamicAccount> accounts = new HashMap<DynamicAccountKey, DynamicAccount>(getLocalUsers().countUsers());
+ Iterator<String> usersIterator = getLocalUsers().list();
while (usersIterator.hasNext())
{
- String userName = (String) usersIterator.next();
+ String userName = usersIterator.next();
DynamicAccountKey key =
new DynamicAccountKey(userName, parameters.getSequenceNumber());
- Account account = (Account) oldAccounts.get(key);
+ DynamicAccount account = oldAccounts.get(key);
if (null == account)
{
// Create a new DynamicAccount
@@ -899,7 +902,7 @@
* Returns the ParsedDynamicAccountParameters.
* @return List
*/
- protected List getParsedDynamicAccountParameters()
+ protected List<ParsedDynamicAccountParameters> getParsedDynamicAccountParameters()
{
if (null == getParsedDynamicAccountParametersBasic())
{
@@ -913,7 +916,7 @@
* Returns the ParsedDynamicAccountParameters.
* @return List
*/
- private List getParsedDynamicAccountParametersBasic()
+ private List<ParsedDynamicAccountParameters> getParsedDynamicAccountParametersBasic()
{
return fieldParsedDynamicAccountParameters;
}
@@ -922,7 +925,7 @@
* Sets the ParsedDynamicAccountParameters.
* @param parsedDynamicAccountParameters The ParsedDynamicAccountParameters to set
*/
- protected void setParsedDynamicAccountParameters(List parsedDynamicAccountParameters)
+ protected void setParsedDynamicAccountParameters(List<ParsedDynamicAccountParameters> parsedDynamicAccountParameters)
{
fieldParsedDynamicAccountParameters = parsedDynamicAccountParameters;
}
@@ -1000,8 +1003,8 @@
allProperties[i].getAttribute("value"));
if (getLogger().isDebugEnabled())
{
- StringBuffer messageBuffer =
- new StringBuffer("Set property name: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Set property name: ");
messageBuffer.append(allProperties[i].getAttribute("name"));
messageBuffer.append(" to: ");
messageBuffer.append(
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java Fri Sep 18 16:07:20 2009
@@ -67,7 +67,7 @@
*/
private volatile boolean enabled = false;
- private ArrayList theFetchTaskNames = new ArrayList();
+ private ArrayList<String> theFetchTaskNames = new ArrayList<String>();
public void setScheduler(TimeScheduler scheduler) {
this.scheduler = scheduler;
@@ -140,10 +140,10 @@
if (enabled)
{
getLogger().info("FetchMail dispose...");
- Iterator nameIterator = theFetchTaskNames.iterator();
+ Iterator<String> nameIterator = theFetchTaskNames.iterator();
while (nameIterator.hasNext())
{
- scheduler.removeTrigger((String) nameIterator.next());
+ scheduler.removeTrigger(nameIterator.next());
}
getLogger().info("FetchMail ...dispose end");
}
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FolderProcessor.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FolderProcessor.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FolderProcessor.java Fri Sep 18 16:07:20 2009
@@ -101,8 +101,8 @@
// allowing subsequent messages to be processed.
catch (Exception ex)
{
- StringBuffer logMessageBuffer =
- new StringBuffer("Exception processing message ID: ");
+ StringBuilder logMessageBuffer =
+ new StringBuilder("Exception processing message ID: ");
logMessageBuffer.append(message.getMessageID());
getLogger().error(logMessageBuffer.toString(), ex);
}
@@ -127,7 +127,7 @@
{
// No-op
}
- StringBuffer logMessageBuffer = new StringBuffer("Processed ");
+ StringBuilder logMessageBuffer = new StringBuilder("Processed ");
logMessageBuffer.append(messagesProcessed);
logMessageBuffer.append(" messages of ");
logMessageBuffer.append(messageCount);
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/MessageProcessor.java Fri Sep 18 16:07:20 2009
@@ -277,8 +277,8 @@
// Log delivery attempt
if (getLogger().isDebugEnabled())
{
- StringBuffer logMessageBuffer =
- new StringBuffer("Attempting delivery of message with id. ");
+ StringBuilder logMessageBuffer =
+ new StringBuilder("Attempting delivery of message with id. ");
logMessageBuffer.append(getMessageIn().getMessageID());
getLogger().debug(logMessageBuffer.toString());
}
@@ -299,8 +299,8 @@
getDeferredRecipientNotFoundMessageIDs().add(messageID);
if (getLogger().isDebugEnabled())
{
- StringBuffer messageBuffer =
- new StringBuffer("Deferred processing of message for which the intended recipient could not be found. Message ID: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Deferred processing of message for which the intended recipient could not be found. Message ID: ");
messageBuffer.append(messageID);
getLogger().debug(messageBuffer.toString());
}
@@ -311,8 +311,8 @@
getDeferredRecipientNotFoundMessageIDs().remove(messageID);
if (getLogger().isDebugEnabled())
{
- StringBuffer messageBuffer =
- new StringBuffer("Processing deferred message for which the intended recipient could not be found. Message ID: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Processing deferred message for which the intended recipient could not be found. Message ID: ");
messageBuffer.append(messageID);
getLogger().debug(messageBuffer.toString());
}
@@ -325,8 +325,8 @@
return;
}
intendedRecipient = getRecipient();
- StringBuffer messageBuffer =
- new StringBuffer("Intended recipient not found. Using configured recipient as new envelope recipient - ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Intended recipient not found. Using configured recipient as new envelope recipient - ");
messageBuffer.append(intendedRecipient);
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -423,8 +423,8 @@
if (isMarkRemoteRecipientSeen())
setMessageSeen();
- StringBuffer messageBuffer =
- new StringBuffer("Rejected mail intended for remote recipient: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Rejected mail intended for remote recipient: ");
messageBuffer.append(recipient);
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -446,8 +446,8 @@
if (isMarkBlacklistedSeen())
setMessageSeen();
- StringBuffer messageBuffer =
- new StringBuffer("Rejected mail intended for blacklisted recipient: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Rejected mail intended for blacklisted recipient: ");
messageBuffer.append(recipient);
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -468,8 +468,8 @@
if (isMarkRecipientNotFoundSeen())
setMessageSeen();
- StringBuffer messageBuffer =
- new StringBuffer("Rejected mail for which a sole intended recipient could not be found.");
+ StringBuilder messageBuffer =
+ new StringBuilder("Rejected mail for which a sole intended recipient could not be found.");
messageBuffer.append(" Recipients: ");
Address[] allRecipients = getMessageIn().getAllRecipients();
for (int i = 0; i < allRecipients.length; i++)
@@ -497,8 +497,8 @@
if (isMarkUserUndefinedSeen())
setMessageSeen();
- StringBuffer messageBuffer =
- new StringBuffer("Rejected mail intended for undefined user: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Rejected mail intended for undefined user: ");
messageBuffer.append(recipient);
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -521,8 +521,8 @@
if (isMarkMaxMessageSizeExceededSeen())
setMessageSeen();
- StringBuffer messageBuffer =
- new StringBuffer("Rejected mail exceeding message size limit. Message size: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Rejected mail exceeding message size limit. Message size: ");
messageBuffer.append(messageSize/1024);
messageBuffer.append("KB.");
logStatusInfo(messageBuffer.toString());
@@ -544,8 +544,8 @@
if (isMarkRemoteReceivedHeaderInvalidSeen())
setMessageSeen();
- StringBuffer messageBuffer =
- new StringBuffer("Rejected mail with an invalid Received: header at index ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Rejected mail with an invalid Received: header at index ");
messageBuffer.append(getRemoteReceivedHeaderIndex());
messageBuffer.append(".");
logStatusInfo(messageBuffer.toString());
@@ -587,6 +587,7 @@
* @return MimeMessage
* @throws MessagingException
*/
+ @SuppressWarnings("unchecked")
protected MimeMessage createEmptyMessage()
throws MessagingException
{
@@ -619,7 +620,7 @@
protected Mail createMail(MimeMessage message, MailAddress recipient)
throws MessagingException, UnknownHostException
{
- Collection recipients = new ArrayList(1);
+ Collection<MailAddress> recipients = new ArrayList<MailAddress>(1);
recipients.add(recipient);
MailImpl mail =
new MailImpl(getServer().getId(), getSender(), recipients, message);
@@ -639,10 +640,16 @@
setDefaultRemoteAddress(false);
}
+ logMailCreation(mail);
+ return mail;
+ }
+
+ @SuppressWarnings("unchecked")
+ private void logMailCreation(MailImpl mail) {
if (getLogger().isDebugEnabled())
{
- StringBuffer messageBuffer =
- new StringBuffer("Created mail with name: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Created mail with name: ");
messageBuffer.append(mail.getName());
messageBuffer.append(", sender: ");
messageBuffer.append(mail.getSender());
@@ -660,7 +667,6 @@
messageBuffer.append('.');
getLogger().debug(messageBuffer.toString());
}
- return mail;
}
@@ -688,7 +694,7 @@
catch (Exception _) {
from = getDefaultLocalPart();
setDefaultSenderLocalPart(true);
- StringBuffer buffer = new StringBuffer(32);
+ StringBuilder buffer = new StringBuilder(32);
buffer.append("Sender localpart is absent. Using default value (");
buffer.append(getDefaultLocalPart());
buffer.append(')');
@@ -698,13 +704,13 @@
// Check for domain part, add default if missing
if (from.indexOf('@') < 0)
{
- StringBuffer fromBuffer = new StringBuffer(from);
+ StringBuilder fromBuffer = new StringBuilder(from);
fromBuffer.append('@');
fromBuffer.append(getDefaultDomainName());
internetAddress = new InternetAddress(fromBuffer.toString());
setDefaultSenderDomainPart(true);
- StringBuffer buffer = new StringBuffer(32);
+ StringBuilder buffer = new StringBuilder(32);
buffer.append("Sender domain is absent. Using default value (");
buffer.append(getDefaultDomainName());
buffer.append(')');
@@ -747,7 +753,7 @@
*/
protected String computeRemoteDomain() throws MessagingException
{
- StringBuffer domainBuffer = new StringBuffer();
+ StringBuilder domainBuffer = new StringBuilder();
String[] headers = null;
if (getRemoteReceivedHeaderIndex() > -1)
@@ -843,8 +849,8 @@
logStatusWarn("Message could not be delivered due to an error parsing a mail address.");
if (getLogger().isDebugEnabled())
{
- StringBuffer messageBuffer =
- new StringBuffer("UNDELIVERABLE Message ID: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("UNDELIVERABLE Message ID: ");
messageBuffer.append(getMessageIn().getMessageID());
getLogger().debug(messageBuffer.toString(), ex);
}
@@ -868,8 +874,8 @@
logStatusWarn("Message could not be delivered due to an error determining the remote domain.");
if (getLogger().isDebugEnabled())
{
- StringBuffer messageBuffer =
- new StringBuffer("UNDELIVERABLE Message ID: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("UNDELIVERABLE Message ID: ");
messageBuffer.append(getMessageIn().getMessageID());
getLogger().debug(messageBuffer.toString(), ex);
}
@@ -880,6 +886,7 @@
* @param recipient
* @return boolean
*/
+ @SuppressWarnings("deprecation")
protected boolean isLocalRecipient(MailAddress recipient)
{
return isLocalServer(recipient) && getLocalUsers().contains(recipient.getUser());
@@ -890,6 +897,7 @@
* @param recipient
* @return boolean
*/
+ @SuppressWarnings("deprecation")
protected boolean isLocalServer(MailAddress recipient)
{
return getServer().isLocalServer(recipient.getHost());
@@ -911,6 +919,7 @@
*
* @return boolean
*/
+ @SuppressWarnings("unchecked")
protected boolean isBouncing() throws MessagingException
{
Enumeration enumeration =
@@ -931,6 +940,7 @@
* @param mail
* @throws MessagingException
*/
+ @SuppressWarnings("unchecked")
protected void sendMail(Mail mail) throws MessagingException
{
// send the mail
@@ -944,8 +954,8 @@
setMessageSeen();
// Log the status
- StringBuffer messageBuffer =
- new StringBuffer("Spooled message to recipients: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Spooled message to recipients: ");
Iterator recipientIterator = mail.getRecipients().iterator();
while (recipientIterator.hasNext())
{
@@ -968,6 +978,7 @@
* @return String
*/
+ @SuppressWarnings("unchecked")
protected String getEnvelopeRecipient(MimeMessage msg) throws MessagingException
{
String res = getCustomRecipientHeader();
@@ -1059,8 +1070,8 @@
// hard-coded recipient
if (isIgnoreRecipientHeader())
{
- StringBuffer messageBuffer =
- new StringBuffer("Ignoring recipient header. Using configured recipient as new envelope recipient: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Ignoring recipient header. Using configured recipient as new envelope recipient: ");
messageBuffer.append(getRecipient());
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -1073,8 +1084,8 @@
if (targetRecipient != null)
{
MailAddress recipient = new MailAddress(targetRecipient);
- StringBuffer messageBuffer =
- new StringBuffer("Using original envelope recipient as new envelope recipient: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Using original envelope recipient as new envelope recipient: ");
messageBuffer.append(recipient);
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -1090,8 +1101,8 @@
{
MailAddress recipient =
new MailAddress((InternetAddress) allRecipients[0]);
- StringBuffer messageBuffer =
- new StringBuffer("Using sole recipient header address as new envelope recipient: ");
+ StringBuilder messageBuffer =
+ new StringBuilder("Using sole recipient header address as new envelope recipient: ");
messageBuffer.append(recipient);
messageBuffer.append('.');
logStatusInfo(messageBuffer.toString());
@@ -1166,15 +1177,15 @@
}
/**
- * Answer a <code>StringBuffer</code> containing a message reflecting
+ * Answer a <code>StringBuilder</code> containing a message reflecting
* the current status of the message being processed.
*
* @param detailMsg
- * @return StringBuffer
+ * @return StringBuilder
*/
- protected StringBuffer getStatusReport(String detailMsg) throws MessagingException
+ protected StringBuilder getStatusReport(String detailMsg) throws MessagingException
{
- StringBuffer messageBuffer = new StringBuffer(detailMsg);
+ StringBuilder messageBuffer = new StringBuilder(detailMsg);
if (detailMsg.length() > 0)
messageBuffer.append(' ');
messageBuffer.append("Message ID: ");
@@ -1349,8 +1360,8 @@
{
if (isMaxMessageSizeExceeded().booleanValue())
{
- StringBuffer msgBuffer =
- new StringBuffer("550 - Rejected - This message has been rejected as the message size of ");
+ StringBuilder msgBuffer =
+ new StringBuilder("550 - Rejected - This message has been rejected as the message size of ");
msgBuffer.append(getMessageIn().getSize() * 1000 / 1024 / 1000f);
msgBuffer.append("KB exceeds the maximum permitted size of ");
msgBuffer.append(getMaxMessageSizeLimit() / 1024);
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java Fri Sep 18 16:07:20 2009
@@ -273,7 +273,7 @@
/**
* The Set of MailAddresses for whom mail should be rejected
*/
- private Set fieldBlacklist;
+ private Set<MailAddress> fieldBlacklist;
/**
* The maximum message size limit
@@ -681,7 +681,7 @@
* Returns the blacklist.
* @return Set
*/
- public Set getBlacklist()
+ public Set<MailAddress> getBlacklist()
{
return fieldBlacklist;
}
@@ -690,7 +690,7 @@
* Sets the blacklist.
* @param blacklist The blacklist to set
*/
- protected void setBlacklist(Set blacklist)
+ protected void setBlacklist(Set<MailAddress> blacklist)
{
fieldBlacklist = blacklist;
}
@@ -703,7 +703,7 @@
throws ConfigurationException
{
StringTokenizer st = new StringTokenizer(blacklistValue, ", \t", false);
- Set blacklist = new HashSet();
+ Set<MailAddress> blacklist = new HashSet<MailAddress>();
String token = null;
while (st.hasMoreTokens())
{
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java Fri Sep 18 16:07:20 2009
@@ -44,10 +44,7 @@
*
* <p><code>ProcessorAbstract</code> wraps an Account - see
* <code>org.apache.james.fetchmail.Account</code>
- * - providing contextual information about the environment for the processor.</p>
- *
- * <p>Creation Date: 27-May-03</p>
- *
+ * - providing contextual information about the environment for the processor.</p>
*/
abstract public class ProcessorAbstract
{
@@ -104,7 +101,7 @@
* deferred as the recipient could not be found
* @return List
*/
- protected List getDeferredRecipientNotFoundMessageIDs()
+ protected List<String> getDeferredRecipientNotFoundMessageIDs()
{
return getAccount().getDeferredRecipientNotFoundMessageIDs();
}
@@ -507,7 +504,7 @@
* Returns the blacklist.
* @return Set
*/
- protected Set getBlacklist()
+ protected Set<MailAddress> getBlacklist()
{
return getConfiguration().getBlacklist();
}
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/StoreProcessor.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/StoreProcessor.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/StoreProcessor.java Fri Sep 18 16:07:20 2009
@@ -28,8 +28,6 @@
/**
* <p>Class <code>StoreProcessor</code> connects to a message store, gets the
* target Folder and delegates its processing to <code>FolderProcessor</code>.</p>
- *
- * <p>Creation Date: 27-May-03</p>
*/
public class StoreProcessor extends ProcessorAbstract
{
@@ -54,8 +52,8 @@
Store store = null;
Folder folder = null;
- StringBuffer logMessageBuffer =
- new StringBuffer("Starting fetching mail from server '");
+ StringBuilder logMessageBuffer =
+ new StringBuilder("Starting fetching mail from server '");
logMessageBuffer.append(getHost());
logMessageBuffer.append("' for user '");
logMessageBuffer.append(getUser());
@@ -106,7 +104,7 @@
ex);
}
logMessageBuffer =
- new StringBuffer("Finished fetching mail from server '");
+ new StringBuilder("Finished fetching mail from server '");
logMessageBuffer.append(getHost());
logMessageBuffer.append("' for user '");
logMessageBuffer.append(getUser());
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java?rev=816692&r1=816691&r2=816692&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/api/user/UsersRepository.java Fri Sep 18 16:07:20 2009
@@ -170,6 +170,6 @@
*
* @return Iterator over a collection of Strings, each being one user in the repository.
*/
- Iterator list();
+ Iterator<String> list();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org