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 ie...@apache.org on 2013/03/01 00:31:42 UTC
svn commit: r1451435 [7/9] - in /james/server/trunk: ./ app/
app/src/assemble/ app/src/reporting-site/
cli/src/main/java/org/apache/james/cli/
cli/src/main/java/org/apache/james/cli/probe/impl/
core/src/main/java/org/apache/james/core/ data/data-api/sr...
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDeliverySocketFactory.java Thu Feb 28 23:31:36 2013
@@ -98,7 +98,7 @@ public class RemoteDeliverySocketFactory
* is the one which is used by JavaMail 1.3. This is not used by JavaMail
* 1.4.
*/
- public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
+ public Socket createSocket(String host, int port) throws IOException {
return new Socket(host, port, bindAddress, 0);
}
@@ -107,7 +107,7 @@ public class RemoteDeliverySocketFactory
* to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
* 1.4.
*/
- public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort) throws IOException, UnknownHostException {
+ public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort) throws IOException {
return new Socket(host, port, clientHost == null ? bindAddress : clientHost, clientPort);
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java Thu Feb 28 23:31:36 2013
@@ -36,7 +36,7 @@ import org.apache.jsieve.mailet.Resource
*/
public class ResourceLocatorImpl implements ResourceLocator {
- private boolean virtualHosting;
+ private final boolean virtualHosting;
private FileSystem fileSystem = null;
@@ -58,7 +58,7 @@ public class ResourceLocatorImpl impleme
// RFC 5228 permits extensions: .siv .sieve
String sieveFilePrefix = FileSystem.FILE_PROTOCOL + "sieve/" + username + ".";
- File sieveFile = null;
+ File sieveFile;
try {
sieveFile = fileSystem.getFile(sieveFilePrefix + "sieve");
} catch (FileNotFoundException ex) {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java Thu Feb 28 23:31:36 2013
@@ -69,12 +69,12 @@ public class SPF extends GenericMailet {
* @see org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
*/
public void service(Mail mail) throws MessagingException {
- String sender = null;
+ String sender;
MailAddress senderAddr = mail.getSender();
String remoteAddr = mail.getRemoteAddr();
String helo = mail.getRemoteHost();
- if (remoteAddr.equals("127.0.0.1") == false) {
+ if (!remoteAddr.equals("127.0.0.1")) {
if (senderAddr != null) {
sender = senderAddr.toString();
} else {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java Thu Feb 28 23:31:36 2013
@@ -91,12 +91,9 @@ public class SpamAssassin extends Generi
SpamAssassinInvoker sa = new SpamAssassinInvoker(spamdHost, spamdPort);
sa.scanMail(message);
- Iterator<String> headers = sa.getHeadersAsAttribute().keySet().iterator();
-
// Add headers as attribute to mail object
- while (headers.hasNext()) {
- String key = headers.next();
- mail.setAttribute(key, (String) sa.getHeadersAsAttribute().get(key));
+ for (String key : sa.getHeadersAsAttribute().keySet()) {
+ mail.setAttribute(key, sa.getHeadersAsAttribute().get(key));
}
message.saveChanges();
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java Thu Feb 28 23:31:36 2013
@@ -70,7 +70,7 @@ public class ToRecipientFolder extends G
*/
@Override
public void service(Mail mail) throws MessagingException {
- if (mail.getState() != Mail.GHOST) {
+ if (!mail.getState().equals(Mail.GHOST)) {
sieveMailet.service(mail);
}
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java Thu Feb 28 23:31:36 2013
@@ -86,8 +86,8 @@ public class ToRepository extends Generi
* the mail to process
*/
public void service(Mail mail) throws javax.mail.MessagingException {
- StringBuffer logBuffer = new StringBuffer(160).append("Storing mail ").append(mail.getName()).append(" in ").append(repositoryPath);
- log(logBuffer.toString());
+ String logBuffer = "Storing mail " + mail.getName() + " in " + repositoryPath;
+ log(logBuffer);
repository.store(mail);
if (!passThrough) {
mail.setState(Mail.GHOST);
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java Thu Feb 28 23:31:36 2013
@@ -72,7 +72,7 @@ public class ToSenderFolder extends Gene
*/
@Override
public void service(Mail mail) throws MessagingException {
- if (mail.getState() != Mail.GHOST) {
+ if (!mail.getState().equals(Mail.GHOST)) {
doService(mail);
if (consume) {
mail.setState(Mail.GHOST);
@@ -83,7 +83,7 @@ public class ToSenderFolder extends Gene
private void doService(Mail mail) throws MessagingException {
final MailAddress sender = mail.getSender();
- String username = null;
+ String username;
try {
if (usersRepository.supportVirtualHosting()) {
username = sender.toString();
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Thu Feb 28 23:31:36 2013
@@ -92,11 +92,11 @@ public class UsersRepositoryAliasingForw
try {
mappings = ((RecipientRewriteTable) usersRepository).getMappings(recipient.getLocalPart(), recipient.getDomain());
} catch (ErrorMappingException e) {
- StringBuilder errorBuffer = new StringBuilder(128).append("A problem as occoured trying to alias and forward user ").append(recipient).append(": ").append(e.getMessage());
- throw new MessagingException(errorBuffer.toString());
+ String errorBuffer = "A problem as occoured trying to alias and forward user " + recipient + ": " + e.getMessage();
+ throw new MessagingException(errorBuffer);
} catch (RecipientRewriteTableException e) {
- StringBuilder errorBuffer = new StringBuilder(128).append("A problem as occoured trying to alias and forward user ").append(recipient).append(": ").append(e.getMessage());
- throw new MessagingException(errorBuffer.toString());
+ String errorBuffer = "A problem as occoured trying to alias and forward user " + recipient + ": " + e.getMessage();
+ throw new MessagingException(errorBuffer);
}
if (mappings != null) {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Thu Feb 28 23:31:36 2013
@@ -133,7 +133,7 @@ public class WhiteListManager extends Ge
private String deleteByPK;
/** The date format object used to generate RFC 822 compliant date headers. */
- private RFC822DateFormat rfc822DateFormat = new RFC822DateFormat();
+ private final RFC822DateFormat rfc822DateFormat = new RFC822DateFormat();
private DataSource datasource;
@@ -155,15 +155,10 @@ public class WhiteListManager extends Ge
/**
* Contains all of the sql strings for this component.
*/
- private SqlResources sqlQueries = new SqlResources();
-
- /**
- * Holds value of property sqlFile.
- */
- private File sqlFile;
+ private final SqlResources sqlQueries = new SqlResources();
/** Holds value of property sqlParameters. */
- private Map<String, String> sqlParameters = new HashMap<String, String>();
+ private final Map<String, String> sqlParameters = new HashMap<String, String>();
@Inject
public void setDataSource(DataSource datasource) {
@@ -317,10 +312,10 @@ public class WhiteListManager extends Ge
try {
- for (Iterator<MailAddress> i = recipients.iterator(); i.hasNext();) {
+ for (MailAddress recipient : recipients) {
ResultSet selectRS = null;
try {
- MailAddress recipientMailAddress = (MailAddress) i.next();
+ MailAddress recipientMailAddress = recipient;
String recipientUser = recipientMailAddress.getLocalPart().toLowerCase(Locale.US);
String recipientHost = recipientMailAddress.getDomain().toLowerCase(Locale.US);
@@ -672,7 +667,7 @@ public class WhiteListManager extends Ge
}
}
- private void sendReplyFromPostmaster(Mail mail, String stringContent) throws MessagingException {
+ private void sendReplyFromPostmaster(Mail mail, String stringContent) {
try {
MailAddress notifier = getMailetContext().getPostmaster();
@@ -762,8 +757,11 @@ public class WhiteListManager extends Ge
conn.setAutoCommit(false);
}
- this.sqlFile = new File((String) mailetContext.getAttribute("confDir"), "sqlResources.xml").getCanonicalFile();
- sqlQueries.init(this.sqlFile, "WhiteList", conn, getSqlParameters());
+ /*
+ Holds value of property sqlFile.
+ */
+ File sqlFile = new File((String) mailetContext.getAttribute("confDir"), "sqlResources.xml").getCanonicalFile();
+ sqlQueries.init(sqlFile, "WhiteList", conn, getSqlParameters());
checkTables(conn);
} finally {
@@ -777,7 +775,7 @@ public class WhiteListManager extends Ge
// DatabaseMetaInfo.
// Try UPPER, lower, and MixedCase, to see if the table is there.
- boolean dbUpdated = false;
+ boolean dbUpdated;
dbUpdated = createTable(conn, "whiteListTableName", "createWhiteListTable");
@@ -805,7 +803,7 @@ public class WhiteListManager extends Ge
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuffer logBuffer = null;
+ StringBuffer logBuffer;
logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
log(logBuffer.toString());
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java Thu Feb 28 23:31:36 2013
@@ -100,8 +100,7 @@ public class XMLRecipientRewriteTable ex
protected void mapRecipients(Map<MailAddress, String> recipientsMap) throws MessagingException {
Collection<MailAddress> recipients = recipientsMap.keySet();
- for (Iterator<MailAddress> i = recipients.iterator(); i.hasNext();) {
- MailAddress source = i.next();
+ for (MailAddress source : recipients) {
String user = source.getLocalPart().toLowerCase();
String domain = source.getDomain().toLowerCase();
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java Thu Feb 28 23:31:36 2013
@@ -86,11 +86,11 @@ public abstract class AbstractNetworkMat
}
protected boolean matchNetwork(java.net.InetAddress addr) {
- return authorizedNetworks == null ? false : authorizedNetworks.matchInetNetwork(addr);
+ return authorizedNetworks != null && authorizedNetworks.matchInetNetwork(addr);
}
protected boolean matchNetwork(String addr) {
- return authorizedNetworks == null ? false : authorizedNetworks.matchInetNetwork(addr);
+ return authorizedNetworks != null && authorizedNetworks.matchInetNetwork(addr);
}
/**
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java Thu Feb 28 23:31:36 2013
@@ -55,11 +55,8 @@ public abstract class AbstractSQLWhiteli
protected DataSource datasource;
- /** Holds value of property sqlFile. */
- private File sqlFile;
-
/** Holds value of property sqlParameters. */
- private Map<String, String> sqlParameters = new HashMap<String, String>();
+ private final Map<String, String> sqlParameters = new HashMap<String, String>();
@Inject
public void setDataSource(DataSource datasource) {
@@ -92,7 +89,7 @@ public abstract class AbstractSQLWhiteli
/**
* Contains all of the sql strings for this component.
*/
- protected SqlResources sqlQueries = new SqlResources();
+ protected final SqlResources sqlQueries = new SqlResources();
private FileSystem fs;
@@ -144,8 +141,7 @@ public abstract class AbstractSQLWhiteli
Collection<MailAddress> inWhiteList = new java.util.HashSet<MailAddress>();
- for (Iterator<MailAddress> i = recipients.iterator(); i.hasNext();) {
- MailAddress recipientMailAddress = i.next();
+ for (MailAddress recipientMailAddress : recipients) {
String recipientUser = recipientMailAddress.getLocalPart().toLowerCase(Locale.US);
String recipientHost = recipientMailAddress.getDomain().toLowerCase(Locale.US);
@@ -207,8 +203,9 @@ public abstract class AbstractSQLWhiteli
conn.setAutoCommit(false);
}
- this.sqlFile = fs.getFile("classpath:sqlResources.xml");
- sqlQueries.init(this.sqlFile, getSQLSectionName(), conn, getSqlParameters());
+ /* Holds value of property sqlFile. */
+ File sqlFile = fs.getFile("classpath:sqlResources.xml");
+ sqlQueries.init(sqlFile, getSQLSectionName(), conn, getSqlParameters());
checkTables(conn);
} finally {
theJDBCUtil.closeJDBCConnection(conn);
@@ -225,7 +222,7 @@ public abstract class AbstractSQLWhiteli
// DatabaseMetaInfo.
// Try UPPER, lower, and MixedCase, to see if the table is there.
- boolean dbUpdated = false;
+ boolean dbUpdated;
dbUpdated = createTable(conn, getTableName(), getTableCreateQueryName());
@@ -253,7 +250,7 @@ public abstract class AbstractSQLWhiteli
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuffer logBuffer = null;
+ StringBuffer logBuffer;
logBuffer = new StringBuffer(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
log(logBuffer.toString());
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java Thu Feb 28 23:31:36 2013
@@ -74,7 +74,7 @@ public class InSpammerBlacklist extends
String host = mail.getRemoteAddr();
try {
// Have to reverse the octets first
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
StringTokenizer st = new StringTokenizer(host, " .", false);
while (st.hasMoreTokens()) {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java Thu Feb 28 23:31:36 2013
@@ -104,7 +104,7 @@ public class NetworkIsInWhitelist extend
NetMatcher matcher = new NetMatcher(nets, dns);
boolean matched = matcher.matchInetNetwork(mail.getRemoteAddr());
- if (matched == false) {
+ if (!matched) {
selectStmt = conn.prepareStatement(selectNetworks);
selectStmt.setString(1, "*");
selectStmt.setString(2, recipientHost);
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java Thu Feb 28 23:31:36 2013
@@ -42,7 +42,7 @@ public class SenderInFakeDomain extends
// criteria.
log("No MX, A, or CNAME record found for domain: " + domain);
return mail.getRecipients();
- } else if (matchNetwork(servers.iterator().next().toString())) {
+ } else if (matchNetwork(servers.iterator().next())) {
/*
* It could be a wildcard address like these:
*
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java Thu Feb 28 23:31:36 2013
@@ -28,8 +28,8 @@ import org.slf4j.Marker;
*/
public class MailetContextLog implements Logger {
- private boolean isDebug;
- private MailetContext context;
+ private final boolean isDebug;
+ private final MailetContext context;
public MailetContextLog(MailetContext context, boolean isDebug) {
this.context = context;
@@ -135,19 +135,6 @@ public class MailetContextLog implements
}
/**
- * Do nothing
- */
- public void trace(Object arg0) {
- }
-
- /**
- * Do nothing
- */
- public void trace(Object arg0, Throwable arg1) {
-
- }
-
- /**
* @see org.slf4j.Logger#warn(java.lang.String)
*/
public void warn(String arg0) {
@@ -526,7 +513,7 @@ public class MailetContextLog implements
}
private void debugLog(Marker marker, String msg, Object... obj) {
- StringBuffer s = new StringBuffer("[");
+ StringBuilder s = new StringBuilder("[");
s.append(marker.toString()).append("] ").append(msg);
Throwable t = null;
if (obj != null) {
@@ -558,7 +545,7 @@ public class MailetContextLog implements
}
private void debugLog(String msg, Object... obj) {
- StringBuffer s = new StringBuffer(msg);
+ StringBuilder s = new StringBuilder(msg);
Throwable t = null;
if (obj != null) {
s.append(" args=[");
@@ -589,7 +576,7 @@ public class MailetContextLog implements
}
private void errorLog(Marker marker, String msg, Object... obj) {
- StringBuffer s = new StringBuffer("[");
+ StringBuilder s = new StringBuilder("[");
s.append(marker.toString()).append("] ").append(msg);
Throwable t = null;
if (obj != null) {
@@ -621,7 +608,7 @@ public class MailetContextLog implements
}
private void errorLog(String msg, Object... obj) {
- StringBuffer s = new StringBuffer(msg);
+ StringBuilder s = new StringBuilder(msg);
Throwable t = null;
if (obj != null) {
s.append(" args=[");
@@ -652,7 +639,7 @@ public class MailetContextLog implements
}
private void infoLog(Marker marker, String msg, Object... obj) {
- StringBuffer s = new StringBuffer("[");
+ StringBuilder s = new StringBuilder("[");
s.append(marker.toString()).append("] ").append(msg);
Throwable t = null;
if (obj != null) {
@@ -684,7 +671,7 @@ public class MailetContextLog implements
}
private void infoLog(String msg, Object... obj) {
- StringBuffer s = new StringBuffer(msg);
+ StringBuilder s = new StringBuilder(msg);
Throwable t = null;
if (obj != null) {
s.append(" args=[");
@@ -715,7 +702,7 @@ public class MailetContextLog implements
}
private void warnLog(Marker marker, String msg, Object... obj) {
- StringBuffer s = new StringBuffer("[");
+ StringBuilder s = new StringBuilder("[");
s.append(marker.toString()).append("] ").append(msg);
Throwable t = null;
if (obj != null) {
@@ -747,7 +734,7 @@ public class MailetContextLog implements
}
private void warnLog(String msg, Object... obj) {
- StringBuffer s = new StringBuffer(msg);
+ StringBuilder s = new StringBuilder(msg);
Throwable t = null;
if (obj != null) {
s.append(" args=[");
Added: james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/Patterns.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/Patterns.java?rev=1451435&view=auto
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/Patterns.java (added)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/Patterns.java Thu Feb 28 23:31:36 2013
@@ -0,0 +1,17 @@
+package org.apache.james.transport.util;
+
+import com.google.common.base.Throwables;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+public class Patterns {
+
+ public static Pattern compilePatternUncheckedException(String pattern) {
+ try {
+ return Pattern.compile(pattern);
+ } catch (PatternSyntaxException mpe) {
+ throw Throwables.propagate(mpe);
+ }
+ }
+}
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java Thu Feb 28 23:31:36 2013
@@ -82,8 +82,7 @@ public class InstrumentationMailet imple
context.log("Sender host: " + mail.getSender().getDomain());
context.log("Sender user: " + mail.getSender().getLocalPart());
Collection<MailAddress> recipients = mail.getRecipients();
- for (Iterator<MailAddress> it = recipients.iterator(); it.hasNext();) {
- MailAddress address = it.next();
+ for (MailAddress address : recipients) {
context.log("Recipient: " + address.getLocalPart() + "@" + address.getDomain());
}
@@ -113,12 +112,12 @@ public class InstrumentationMailet imple
Flags flags = message.getFlags();
Flag[] systemFlags = flags.getSystemFlags();
- for (int i = 0; i < systemFlags.length; i++) {
- context.log("System Flag:" + systemFlags[i]);
+ for (Flag systemFlag : systemFlags) {
+ context.log("System Flag:" + systemFlag);
}
String[] userFlags = flags.getUserFlags();
- for (int i = 0; i < userFlags.length; i++) {
- context.log("User flag: " + userFlags[i]);
+ for (String userFlag : userFlags) {
+ context.log("User flag: " + userFlag);
}
String mimeType = message.getContentType();
@@ -139,12 +138,12 @@ public class InstrumentationMailet imple
private void printAddresses(Address[] addresses, String prefix) {
MailetContext context = config.getMailetContext();
- for (int i = 0; i < addresses.length; i++) {
- if (addresses[i] instanceof InternetAddress) {
- InternetAddress address = (InternetAddress) addresses[i];
+ for (Address address1 : addresses) {
+ if (address1 instanceof InternetAddress) {
+ InternetAddress address = (InternetAddress) address1;
context.log(prefix + address.getPersonal() + "@" + address.getAddress());
- } else if (addresses[i] instanceof NewsAddress) {
- NewsAddress address = (NewsAddress) addresses[i];
+ } else if (address1 instanceof NewsAddress) {
+ NewsAddress address = (NewsAddress) address1;
context.log(prefix + address.getNewsgroup() + "@" + address.getHost());
}
}
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java Thu Feb 28 23:31:36 2013
@@ -50,11 +50,8 @@ public class RecipientRewriteTableTest {
@Override
public boolean isLocalServer(String serverName) {
- if (serverName.equals("localhost")) {
- return true;
- }
+ return serverName.equals("localhost");
- return false;
}
};
@@ -88,9 +85,9 @@ public class RecipientRewriteTableTest {
assertEquals(3, mail.getRecipients().size());
Iterator<MailAddress> it = mail.getRecipients().iterator();
- assertEquals("whatever@localhost", ((MailAddress) it.next()).toString());
- assertEquals("blah@localhost", ((MailAddress) it.next()).toString());
- assertEquals("apache@localhost", ((MailAddress) it.next()).toString());
+ assertEquals("whatever@localhost", it.next().toString());
+ assertEquals("blah@localhost", it.next().toString());
+ assertEquals("apache@localhost", it.next().toString());
}
@@ -101,8 +98,8 @@ public class RecipientRewriteTableTest {
private Mail createMail(String[] recipients) throws MessagingException {
Mail mail = new FakeMail();
ArrayList<MailAddress> a = new ArrayList<MailAddress>(recipients.length);
- for (int i = 0; i < recipients.length; i++) {
- a.add(new MailAddress(recipients[i]));
+ for (String recipient : recipients) {
+ a.add(new MailAddress(recipient));
}
mail.setRecipients(a);
mail.setMessage(new FakeMimeMessage());
@@ -135,7 +132,7 @@ public class RecipientRewriteTableTest {
}
assertEquals(mail.getRecipients().size(), 1);
- MailAddress localRec = (MailAddress) mail.getRecipients().iterator().next();
+ MailAddress localRec = mail.getRecipients().iterator().next();
assertEquals(localRec.toInternetAddress().toString(), "a@localhost");
}
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java Thu Feb 28 23:31:36 2013
@@ -58,7 +58,7 @@ public class InSpammerBlacklistTest {
private void setupMockedMail(String remoteAddr) throws ParseException {
mockedMail = new FakeMail();
mockedMail.setRemoteAddr(remoteAddr);
- mockedMail.setRecipients(Arrays.asList(new MailAddress[]{new MailAddress("test@email")}));
+ mockedMail.setRecipients(Arrays.asList(new MailAddress("test@email")));
}
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java Thu Feb 28 23:31:36 2013
@@ -26,8 +26,6 @@ import org.junit.Test;
public class RemoteAddrInNetworkTest extends AbstractRemoteAddrInNetworkTest {
- private final String ALLOWED_NETWORK = "192.168.200.0/24";
-
// test if the recipients get returned as matched
@Test
public void testRemoteAddrInNetworkMatched() throws MessagingException {
@@ -65,6 +63,7 @@ public class RemoteAddrInNetworkTest ext
@Override
protected String getAllowedNetworks() {
+ String ALLOWED_NETWORK = "192.168.200.0/24";
return ALLOWED_NETWORK;
}
}
Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java (original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java Thu Feb 28 23:31:36 2013
@@ -26,8 +26,6 @@ import org.junit.Test;
public class RemoteAddrNotInNetworkTest extends AbstractRemoteAddrInNetworkTest {
- private final String ALLOWED_NETWORK = "192.168.200.0/24";
-
// test if the recipients get returned as matched
@Test
public void testRemoteAddrNotInNetworkMatched() throws MessagingException {
@@ -65,6 +63,7 @@ public class RemoteAddrNotInNetworkTest
@Override
protected String getAllowedNetworks() {
+ String ALLOWED_NETWORK = "192.168.200.0/24";
return ALLOWED_NETWORK;
}
}
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Feb 28 23:31:36 2013
@@ -28,7 +28,6 @@
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
<version>1.8.2</version>
- <relativePath/>
</parent>
<artifactId>james-server</artifactId>
@@ -717,12 +716,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
@@ -815,7 +808,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jmock</groupId>
+ <groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>${jmock.version}</version>
<scope>test</scope>
@@ -1199,11 +1192,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -1246,9 +1234,6 @@
<goal>generate-depends-file</goal>
</goals>
</pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
Modified: james/server/trunk/protocols/protocols-imap4/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/pom.xml (original)
+++ james/server/trunk/protocols/protocols-imap4/pom.xml Thu Feb 28 23:31:36 2013
@@ -63,11 +63,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java Thu Feb 28 23:31:36 2013
@@ -25,9 +25,9 @@ import org.jboss.netty.buffer.ChannelBuf
import org.jboss.netty.channel.Channel;
public abstract class AbstractNettyImapRequestLineReader extends ImapRequestLineReader {
- private Channel channel;
- private ChannelBuffer cRequest = ChannelBuffers.wrappedBuffer("+\r\n".getBytes());
- private boolean retry;
+ private final Channel channel;
+ private final ChannelBuffer cRequest = ChannelBuffers.wrappedBuffer("+\r\n".getBytes());
+ private final boolean retry;
public AbstractNettyImapRequestLineReader(Channel channel, boolean retry) {
this.channel = channel;
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java Thu Feb 28 23:31:36 2013
@@ -56,19 +56,19 @@ public class ImapChannelUpstreamHandler
private final String hello;
- private String[] enabledCipherSuites;
+ private final String[] enabledCipherSuites;
- private SSLContext context;
+ private final SSLContext context;
- private boolean compress;
+ private final boolean compress;
- private ImapProcessor processor;
+ private final ImapProcessor processor;
- private ImapEncoder encoder;
+ private final ImapEncoder encoder;
private final ImapHeartbeatHandler heartbeatHandler = new ImapHeartbeatHandler();
- private boolean plainAuthDisallowed;
+ private final boolean plainAuthDisallowed;
public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Logger logger, boolean compress, boolean plainAuthDisallowed) {
this(hello, processor, encoder, logger, compress, plainAuthDisallowed, null, null);
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java Thu Feb 28 23:31:36 2013
@@ -97,7 +97,7 @@ public class ImapRequestFrameDecoder ext
final File f;
int written;
- OutputStream out = null;
+ OutputStream out;
// check if we have created a temporary file already or if
// we need to create a new one
if (attachment.containsKey(STORED_DATA)) {
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java Thu Feb 28 23:31:36 2013
@@ -38,7 +38,7 @@ import org.jboss.netty.channel.Channel;
*/
public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineReader {
- private ChannelBuffer buffer;
+ private final ChannelBuffer buffer;
private int read = 0;
private final int maxLiteralSize;
@@ -59,7 +59,7 @@ public class NettyImapRequestLineReader
*/
public char nextChar() throws DecodingException {
if (!nextSeen) {
- int next = -1;
+ int next;
if (buffer.readable()) {
next = buffer.readByte();
@@ -117,7 +117,7 @@ public class NettyImapRequestLineReader
public final class NotEnoughDataException extends RuntimeException {
public final static int UNKNOWN_SIZE = -1;
- private int size;
+ private final int size;
public NotEnoughDataException(int size) {
this.size = size;
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java Thu Feb 28 23:31:36 2013
@@ -41,14 +41,14 @@ public class NettyImapSession implements
private ImapSessionState state = ImapSessionState.NON_AUTHENTICATED;
private SelectedMailbox selectedMailbox;
- private Map<String, Object> attributesByKey = new HashMap<String, Object>();
- private SSLContext sslContext;
- private String[] enabledCipherSuites;
- private boolean compress;
- private ProtocolSessionLogger log;
- private Channel channel;
+ private final Map<String, Object> attributesByKey = new HashMap<String, Object>();
+ private final SSLContext sslContext;
+ private final String[] enabledCipherSuites;
+ private final boolean compress;
+ private final ProtocolSessionLogger log;
+ private final Channel channel;
private int handlerCount;
- private boolean plainAuthDisallowed;
+ private final boolean plainAuthDisallowed;
public NettyImapSession(Channel channel, Logger log, SSLContext sslContext, String[] enabledCipherSuites, boolean compress, boolean plainAuthDisallowed) {
this.channel = channel;
@@ -148,7 +148,7 @@ public class NettyImapSession implements
* @see org.apache.james.imap.api.process.ImapSession#startTLS()
*/
public boolean startTLS() {
- if (supportStartTLS() == false)
+ if (!supportStartTLS())
return false;
channel.setReadable(false);
@@ -183,7 +183,7 @@ public class NettyImapSession implements
* @see org.apache.james.imap.api.process.ImapSession#startCompression()
*/
public boolean startCompression() {
- if (isCompressionSupported() == false)
+ if (!isCompressionSupported())
return false;
channel.setReadable(false);
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java Thu Feb 28 23:31:36 2013
@@ -29,7 +29,7 @@ import org.jboss.netty.channel.Channel;
public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLineReader {
- private InputStream in;
+ private final InputStream in;
public NettyStreamImapRequestLineReader(Channel channel, InputStream in, boolean retry) {
super(channel, retry);
@@ -50,7 +50,7 @@ public class NettyStreamImapRequestLineR
public char nextChar() throws DecodingException {
if (!nextSeen) {
- int next = -1;
+ int next;
try {
next = in.read();
} catch (IOException e) {
Modified: james/server/trunk/protocols/protocols-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols/protocols-library/pom.xml Thu Feb 28 23:31:36 2013
@@ -67,11 +67,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java Thu Feb 28 23:31:36 2013
@@ -36,7 +36,7 @@ public class POP3BeforeSMTPHelper {
/**
* The map in which the ipAddresses and timestamp stored
*/
- public static Map<String, Long> ipMap = Collections.synchronizedMap(new HashMap<String, Long>());
+ public static final Map<String, Long> ipMap = Collections.synchronizedMap(new HashMap<String, Long>());
/**
* Default expire time in ms (1 hour)
@@ -85,7 +85,7 @@ public class POP3BeforeSMTPHelper {
long currTime = System.currentTimeMillis();
while (storedIP.hasNext()) {
- String key = storedIP.next().toString();
+ String key = storedIP.next();
long storedTime = ipMap.get(key);
// remove the ip from the map when it is expired
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java Thu Feb 28 23:31:36 2013
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.james.protocols.lib;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.commons.configuration.CombinedConfiguration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.ConfigurationUtils;
@@ -34,15 +30,18 @@ import org.apache.james.protocols.lib.ha
import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
import org.apache.james.protocols.lib.lifecycle.InitializingLifecycleAwareProtocolHandler;
+import java.util.LinkedList;
+import java.util.List;
+
public class ProtocolHandlerChainImpl implements ProtocolHandlerChain {
- private ProtocolHandlerLoader loader;
- private HierarchicalConfiguration handlerchainConfig;
- private String jmxName;
- private String coreHandlersPackage;
- private String jmxHandlersPackage;
- private List<Object> handlers = new LinkedList<Object>();
-
+ private final ProtocolHandlerLoader loader;
+ private final HierarchicalConfiguration handlerchainConfig;
+ private final String jmxName;
+ private final String coreHandlersPackage;
+ private final String jmxHandlersPackage;
+ private final List<Object> handlers = new LinkedList<Object>();
+
public ProtocolHandlerChainImpl(ProtocolHandlerLoader loader, HierarchicalConfiguration handlerchainConfig, String jmxName, Class<? extends HandlersPackage> coreHandlersPackage, Class<? extends HandlersPackage> jmxHandlersPackage) {
this.loader = loader;
this.handlerchainConfig = handlerchainConfig;
@@ -50,7 +49,7 @@ public class ProtocolHandlerChainImpl im
this.coreHandlersPackage = coreHandlersPackage.getName();
this.jmxHandlersPackage = jmxHandlersPackage.getName();
}
-
+
@SuppressWarnings("unchecked")
public void init() throws Exception {
List<org.apache.commons.configuration.HierarchicalConfiguration> children = handlerchainConfig.configurationsAt("handler");
@@ -61,12 +60,12 @@ public class ProtocolHandlerChainImpl im
handlerchainConfig.addProperty("[@coreHandlersPackage]", coreHandlersPackage);
String coreHandlersPackage = handlerchainConfig.getString("[@coreHandlersPackage]");
-
+
if (handlerchainConfig.getString("[@jmxHandlersPackage]") == null)
handlerchainConfig.addProperty("[@jmxHandlersPackage]", jmxHandlersPackage);
String jmxHandlersPackage = handlerchainConfig.getString("[@jmxHandlersPackage]");
-
+
HandlersPackage handlersPackage = (HandlersPackage) loader.load(coreHandlersPackage, addHandler(coreHandlersPackage));
registerHandlersPackage(handlersPackage, null, children);
@@ -74,12 +73,11 @@ public class ProtocolHandlerChainImpl im
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
builder.addProperty("jmxName", jmxName);
HandlersPackage jmxPackage = (HandlersPackage) loader.load(jmxHandlersPackage, addHandler(jmxHandlersPackage));
-
+
registerHandlersPackage(jmxPackage, builder, children);
}
- for (int i = 0; i < children.size(); i++) {
- HierarchicalConfiguration hConf = children.get(i);
+ for (HierarchicalConfiguration hConf : children) {
String className = hConf.getString("[@class]", null);
if (className != null) {
handlers.add(loader.load(className, hConf));
@@ -90,29 +88,25 @@ public class ProtocolHandlerChainImpl im
wireExtensibleHandlers();
}
-
+
private void wireExtensibleHandlers() throws WiringException {
LinkedList<ExtensibleHandler> eHandlers = getHandlers(ExtensibleHandler.class);
- for (int a = 0; a < eHandlers.size(); a++) {
- final ExtensibleHandler extensibleHandler = eHandlers.get(a);
+ for (final ExtensibleHandler extensibleHandler : eHandlers) {
final List<Class<?>> markerInterfaces = extensibleHandler.getMarkerInterfaces();
- for (int i = 0; i < markerInterfaces.size(); i++) {
- final Class<?> markerInterface = markerInterfaces.get(i);
- final List<?> extensions = getHandlers(markerInterface);
+ for (final Class<?> markerInterface : markerInterfaces) {
+ final List<?> extensions = getHandlers(markerInterface);
// ok now time for try the wiring
extensibleHandler.wireExtensions(markerInterface, extensions);
}
}
}
-
-
- private void registerHandlersPackage(HandlersPackage handlersPackage, HierarchicalConfiguration handlerConfig, List<HierarchicalConfiguration> children) throws ConfigurationException{
- List<String> c = handlersPackage.getHandlers();
- for (Iterator<String> i = c.iterator(); i.hasNext();) {
- String cName = i.next();
+ private void registerHandlersPackage(HandlersPackage handlersPackage, HierarchicalConfiguration handlerConfig, List<HierarchicalConfiguration> children) throws ConfigurationException {
+ List<String> c = handlersPackage.getHandlers();
+
+ for (String cName : c) {
try {
CombinedConfiguration conf = new CombinedConfiguration();
HierarchicalConfiguration cmdConf = addHandler(cName);
@@ -126,14 +120,12 @@ public class ProtocolHandlerChainImpl im
}
}
}
+
/**
* Return a DefaultConfiguration build on the given command name and
* classname.
- *
- * @param cmdName
- * The command name
- * @param className
- * The class name
+ *
+ * @param className The class name
* @return DefaultConfiguration
* @throws ConfigurationException
*/
@@ -147,9 +139,8 @@ public class ProtocolHandlerChainImpl im
@Override
public <T> LinkedList<T> getHandlers(Class<T> type) {
LinkedList<T> hList = new LinkedList<T>();
-
- for (int i = 0; i < handlers.size(); i++) {
- Object h = handlers.get(i);
+
+ for (Object h : handlers) {
if (type.isInstance(h)) {
hList.add((T) h);
@@ -161,9 +152,10 @@ public class ProtocolHandlerChainImpl im
/**
* Destroy all loaded {@link InitializingLifecycleAwareProtocolHandler}
*/
+ @Override
public void destroy() {
LinkedList<InitializingLifecycleAwareProtocolHandler> lHandlers = getHandlers(InitializingLifecycleAwareProtocolHandler.class);
- for (InitializingLifecycleAwareProtocolHandler handler: lHandlers) {
+ for (InitializingLifecycleAwareProtocolHandler handler : lHandlers) {
handler.destroy();
}
}
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java Thu Feb 28 23:31:36 2013
@@ -40,7 +40,7 @@ import org.apache.james.protocols.lib.li
*/
public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolSession> implements ProtocolHandlerResultHandler<Response, S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
- private Map<String, AbstractCommandHandlerStats> cStats = new HashMap<String, AbstractCommandHandlerStats>();
+ private final Map<String, AbstractCommandHandlerStats> cStats = new HashMap<String, AbstractCommandHandlerStats>();
private String jmxName;
/**
@@ -79,9 +79,9 @@ public abstract class AbstractCommandHan
public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (interfaceName.equals(CommandHandler.class)) {
// add stats for all hooks
- for (int i = 0; i < extension.size(); i++) {
- CommandHandler c = (CommandHandler) extension.get(i);
- if (equals(c) == false) {
+ for (Object anExtension : extension) {
+ CommandHandler c = (CommandHandler) anExtension;
+ if (!equals(c)) {
String cName = c.getClass().getName();
try {
cStats.put(cName, createCommandHandlerStats(c));
@@ -117,9 +117,8 @@ public abstract class AbstractCommandHan
@Override
public void destroy() {
- Iterator<AbstractCommandHandlerStats> it = cStats.values().iterator();
- while(it.hasNext()) {
- it.next().dispose();
+ for (AbstractCommandHandlerStats abstractCommandHandlerStats : cStats.values()) {
+ abstractCommandHandlerStats.dispose();
}
}
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java Thu Feb 28 23:31:36 2013
@@ -38,8 +38,8 @@ import org.apache.james.protocols.api.ha
*/
public abstract class AbstractCommandHandlerStats extends StandardMBean implements CommandHandlerStatsMBean, Disposable {
- private AtomicLong all = new AtomicLong(0);
- private AtomicLong disconnect = new AtomicLong();
+ private final AtomicLong all = new AtomicLong(0);
+ private final AtomicLong disconnect = new AtomicLong();
private String name;
private String handlerName;
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java Thu Feb 28 23:31:36 2013
@@ -42,7 +42,7 @@ import org.apache.james.protocols.lib.li
*/
public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R,S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
- private Map<String, ConnectHandlerStats> cStats = new HashMap<String, ConnectHandlerStats>();
+ private final Map<String, ConnectHandlerStats> cStats = new HashMap<String, ConnectHandlerStats>();
private String jmxName;
@Override
@@ -52,9 +52,8 @@ public abstract class AbstractConnectHan
@Override
public void destroy() {
- Iterator<ConnectHandlerStats> it =cStats.values().iterator();
- while(it.hasNext()) {
- it.next().dispose();
+ for (ConnectHandlerStats connectHandlerStats : cStats.values()) {
+ connectHandlerStats.dispose();
}
}
@@ -92,9 +91,9 @@ public abstract class AbstractConnectHan
public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (interfaceName.equals(ConnectHandler.class)) {
// add stats for all hooks
- for (int i = 0; i < extension.size(); i++) {
- ConnectHandler c = (ConnectHandler) extension.get(i);
- if (equals(c) == false) {
+ for (Object anExtension : extension) {
+ ConnectHandler c = (ConnectHandler) anExtension;
+ if (!equals(c)) {
String cName = c.getClass().getName();
try {
cStats.put(cName, new ConnectHandlerStats(jmxName, cName));
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java Thu Feb 28 23:31:36 2013
@@ -42,7 +42,7 @@ import org.apache.james.protocols.lib.li
*/
public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R, S>, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
- private Map<String, LineHandlerStats> lStats = new HashMap<String, LineHandlerStats>();
+ private final Map<String, LineHandlerStats> lStats = new HashMap<String, LineHandlerStats>();
private String jmxName;
/**
@@ -77,9 +77,9 @@ public abstract class AbstractLineHandle
if (interfaceName.equals(LineHandler.class)) {
// add stats for all hooks
- for (int i = 0; i < extension.size(); i++) {
- LineHandler c = (LineHandler) extension.get(i);
- if (equals(c) == false) {
+ for (Object anExtension : extension) {
+ LineHandler c = (LineHandler) anExtension;
+ if (!equals(c)) {
String cName = c.getClass().getName();
try {
lStats.put(cName, new LineHandlerStats(jmxName, cName));
@@ -98,9 +98,8 @@ public abstract class AbstractLineHandle
@Override
public void destroy() {
- Iterator<LineHandlerStats> it = lStats.values().iterator();
- while(it.hasNext()) {
- it.next().dispose();
+ for (LineHandlerStats lineHandlerStats : lStats.values()) {
+ lineHandlerStats.dispose();
}
}
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java Thu Feb 28 23:31:36 2013
@@ -37,8 +37,8 @@ public class ConnectHandlerStats extends
private String name;
private String handlerName;
private MBeanServer mbeanserver;
- private AtomicLong all = new AtomicLong(0);
- private AtomicLong disconnect = new AtomicLong(0);
+ private final AtomicLong all = new AtomicLong(0);
+ private final AtomicLong disconnect = new AtomicLong(0);
public ConnectHandlerStats(String jmxName, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
super(HandlerStatsMBean.class);
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java Thu Feb 28 23:31:36 2013
@@ -40,8 +40,8 @@ public class LineHandlerStats extends St
private String name;
private String handlerName;
private MBeanServer mbeanserver;
- private AtomicLong all = new AtomicLong(0);
- private AtomicLong disconnect = new AtomicLong(0);
+ private final AtomicLong all = new AtomicLong(0);
+ private final AtomicLong disconnect = new AtomicLong(0);
public LineHandlerStats(String jmxName, String handlerName) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
super(HandlerStatsMBean.class);
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java Thu Feb 28 23:31:36 2013
@@ -108,7 +108,7 @@ public abstract class AbstractConfigurab
private String[] enabledCipherSuites;
- private ConnectionCountHandler countHandler = new ConnectionCountHandler();
+ private final ConnectionCountHandler countHandler = new ConnectionCountHandler();
private ExecutionHandler executionHandler = null;
@@ -168,13 +168,13 @@ public abstract class AbstractConfigurab
String listen[] = config.getString("bind", "0.0.0.0:" + getDefaultPort()).split(",");
List<InetSocketAddress> bindAddresses = new ArrayList<InetSocketAddress>();
- for (int i = 0; i < listen.length; i++) {
- String bind[] = listen[i].split(":");
+ for (String aListen : listen) {
+ String bind[] = aListen.split(":");
InetSocketAddress address;
String ip = bind[0].trim();
int port = Integer.parseInt(bind[1].trim());
- if (ip.equals("0.0.0.0") == false) {
+ if (!ip.equals("0.0.0.0")) {
try {
ip = InetAddress.getByName(ip).getHostName();
} catch (final UnknownHostException unhe) {
@@ -183,12 +183,12 @@ public abstract class AbstractConfigurab
}
address = new InetSocketAddress(ip, port);
- StringBuilder infoBuffer = new StringBuilder(64).append(getServiceType()).append(" bound to: ").append(ip).append(":").append(port);
- logger.info(infoBuffer.toString());
+ String infoBuffer = getServiceType() + " bound to: " + ip + ":" + port;
+ logger.info(infoBuffer);
bindAddresses.add(address);
}
- setListenAddresses(bindAddresses.toArray(new InetSocketAddress[0]));
+ setListenAddresses(bindAddresses.toArray(new InetSocketAddress[bindAddresses.size()]));
jmxName = config.getString("jmxName", getDefaultJMXName());
int ioWorker = config.getInt("ioWorkerCount", DEFAULT_IO_WORKER_COUNT);
@@ -228,7 +228,7 @@ public abstract class AbstractConfigurab
String connectionLimitPerIP = config.getString("connectionLimitPerIP", null);
if (connectionLimitPerIP != null) {
try {
- connPerIP = new Integer(connectionLimitPerIP).intValue();
+ connPerIP = Integer.parseInt(connectionLimitPerIP);
} catch (NumberFormatException nfe) {
logger.error("Connection limit per IP value is not properly formatted.", nfe);
}
@@ -236,7 +236,7 @@ public abstract class AbstractConfigurab
logger.error("Connection limit per IP value cannot be less than zero.");
throw new ConfigurationException("Connection limit value cannot be less than zero.");
} else if (connPerIP > 0) {
- infoBuffer = new StringBuilder(128).append(getServiceType()).append(" will allow a maximum of ").append(connPerIP).append(" per IP connections for " + getServiceType());
+ infoBuffer = new StringBuilder(128).append(getServiceType()).append(" will allow a maximum of ").append(connPerIP).append(" per IP connections for ").append(getServiceType());
logger.info(infoBuffer.toString());
}
}
@@ -336,7 +336,7 @@ public abstract class AbstractConfigurab
*/
protected void configureHelloName(Configuration handlerConfiguration) throws ConfigurationException {
StringBuilder infoBuffer;
- String hostName = null;
+ String hostName;
try {
hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException ue) {
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java Thu Feb 28 23:31:36 2013
@@ -30,8 +30,8 @@ import org.jboss.netty.channel.SimpleCha
*/
public class ConnectionCountHandler extends SimpleChannelUpstreamHandler {
- public AtomicInteger currentConnectionCount = new AtomicInteger();
- public AtomicLong connectionsTillStartup = new AtomicLong();
+ public final AtomicInteger currentConnectionCount = new AtomicInteger();
+ public final AtomicLong connectionsTillStartup = new AtomicLong();
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java Thu Feb 28 23:31:36 2013
@@ -35,7 +35,7 @@ import org.jboss.netty.handler.execution
*/
public class JMXEnabledOrderedMemoryAwareThreadPoolExecutor extends OrderedMemoryAwareThreadPoolExecutor implements JMXEnabledOrderedMemoryAwareThreadPoolExecutorMBean{
- private String jmxPath;
+ private final String jmxPath;
private final List<Runnable> inProgress = Collections.synchronizedList(new ArrayList<Runnable>());
private final ThreadLocal<Long> startTime = new ThreadLocal<Long>();
private long totalTime;
@@ -58,7 +58,7 @@ public class JMXEnabledOrderedMemoryAwar
@Override
protected void afterExecute(Runnable r, Throwable t) {
- long time = System.currentTimeMillis() - startTime.get().longValue();
+ long time = System.currentTimeMillis() - startTime.get();
synchronized (this) {
totalTime += time;
++totalTasks;
Modified: james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java (original)
+++ james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/PortUtil.java Thu Feb 28 23:31:36 2013
@@ -78,7 +78,6 @@ public class PortUtil {
break;
} catch (IOException e) {
e.printStackTrace();
- continue; // try next port
}
}
PORT_LAST_USED = nextPortCandidate;
Modified: james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java (original)
+++ james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java Thu Feb 28 23:31:36 2013
@@ -44,7 +44,7 @@ public class MockProtocolHandlerLoader i
servicesByName.put(role, service);
}
- private List<Object> loaderRegistry = new ArrayList<Object>();
+ private final List<Object> loaderRegistry = new ArrayList<Object>();
protected ProtocolHandler create(String className) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
return (ProtocolHandler) Thread.currentThread().getContextClassLoader().loadClass(className).newInstance();
@@ -55,9 +55,9 @@ public class MockProtocolHandlerLoader i
* is annotated with @PreDestroy
*/
public synchronized void dispose() {
- for (int i = 0; i < loaderRegistry.size(); i++) {
+ for (Object aLoaderRegistry : loaderRegistry) {
try {
- preDestroy(loaderRegistry.get(i));
+ preDestroy(aLoaderRegistry);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
Modified: james/server/trunk/protocols/protocols-lmtp/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-lmtp/pom.xml Thu Feb 28 23:31:36 2013
@@ -102,11 +102,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
Modified: james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java Thu Feb 28 23:31:36 2013
@@ -48,54 +48,50 @@ import org.apache.james.smtpserver.fastf
*/
public class CoreCmdHandlerLoader implements HandlersPackage {
- private final String COMMANDDISPATCHER = CommandDispatcher.class.getName();
- private final String DATACMDHANDLER = JamesDataCmdHandler.class.getName();
- private final String EXPNCMDHANDLER = ExpnCmdHandler.class.getName();
- private final String LHLOCMDHANDLER = LhloCmdHandler.class.getName();
- private final String MAILCMDHANDLER = JamesMailCmdHandler.class.getName();
- private final String NOOPCMDHANDLER = NoopCmdHandler.class.getName();
- private final String QUITCMDHANDLER = QuitCmdHandler.class.getName();
- private final String RCPTCMDHANDLER = JamesRcptCmdHandler.class.getName();
- private final String VALIDRCPTHANDLER = ValidRcptHandler.class.getName();
-
- private final String RSETCMDHANDLER = RsetCmdHandler.class.getName();
- private final String VRFYCMDHANDLER = VrfyCmdHandler.class.getName();
- private final String MAILSIZEHOOK = MailSizeEsmtpExtension.class.getName();
- private final String WELCOMEMESSAGEHANDLER = WelcomeMessageHandler.class.getName();
- private final String POSTMASTERABUSEHOOK = PostmasterAbuseRcptHook.class.getName();
- private final String AUTHREQUIREDTORELAY = AuthRequiredToRelayRcptHook.class.getName();
- private final String RECEIVEDDATALINEFILTER = ReceivedDataLineFilter.class.getName();
- private final String DATALINEMESSAGEHOOKHANDLER = DataLineLMTPHandler.class.getName();
- private final String DELIVERTORECIPIENTHANDLER = MailboxDeliverToRecipientHandler.class.getName();
-
- // logging stuff
- private final String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
- private final String HOOKRESULTLOGGER = HookResultLogger.class.getName();
-
private final List<String> commands = new LinkedList<String>();
public CoreCmdHandlerLoader() {
// Insert the base commands in the Map
+ String WELCOMEMESSAGEHANDLER = WelcomeMessageHandler.class.getName();
commands.add(WELCOMEMESSAGEHANDLER);
+ String COMMANDDISPATCHER = CommandDispatcher.class.getName();
commands.add(COMMANDDISPATCHER);
+ String DATACMDHANDLER = JamesDataCmdHandler.class.getName();
commands.add(DATACMDHANDLER);
+ String EXPNCMDHANDLER = ExpnCmdHandler.class.getName();
commands.add(EXPNCMDHANDLER);
+ String LHLOCMDHANDLER = LhloCmdHandler.class.getName();
commands.add(LHLOCMDHANDLER);
+ String MAILCMDHANDLER = JamesMailCmdHandler.class.getName();
commands.add(MAILCMDHANDLER);
+ String NOOPCMDHANDLER = NoopCmdHandler.class.getName();
commands.add(NOOPCMDHANDLER);
+ String QUITCMDHANDLER = QuitCmdHandler.class.getName();
commands.add(QUITCMDHANDLER);
+ String RCPTCMDHANDLER = JamesRcptCmdHandler.class.getName();
commands.add(RCPTCMDHANDLER);
+ String VALIDRCPTHANDLER = ValidRcptHandler.class.getName();
commands.add(VALIDRCPTHANDLER);
+ String RSETCMDHANDLER = RsetCmdHandler.class.getName();
commands.add(RSETCMDHANDLER);
+ String VRFYCMDHANDLER = VrfyCmdHandler.class.getName();
commands.add(VRFYCMDHANDLER);
+ String MAILSIZEHOOK = MailSizeEsmtpExtension.class.getName();
commands.add(MAILSIZEHOOK);
+ String AUTHREQUIREDTORELAY = AuthRequiredToRelayRcptHook.class.getName();
commands.add(AUTHREQUIREDTORELAY);
+ String POSTMASTERABUSEHOOK = PostmasterAbuseRcptHook.class.getName();
commands.add(POSTMASTERABUSEHOOK);
+ String RECEIVEDDATALINEFILTER = ReceivedDataLineFilter.class.getName();
commands.add(RECEIVEDDATALINEFILTER);
+ String DATALINEMESSAGEHOOKHANDLER = DataLineLMTPHandler.class.getName();
commands.add(DATALINEMESSAGEHOOKHANDLER);
+ String DELIVERTORECIPIENTHANDLER = MailboxDeliverToRecipientHandler.class.getName();
commands.add(DELIVERTORECIPIENTHANDLER);
// Add logging stuff
+ String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
commands.add(COMMANDHANDLERRESULTLOGGER);
+ String HOOKRESULTLOGGER = HookResultLogger.class.getName();
commands.add(HOOKRESULTLOGGER);
}
Modified: james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java (original)
+++ james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java Thu Feb 28 23:31:36 2013
@@ -50,12 +50,12 @@ public class MailboxDeliverToRecipientHa
private UsersRepository users;
private MailboxManager mailboxManager;
- @Inject
+ @Inject
public final void setUsersRepository(UsersRepository users) {
this.users = users;
}
- @Inject
+ @Inject
public final void setMailboxManager(MailboxManager mailboxManager) {
this.mailboxManager = mailboxManager;
}
@@ -63,7 +63,7 @@ public class MailboxDeliverToRecipientHa
@Override
public HookResult deliver(SMTPSession session, MailAddress recipient, MailEnvelope envelope) {
String username;
- HookResult result = null;
+ HookResult result;
try {
@@ -79,7 +79,7 @@ public class MailboxDeliverToRecipientHa
mailboxManager.startProcessingRequest(mailboxSession);
// create inbox if not exist
- if (mailboxManager.mailboxExists(inbox, mailboxSession) == false) {
+ if (!mailboxManager.mailboxExists(inbox, mailboxSession)) {
mailboxManager.createMailbox(inbox, mailboxSession);
}
mailboxManager.getMailbox(MailboxPath.inbox(mailboxSession), mailboxSession).appendMessage(envelope.getMessageInputStream(), new Date(), mailboxSession, true, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org