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 [8/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/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java (original)
+++ james/server/trunk/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java Thu Feb 28 23:31:36 2013
@@ -38,7 +38,7 @@ public class LMTPServer extends Abstract
* 0, means no limit.
*/
private long maxMessageSize = 0;
- private LMTPConfigurationImpl lmtpConfig = new LMTPConfigurationImpl();
+ private final LMTPConfigurationImpl lmtpConfig = new LMTPConfigurationImpl();
private String lmtpGreeting;
@@ -98,7 +98,6 @@ public class LMTPServer extends Abstract
}
/**
- * @see org.apache.james.protocols.smtp.SMTPConfiguration#getSMTPGreeting()
*/
public String getSMTPGreeting() {
return LMTPServer.this.lmtpGreeting;
Modified: james/server/trunk/protocols/protocols-pop3/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/pom.xml (original)
+++ james/server/trunk/protocols/protocols-pop3/pom.xml Thu Feb 28 23:31:36 2013
@@ -60,11 +60,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-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Thu Feb 28 23:31:36 2013
@@ -91,7 +91,6 @@ public class CoreCmdHandlerLoader implem
}
/**
- * @see org.apache.james.protocols.api.handler.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return commands;
Modified: james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java Thu Feb 28 23:31:36 2013
@@ -34,7 +34,6 @@ public class JMXHandlersLoader implement
}
/**
- * @see org.apache.james.protocols.api.handler.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return handlers;
Modified: james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java Thu Feb 28 23:31:36 2013
@@ -31,8 +31,8 @@ import org.apache.james.protocols.pop3.P
public class POP3CommandHandlerStats extends AbstractCommandHandlerStats implements POP3CommandHandlerStatsMBean {
- private AtomicLong error = new AtomicLong(0);
- private AtomicLong ok = new AtomicLong(0);
+ private final AtomicLong error = new AtomicLong(0);
+ private final AtomicLong ok = new AtomicLong(0);
public POP3CommandHandlerStats(String jmxPath, String handlerName, String[] commands) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
super(POP3CommandHandlerStatsMBean.class, jmxPath, handlerName, commands);
Modified: james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java Thu Feb 28 23:31:36 2013
@@ -84,7 +84,7 @@ public class MailboxAdapter implements M
private final MessageManager manager;
private final MailboxSession session;
- private MailboxManager mailboxManager;
+ private final MailboxManager mailboxManager;
public MailboxAdapter(MailboxManager mailboxManager, MessageManager manager, MailboxSession session) {
this.manager = manager;
@@ -167,8 +167,8 @@ public class MailboxAdapter implements M
public void remove(String... uids) throws IOException {
List<Long> uidList = new ArrayList<Long>();
- for (int i = 0; i < uids.length; i++) {
- uidList.add(new Long(uids[i]));
+ for (String uid : uids) {
+ uidList.add(new Long(uid));
}
List<MessageRange> ranges = MessageRange.toRanges(uidList);
Modified: james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3Server.java Thu Feb 28 23:31:36 2013
@@ -36,7 +36,7 @@ public class POP3Server extends Abstract
/**
* The configuration data to be passed to the handler
*/
- private ProtocolConfiguration theConfigData = new POP3Configuration();
+ private final ProtocolConfiguration theConfigData = new POP3Configuration();
private BasicChannelUpstreamHandler coreHandler;
@Override
@@ -57,7 +57,6 @@ public class POP3Server extends Abstract
private class POP3Configuration implements ProtocolConfiguration {
/**
- * @see org.apache.james.pop3server.POP3HandlerConfiguration#getHelloName()
*/
public String getHelloName() {
return POP3Server.this.getHelloName();
Modified: james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java Thu Feb 28 23:31:36 2013
@@ -57,20 +57,21 @@ import org.apache.james.user.api.UsersRe
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class POP3ServerTest {
- private int pop3Port = PortUtil.getNonPrivilegedPort();
+ private final int pop3Port = PortUtil.getNonPrivilegedPort();
private POP3TestConfiguration pop3Configuration;
- private MockUsersRepository usersRepository = new MockUsersRepository();
+ private final MockUsersRepository usersRepository = new MockUsersRepository();
private POP3Client pop3Client = null;
protected MockFileSystem fileSystem;
protected MockProtocolHandlerLoader protocolHandlerChain;
private StoreMailboxManager<Long> mailboxManager;
- private byte[] content = ("Return-path: return@test.com\r\n"
+ private final byte[] content = ("Return-path: return@test.com\r\n"
+ "Content-Transfer-Encoding: plain\r\n"
+ "Subject: test\r\n\r\n"
+ "Body Text POP3ServerTest.setupTestMails\r\n").getBytes();
@@ -206,7 +207,7 @@ public class POP3ServerTest {
pop3Client.disconnect();
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo", "INBOX");
MailboxSession session = mailboxManager.login("foo", "bar", LoggerFactory.getLogger("Test"));
- if (mailboxManager.mailboxExists(mailboxPath, session) == false) {
+ if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
}
setupTestMails(session, mailboxManager.getMailbox(mailboxPath, session));
@@ -290,7 +291,7 @@ public class POP3ServerTest {
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
MailboxSession session = mailboxManager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
- if (mailboxManager.mailboxExists(mailboxPath, session) == false) {
+ if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
}
@@ -378,7 +379,7 @@ public class POP3ServerTest {
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
MailboxSession session = mailboxManager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
- if (mailboxManager.mailboxExists(mailboxPath, session) == false) {
+ if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
}
@@ -415,6 +416,7 @@ public class POP3ServerTest {
* mailbox was not handled the right way
*/
@Test
+ @Ignore
public void testStatUidlListTwoConnections() throws Exception {
finishSetUp(pop3Configuration);
@@ -426,7 +428,7 @@ public class POP3ServerTest {
MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX");
MailboxSession session = mailboxManager.login("foo2", "bar2", LoggerFactory.getLogger("Test"));
- if (mailboxManager.mailboxExists(mailboxPath, session) == false) {
+ if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
}
@@ -632,7 +634,7 @@ public class POP3ServerTest {
MailboxPath mailboxPath = MailboxPath.inbox(session);
mailboxManager.startProcessingRequest(session);
- if (mailboxManager.mailboxExists(mailboxPath, session) == false) {
+ if (!mailboxManager.mailboxExists(mailboxPath, session)) {
mailboxManager.createMailbox(mailboxPath, session);
}
@@ -684,7 +686,7 @@ public class POP3ServerTest {
pop3Server.init();
}
- protected void setUpPOP3Server() throws Exception {
+ protected void setUpPOP3Server() {
pop3Server = createPOP3Server();
pop3Server.setFileSystem(fileSystem);
pop3Server.setProtocolHandlerLoader(protocolHandlerChain);
Modified: james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java Thu Feb 28 23:31:36 2013
@@ -25,7 +25,7 @@ import org.apache.james.pop3server.core.
@SuppressWarnings("serial")
public class POP3TestConfiguration extends DefaultConfigurationBuilder {
- private int pop3ListenerPort;
+ private final int pop3ListenerPort;
public POP3TestConfiguration(int pop3ListenerPort) {
this.pop3ListenerPort = pop3ListenerPort;
Modified: james/server/trunk/protocols/protocols-smtp/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/pom.xml (original)
+++ james/server/trunk/protocols/protocols-smtp/pom.xml Thu Feb 28 23:31:36 2013
@@ -97,11 +97,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-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Thu Feb 28 23:31:36 2013
@@ -45,74 +45,68 @@ import org.apache.james.protocols.smtp.c
*/
public class CoreCmdHandlerLoader implements HandlersPackage {
- private final String COMMANDDISPATCHER = CommandDispatcher.class.getName();
- private final String AUTHCMDHANDLER = AuthCmdHandler.class.getName();
- private final String DATACMDHANDLER = JamesDataCmdHandler.class.getName();
- private final String EHLOCMDHANDLER = EhloCmdHandler.class.getName();
- private final String EXPNCMDHANDLER = ExpnCmdHandler.class.getName();
- private final String HELOCMDHANDLER = HeloCmdHandler.class.getName();
- private final String HELPCMDHANDLER = HelpCmdHandler.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 RSETCMDHANDLER = RsetCmdHandler.class.getName();
- private final String VRFYCMDHANDLER = VrfyCmdHandler.class.getName();
- private final String MAILSIZEHOOK = MailSizeEsmtpExtension.class.getName();
- private final String WELCOMEMESSAGEHANDLER = JamesWelcomeMessageHandler.class.getName();
- private final String USERSREPOSITORYAUTHHANDLER = UsersRepositoryAuthHook.class.getName();
- private final String POSTMASTERABUSEHOOK = PostmasterAbuseRcptHook.class.getName();
- private final String AUTHREQUIREDTORELAY = AuthRequiredToRelayRcptHook.class.getName();
- private final String SENDERAUTHIDENTITYVERIFICATION = SenderAuthIdentifyVerificationRcptHook.class.getName();
- private final String RECEIVEDDATALINEFILTER = ReceivedDataLineFilter.class.getName();
- private final String DATALINEMESSAGEHOOKHANDLER = DataLineJamesMessageHookHandler.class.getName();
- private final String STARTTLSHANDLER = StartTlsCmdHandler.class.getName();
-
- // MessageHooks
- private final String ADDDEFAULTATTRIBUTESHANDLER = AddDefaultAttributesMessageHook.class.getName();
- private final String SENDMAILHANDLER = SendMailHandler.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 = JamesWelcomeMessageHandler.class.getName();
commands.add(WELCOMEMESSAGEHANDLER);
+ String COMMANDDISPATCHER = CommandDispatcher.class.getName();
commands.add(COMMANDDISPATCHER);
+ String AUTHCMDHANDLER = AuthCmdHandler.class.getName();
commands.add(AUTHCMDHANDLER);
+ String DATACMDHANDLER = JamesDataCmdHandler.class.getName();
commands.add(DATACMDHANDLER);
+ String EHLOCMDHANDLER = EhloCmdHandler.class.getName();
commands.add(EHLOCMDHANDLER);
+ String EXPNCMDHANDLER = ExpnCmdHandler.class.getName();
commands.add(EXPNCMDHANDLER);
+ String HELOCMDHANDLER = HeloCmdHandler.class.getName();
commands.add(HELOCMDHANDLER);
+ String HELPCMDHANDLER = HelpCmdHandler.class.getName();
commands.add(HELPCMDHANDLER);
+ 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 RSETCMDHANDLER = RsetCmdHandler.class.getName();
commands.add(RSETCMDHANDLER);
+ String VRFYCMDHANDLER = VrfyCmdHandler.class.getName();
commands.add(VRFYCMDHANDLER);
+ String MAILSIZEHOOK = MailSizeEsmtpExtension.class.getName();
commands.add(MAILSIZEHOOK);
+ String USERSREPOSITORYAUTHHANDLER = UsersRepositoryAuthHook.class.getName();
commands.add(USERSREPOSITORYAUTHHANDLER);
+ String AUTHREQUIREDTORELAY = AuthRequiredToRelayRcptHook.class.getName();
commands.add(AUTHREQUIREDTORELAY);
+ String SENDERAUTHIDENTITYVERIFICATION = SenderAuthIdentifyVerificationRcptHook.class.getName();
commands.add(SENDERAUTHIDENTITYVERIFICATION);
+ String POSTMASTERABUSEHOOK = PostmasterAbuseRcptHook.class.getName();
commands.add(POSTMASTERABUSEHOOK);
+ String RECEIVEDDATALINEFILTER = ReceivedDataLineFilter.class.getName();
commands.add(RECEIVEDDATALINEFILTER);
+ String DATALINEMESSAGEHOOKHANDLER = DataLineJamesMessageHookHandler.class.getName();
commands.add(DATALINEMESSAGEHOOKHANDLER);
+ String STARTTLSHANDLER = StartTlsCmdHandler.class.getName();
commands.add(STARTTLSHANDLER);
// Add the default messageHooks
+ String ADDDEFAULTATTRIBUTESHANDLER = AddDefaultAttributesMessageHook.class.getName();
commands.add(ADDDEFAULTATTRIBUTESHANDLER);
+ String SENDMAILHANDLER = SendMailHandler.class.getName();
commands.add(SENDMAILHANDLER);
// Add logging stuff
+ String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
commands.add(COMMANDHANDLERRESULTLOGGER);
+ String HOOKRESULTLOGGER = HookResultLogger.class.getName();
commands.add(HOOKRESULTLOGGER);
}
/**
- * @see org.apache.james.protocols.api.handler.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return commands;
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java Thu Feb 28 23:31:36 2013
@@ -176,7 +176,7 @@ public class DataLineJamesMessageHookHan
for (JamesMessageHook messageHandler : messageHandlers) {
session.getLogger().debug("executing james message handler " + messageHandler);
long start = System.currentTimeMillis();
- HookResult hRes = ((JamesMessageHook) messageHandler).onMessage(session, mail);
+ HookResult hRes = messageHandler.onMessage(session, mail);
long executionTime = System.currentTimeMillis() - start;
if (rHooks != null) {
for (HookResultHook rHook : rHooks) {
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java Thu Feb 28 23:31:36 2013
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
*/
public class ExtendedSMTPSession extends org.apache.james.protocols.smtp.SMTPSessionImpl {
- private SMTPConfiguration smtpConfiguration;
+ private final SMTPConfiguration smtpConfiguration;
public ExtendedSMTPSession(SMTPConfiguration smtpConfiguration, Logger logger, ProtocolTransport transport) {
super(new ProtocolLoggerAdapter(logger), transport, smtpConfiguration);
@@ -38,10 +38,6 @@ public class ExtendedSMTPSession extends
}
public boolean verifyIdentity() {
- if (smtpConfiguration instanceof SMTPHandlerConfigurationDataImpl) {
- return ((SMTPHandlerConfigurationDataImpl) smtpConfiguration).verifyIdentity();
- } else {
- return true;
- }
+ return !(smtpConfiguration instanceof SMTPHandlerConfigurationDataImpl) || ((SMTPHandlerConfigurationDataImpl) smtpConfiguration).verifyIdentity();
}
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java Thu Feb 28 23:31:36 2013
@@ -43,7 +43,7 @@ import org.apache.mailet.MailAddress;
*/
public class MailPriorityHandler implements JamesMessageHook, InitializingLifecycleAwareProtocolHandler {
- private Map<String, Integer> prioMap = new HashMap<String, Integer>();
+ private final Map<String, Integer> prioMap = new HashMap<String, Integer>();
/**
* @see
@@ -58,7 +58,7 @@ public class MailPriorityHandler impleme
while (rcpts.hasNext()) {
String domain = rcpts.next().getDomain();
- Integer prio = null;
+ Integer prio;
if (domain != null) {
prio = prioMap.get(domain);
if (prio != null) {
@@ -83,8 +83,7 @@ public class MailPriorityHandler impleme
@Override
public void init(Configuration config) throws ConfigurationException {
List<HierarchicalConfiguration> entries = ((HierarchicalConfiguration)config).configurationsAt("priorityEntries.priorityEntry");
- for (int i = 0; i < entries.size(); i++) {
- HierarchicalConfiguration prioConf = entries.get(i);
+ for (HierarchicalConfiguration prioConf : entries) {
String domain = prioConf.getString("domain");
int prio = prioConf.getInt("priority", MailPrioritySupport.NORMAL_PRIORITY);
if (prio > MailPrioritySupport.HIGH_PRIORITY || prio < MailPrioritySupport.LOW_PRIORITY) {
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java Thu Feb 28 23:31:36 2013
@@ -55,8 +55,7 @@ public class SendMailHandler implements
/**
* Adds header to the message
- *
- * @see org.apache.james.smtpserver#onMessage(SMTPSession)
+ *
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
@@ -70,7 +69,7 @@ public class SendMailHandler implements
recipientString = theRecipients.toString();
}
if (session.getLogger().isInfoEnabled()) {
- StringBuilder infoBuffer = new StringBuilder(256).append("Successfully spooled mail ").append(mail.getName()).append(" from ").append(mail.getSender()).append(" on ").append(session.getRemoteAddress().getAddress().toString()).append(" for ").append(recipientString);
+ String infoBuffer = "Successfully spooled mail " + mail.getName() + " from " + mail.getSender() + " on " + session.getRemoteAddress().getAddress().toString() + " for " + recipientString;
session.getLogger().info(infoBuffer.toString());
}
} catch (MessagingException me) {
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java Thu Feb 28 23:31:36 2013
@@ -50,7 +50,7 @@ public class TLDLookup {
static private final HashSet<String> threePartTLDs = initThreePartTLDs();
/** controls testing/debug output */
- static private boolean testing = false;
+ static private final boolean testing = false;
/**
* Determines if a two-part domain string (xxx.xxx) is contained in the
@@ -83,10 +83,10 @@ public class TLDLookup {
*/
static private HashSet<String> initTwoPartTLDs() {
HashSet<String> set = new HashSet<String>(900);
- for (int i = 0; i < multiPartTLDs.length; i++) {
+ for (String multiPartTLD : multiPartTLDs) {
try {
- if (multiPartTLDs[i].matches("^" + tld2 + "$")) {
- set.add(multiPartTLDs[i]);
+ if (multiPartTLD.matches("^" + tld2 + "$")) {
+ set.add(multiPartTLD);
}
} catch (Exception ex) {
debugOut(ex);
@@ -103,11 +103,11 @@ public class TLDLookup {
*/
static private HashSet<String> initThreePartTLDs() {
HashSet<String> set = new HashSet<String>();
- for (int i = 0; i < multiPartTLDs.length; i++) {
+ for (String multiPartTLD : multiPartTLDs) {
try {
- if (multiPartTLDs[i].matches("^" + tld3 + "$")) {
- debugOut("adding \"" + multiPartTLDs[i] + "\"");
- set.add(multiPartTLDs[i]);
+ if (multiPartTLD.matches("^" + tld3 + "$")) {
+ debugOut("adding \"" + multiPartTLD + "\"");
+ set.add(multiPartTLD);
}
} catch (Exception ex) {
debugOut(ex);
@@ -167,7 +167,7 @@ public class TLDLookup {
* Debugging output
*/
private static void debugOut(String msg) {
- if (true == testing) {
+ if (testing) {
System.out.println(msg);
}
}
@@ -176,7 +176,7 @@ public class TLDLookup {
* Debugging output
*/
private static void debugOut(Throwable th) {
- if (true == testing) {
+ if (testing) {
System.out.println(th);
}
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Thu Feb 28 23:31:36 2013
@@ -84,13 +84,13 @@ public class JDBCGreylistHandler extends
/**
* Contains all of the sql strings for this component.
*/
- private SqlResources sqlQueries = new SqlResources();
+ private final SqlResources sqlQueries = new SqlResources();
/** The sqlFileUrl */
private String sqlFileUrl;
/** Holds value of property sqlParameters. */
- private Map<String, String> sqlParameters = new HashMap<String, String>();
+ private final Map<String, String> sqlParameters = new HashMap<String, String>();
private DNSService dnsService;
@@ -321,7 +321,7 @@ public class JDBCGreylistHandler extends
private void initSqlQueries(Connection conn, String sqlFileUrl) throws Exception {
try {
- File sqlFile = null;
+ File sqlFile;
try {
sqlFile = fileSystem.getFile(sqlFileUrl);
@@ -347,8 +347,6 @@ public class JDBCGreylistHandler extends
/**
* Create the table if not exists.
*
- * @param conn
- * The connection
* @param tableNameSqlStringName
* The tableSqlname
* @param createSqlStringName
@@ -374,7 +372,7 @@ public class JDBCGreylistHandler extends
createStatement = conn.prepareStatement(sqlQueries.getSqlString(createSqlStringName, true));
createStatement.execute();
- StringBuilder logBuffer = null;
+ StringBuilder logBuffer;
logBuffer = new StringBuilder(64).append("Created table '").append(tableName).append("' using sqlResources string '").append(createSqlStringName).append("'.");
serviceLog.info(logBuffer.toString());
@@ -388,8 +386,6 @@ public class JDBCGreylistHandler extends
}
/**
- * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
- * org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if ((wNetworks == null) || (!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().getHostAddress()))) {
@@ -430,8 +426,8 @@ public class JDBCGreylistHandler extends
if (nets != null) {
String[] whitelistArray = nets.split(",");
List<String> wList = new ArrayList<String>(whitelistArray.length);
- for (int i = 0; i < whitelistArray.length; i++) {
- wList.add(whitelistArray[i].trim());
+ for (String aWhitelistArray : whitelistArray) {
+ wList.add(aWhitelistArray.trim());
}
setWhiteListedNetworks(new NetMatcher(wList, dnsService));
serviceLog.info("Whitelisted addresses: " + getWhiteListedNetworks().toString());
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java Thu Feb 28 23:31:36 2013
@@ -52,7 +52,7 @@ public class SPFHandler implements James
* Non context specific log should only be used when no context specific log
* is available
*/
- private Logger serviceLog = FALLBACK_LOG;
+ private final Logger serviceLog = FALLBACK_LOG;
public static final String SPF_BLOCKLISTED = "SPF_BLOCKLISTED";
@@ -147,8 +147,6 @@ public class SPFHandler implements James
}
/**
- * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
- * org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (!session.isRelayingAllowed()) {
@@ -163,8 +161,6 @@ public class SPFHandler implements James
}
/**
- * @see org.apache.james.protocols.smtp.hook.MailHook#doMail(org.apache.james.protocols.smtp.SMTPSession,
- * org.apache.mailet.MailAddress)
*/
public HookResult doMail(SMTPSession session, MailAddress sender) {
doSPFCheck(session, sender);
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java Thu Feb 28 23:31:36 2013
@@ -118,13 +118,9 @@ public class SpamAssassinHandler impleme
SpamAssassinInvoker sa = new SpamAssassinInvoker(spamdHost, spamdPort);
sa.scanMail(message);
- Iterator<String> headers = sa.getHeadersAsAttribute().keySet().iterator();
-
// Add the headers
- 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));
}
// Check if rejectionHits was configured
@@ -135,9 +131,8 @@ public class SpamAssassinHandler impleme
// if the hits are bigger the rejectionHits reject the
// message
if (spamdRejectionHits <= hits) {
- StringBuffer buffer = new StringBuffer(256).append("Rejected message from ").append(session.getAttachment(SMTPSession.SENDER, State.Transaction).toString()).append(" from host ").append(session.getRemoteAddress().getHostName()).append(" (").append(session.getRemoteAddress().getAddress().getHostAddress())
- .append(") This message reach the spam hits treshold. Required rejection hits: ").append(spamdRejectionHits).append(" hits: ").append(hits);
- session.getLogger().info(buffer.toString());
+ String buffer = "Rejected message from " + session.getAttachment(SMTPSession.SENDER, State.Transaction).toString() + " from host " + session.getRemoteAddress().getHostName() + " (" + session.getRemoteAddress().getAddress().getHostAddress() + ") This message reach the spam hits treshold. Required rejection hits: " + spamdRejectionHits + " hits: " + hits;
+ session.getLogger().info(buffer);
// Message reject .. abort it!
return new HookResult(HookReturnCode.DENY, DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.SECURITY_OTHER) + " This message reach the spam hits treshold. Please contact the Postmaster if the email is not SPAM. Message rejected");
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java Thu Feb 28 23:31:36 2013
@@ -60,7 +60,7 @@ public class URIRBLHandler implements Ja
* Non context specific log should only be used when no context specific log
* is available
*/
- private Logger serviceLog = FALLBACK_LOG;
+ private final Logger serviceLog = FALLBACK_LOG;
private final static String LISTED_DOMAIN = "LISTED_DOMAIN";
@@ -198,15 +198,13 @@ public class URIRBLHandler implements Ja
HashSet<String> domains = scanMailForDomains(message, session);
- Iterator<String> fDomains = domains.iterator();
-
- while (fDomains.hasNext()) {
+ for (String domain : domains) {
Iterator<String> uRbl = uriRbl.iterator();
- String target = fDomains.next().toString();
+ String target = domain;
while (uRbl.hasNext()) {
try {
- String uRblServer = uRbl.next().toString();
+ String uRblServer = uRbl.next();
String address = target + "." + uRblServer;
if (session.getLogger().isDebugEnabled()) {
@@ -238,8 +236,7 @@ public class URIRBLHandler implements Ja
public void init(Configuration config) throws ConfigurationException {
String[] servers = config.getStringArray("uriRblServers.server");
Collection<String> serverCollection = new ArrayList<String>();
- for (int i = 0; i < servers.length; i++) {
- String rblServerName = servers[i];
+ for (String rblServerName : servers) {
serverCollection.add(rblServerName);
if (serviceLog.isInfoEnabled()) {
serviceLog.info("Adding uriRBL server: " + rblServerName);
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java Thu Feb 28 23:31:36 2013
@@ -166,9 +166,6 @@ public class URIScanner {
*/
static private final Pattern tld3CapPattern = Pattern.compile(tld3Cap);
- /** controls testing/debug output */
- static private boolean testing = false;
-
/**
* <p>
* Scans a character sequence for URIs. Then add all unique domain strings
@@ -194,7 +191,7 @@ public class URIScanner {
final String domain = domainFromHost(host);
if (null != domain) {
- if (false == domains.contains(domain)) {
+ if (!domains.contains(domain)) {
newDomains.add(domain);
}
}
@@ -244,7 +241,7 @@ public class URIScanner {
String host = hostFromUriStr(found);
if (null != host) {
host = host.toLowerCase();
- if (false == set.contains(host)) {
+ if (!set.contains(host)) {
set.add(host);
}
}
@@ -262,7 +259,7 @@ public class URIScanner {
if (null != host) {
host = host.toLowerCase();
- if (false == set.contains(host)) {
+ if (!set.contains(host)) {
set.add(host);
}
}
@@ -357,7 +354,9 @@ public class URIScanner {
* Debugging output
*/
private static void debugOut(String msg) {
- if (true == testing) {
+ /* controls testing/debug output */
+ boolean testing = false;
+ if (testing) {
System.out.println(msg);
}
}
@@ -370,7 +369,7 @@ public class URIScanner {
* @return modified "escaped" string
*/
private static String escape(String str) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < str.length(); i++) {
char ch = str.charAt(i);
if (Character.isDigit(ch) || Character.isUpperCase(ch) || Character.isLowerCase(ch) || ch == '_') {
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Thu Feb 28 23:31:36 2013
@@ -98,21 +98,21 @@ public class ValidRcptHandler extends Ab
// check if the server use virtualhosting, if not use only the localpart
// as username
try {
- if (users.supportVirtualHosting() == false) {
+ if (!users.supportVirtualHosting()) {
username = recipient.getLocalPart();
}
- if (users.contains(username) == true) {
+ if (users.contains(username)) {
return true;
} else {
- if (useVut == true) {
+ if (useVut) {
session.getLogger().debug("Unknown user " + username + " check if its an alias");
try {
Collection<String> targetString = vut.getMappings(recipient.getLocalPart(), recipient.getDomain());
- if (targetString != null && targetString.isEmpty() == false) {
+ if (targetString != null && !targetString.isEmpty()) {
return true;
}
} catch (ErrorMappingException e) {
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Thu Feb 28 23:31:36 2013
@@ -116,7 +116,7 @@ public class ValidRcptMX implements Init
// Email should be deliver local
if (!domain.equals(LOCALHOST)) {
- Iterator<String> mx = null;
+ Iterator<String> mx;
try {
mx = dnsService.findMXRecords(domain).iterator();
} catch (TemporaryResolutionException e1) {
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java Thu Feb 28 23:31:36 2013
@@ -48,12 +48,9 @@ public class ValidSenderDomainHandler ex
} catch (org.apache.james.dnsservice.api.TemporaryResolutionException e) {
// TODO: Should we reject temporary ?
}
-
- if (records == null || records.size() == 0) {
- return false;
- }
- return true;
+ return !(records == null || records.size() == 0);
+
}
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java Thu Feb 28 23:31:36 2013
@@ -40,7 +40,7 @@ import org.apache.james.protocols.smtp.h
*/
public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, InitializingLifecycleAwareProtocolHandler {
- private Map<String, HookStats> hookStats = new HashMap<String, HookStats>();
+ private final Map<String, HookStats> hookStats = new HashMap<String, HookStats>();
private String jmxPath;
/**
@@ -77,9 +77,8 @@ public class HookResultJMXMonitor implem
if (interfaceName.equals(Hook.class)) {
// add stats for all hooks
- for (int i = 0; i < extension.size(); i++) {
- Object hook = extension.get(i);
- if (equals(hook) == false) {
+ for (Object hook : extension) {
+ if (!equals(hook)) {
String hookName = hook.getClass().getName();
try {
hookStats.put(hookName, new HookStats(jmxPath, hookName));
@@ -104,9 +103,8 @@ public class HookResultJMXMonitor implem
@Override
public void destroy() {
synchronized (hookStats) {
- Iterator<HookStats> stats = hookStats.values().iterator();
- while (stats.hasNext()) {
- stats.next().dispose();
+ for (HookStats hookStats1 : hookStats.values()) {
+ hookStats1.dispose();
}
hookStats.clear();
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java Thu Feb 28 23:31:36 2013
@@ -37,11 +37,11 @@ import org.apache.james.protocols.smtp.h
*/
public class HookStats extends StandardMBean implements HookStatsMBean, Disposable {
- private AtomicLong ok = new AtomicLong(0);
- private AtomicLong declined = new AtomicLong(0);
- private AtomicLong deny = new AtomicLong(0);
- private AtomicLong denysoft = new AtomicLong(0);
- private AtomicLong all = new AtomicLong(0);
+ private final AtomicLong ok = new AtomicLong(0);
+ private final AtomicLong declined = new AtomicLong(0);
+ private final AtomicLong deny = new AtomicLong(0);
+ private final AtomicLong denysoft = new AtomicLong(0);
+ private final AtomicLong all = new AtomicLong(0);
private String name;
private MBeanServer mbeanserver;
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java Thu Feb 28 23:31:36 2013
@@ -35,7 +35,6 @@ public class JMXHandlersLoader implement
}
/**
- * @see org.apache.james.protocols.api.handler.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return handlers;
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java Thu Feb 28 23:31:36 2013
@@ -36,9 +36,9 @@ import org.apache.james.protocols.lib.jm
*/
public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats implements SMTPCommandHandlerStatsMBean, Disposable {
- private AtomicLong temp = new AtomicLong(0);
- private AtomicLong perm = new AtomicLong(0);
- private AtomicLong ok = new AtomicLong(0);
+ private final AtomicLong temp = new AtomicLong(0);
+ private final AtomicLong perm = new AtomicLong(0);
+ private final AtomicLong ok = new AtomicLong(0);
public SMTPCommandHandlerStats(String jmxPath, String handlerName, String[] commands) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
super(SMTPCommandHandlerStatsMBean.class, jmxPath, handlerName, commands);
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java Thu Feb 28 23:31:36 2013
@@ -232,7 +232,6 @@ public class SMTPServer extends Abstract
}
/**
- * @see org.apache.james.protocols.smtp.SMTPConfiguration#getSMTPGreeting()
*/
public String getSMTPGreeting() {
return SMTPServer.this.smtpGreeting;
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Thu Feb 28 23:31:36 2013
@@ -157,7 +157,7 @@ public class SMTPServerTest {
protected final int smtpListenerPort;
protected SMTPTestConfiguration smtpConfiguration;
- protected MockUsersRepository usersRepository = new MockUsersRepository();
+ protected final MockUsersRepository usersRepository = new MockUsersRepository();
protected AlterableDNSServer dnsServer;
protected MockMailRepositoryStore store;
protected MockFileSystem fileSystem;
@@ -185,7 +185,7 @@ public class SMTPServerTest {
return new SMTPServer();
}
- protected void setUpSMTPServer() throws Exception {
+ protected void setUpSMTPServer() {
Logger log = LoggerFactory.getLogger("SMTP");
// slf4j can't set programmatically any log level. It's just a facade
@@ -209,7 +209,7 @@ public class SMTPServerTest {
smtpServer.init();
}
- protected void setUpFakeLoader() throws Exception {
+ protected void setUpFakeLoader() {
chain = new MockProtocolHandlerLoader();
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java Thu Feb 28 23:31:36 2013
@@ -26,7 +26,7 @@ import org.apache.james.smtpserver.fastf
@SuppressWarnings("serial")
public class SMTPTestConfiguration extends DefaultConfigurationBuilder {
- private int m_smtpListenerPort;
+ private final int m_smtpListenerPort;
private int m_maxMessageSizeKB = 0;
private String m_authorizedAddresses = "127.0.0.0/8";
private String m_authorizingMode = "false";
@@ -85,11 +85,11 @@ public class SMTPTestConfiguration exten
}
public void setConnectionLimit(int iConnectionLimit) {
- m_connectionLimit = new Integer(iConnectionLimit);
+ m_connectionLimit = iConnectionLimit;
}
public void setConnectionBacklog(int iConnectionBacklog) {
- m_connectionBacklog = new Integer(iConnectionBacklog);
+ m_connectionBacklog = iConnectionBacklog;
}
public void setHeloResolv() {
@@ -132,15 +132,15 @@ public class SMTPTestConfiguration exten
m_startTLS = true;
}
- public void init() throws ConfigurationException {
+ public void init() {
addProperty("[@enabled]", true);
addProperty("bind", "127.0.0.1:" + m_smtpListenerPort);
if (m_connectionLimit != null)
- addProperty("connectionLimit", "" + m_connectionLimit.intValue());
+ addProperty("connectionLimit", "" + m_connectionLimit);
if (m_connectionBacklog != null)
- addProperty("connectionBacklog", "" + m_connectionBacklog.intValue());
+ addProperty("connectionBacklog", "" + m_connectionBacklog);
addProperty("helloName", "myMailServer");
addProperty("connectiontimeout", 360000);
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Thu Feb 28 23:31:36 2013
@@ -37,7 +37,6 @@ public class SPFHandlerTest {
private DNSService mockedDnsService;
private SMTPSession mockedSMTPSession;
- ;
private boolean relaying = false;
@@ -125,8 +124,8 @@ public class SPFHandlerTest {
private void setupMockedSMTPSession(final String ip, final String helo) {
mockedSMTPSession = new BaseFakeSMTPSession() {
- private HashMap<String, Object> sstate = new HashMap<String, Object>();
- private HashMap<String, Object> connectionState = new HashMap<String, Object>();
+ private final HashMap<String, Object> sstate = new HashMap<String, Object>();
+ private final HashMap<String, Object> connectionState = new HashMap<String, Object>();
@Override
public Object setAttachment(String key, Object value, State state) {
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Thu Feb 28 23:31:36 2013
@@ -38,18 +38,17 @@ import org.junit.Test;
public class SpamAssassinHandlerTest {
- private SMTPSession mockedSMTPSession;
private Mail mockedMail;
public final static String SPAMD_HOST = "localhost";
private SMTPSession setupMockedSMTPSession(final Mail mail) {
mockedMail = mail;
- mockedSMTPSession = new BaseFakeSMTPSession() {
+ SMTPSession mockedSMTPSession = new BaseFakeSMTPSession() {
- private HashMap<String, Object> sstate = new HashMap<String, Object>();
- private HashMap<String, Object> connectionState = new HashMap<String, Object>();
- private String ipAddress = "192.168.0.1";
- private String host = "localhost";
+ private final HashMap<String, Object> sstate = new HashMap<String, Object>();
+ private final HashMap<String, Object> connectionState = new HashMap<String, Object>();
+ private final String ipAddress = "192.168.0.1";
+ private final String host = "localhost";
private boolean relayingAllowed;
public String getRemoteHost() {
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Thu Feb 28 23:31:36 2013
@@ -50,15 +50,14 @@ public class URIRBLHandlerTest {
private static final String BAD_DOMAIN2 = "bad2.domain.de";
private static final String GOOD_DOMAIN = "good.apache.org";
private static final String URISERVER = "multi.surbl.org.";
- private SMTPSession mockedSMTPSession;
private Mail mockedMail;
private SMTPSession setupMockedSMTPSession(final Mail mail) {
mockedMail = mail;
- mockedSMTPSession = new BaseFakeSMTPSession() {
+ SMTPSession mockedSMTPSession = new BaseFakeSMTPSession() {
- private String ipAddress = "192.168.0.1";
- private String host = "localhost";
+ private final String ipAddress = "192.168.0.1";
+ private final String host = "localhost";
private boolean relayingAllowed;
public String getRemoteHost() {
@@ -68,8 +67,9 @@ public class URIRBLHandlerTest {
public String getRemoteIPAddress() {
return ipAddress;
}
- private HashMap<String, Object> sstate = new HashMap<String, Object>();
- private HashMap<String, Object> connectionState = new HashMap<String, Object>();
+
+ private final HashMap<String, Object> sstate = new HashMap<String, Object>();
+ private final HashMap<String, Object> connectionState = new HashMap<String, Object>();
@Override
public Object setAttachment(String key, Object value, State state) {
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java Thu Feb 28 23:31:36 2013
@@ -39,8 +39,8 @@ public class Util {
MockMail mockedMail = new MockMail();
mockedMail.setName("ID=" + RANDOM.nextLong());
mockedMail.setMessage(m);
- mockedMail.setRecipients(Arrays.asList(new MailAddress[]{new MailAddress("test@james.apache.org"),
- new MailAddress("test2@james.apache.org")}));
+ mockedMail.setRecipients(Arrays.asList(new MailAddress("test@james.apache.org"),
+ new MailAddress("test2@james.apache.org")));
return mockedMail;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Thu Feb 28 23:31:36 2013
@@ -76,8 +76,8 @@ public class ValidRcptHandlerTest {
public boolean isRelayingAllowed() {
return relayingAllowed;
}
- private HashMap<String, Object> sstate = new HashMap<String, Object>();
- private HashMap<String, Object> connectionState = new HashMap<String, Object>();
+ private final HashMap<String, Object> sstate = new HashMap<String, Object>();
+ private final HashMap<String, Object> connectionState = new HashMap<String, Object>();
@Override
public Object setAttachment(String key, Object value, State state) {
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Thu Feb 28 23:31:36 2013
@@ -44,8 +44,8 @@ public class ValidRcptMXTest {
private SMTPSession setupMockedSMTPSession(final MailAddress rcpt) {
SMTPSession session = new BaseFakeSMTPSession() {
- private HashMap<String, Object> sstate = new HashMap<String, Object>();
- private HashMap<String, Object> connectionState = new HashMap<String, Object>();
+ private final HashMap<String, Object> sstate = new HashMap<String, Object>();
+ private final HashMap<String, Object> connectionState = new HashMap<String, Object>();
@Override
public Object setAttachment(String key, Object value, State state) {
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java Thu Feb 28 23:31:36 2013
@@ -43,15 +43,15 @@ public class MockMimeMessage extends Mim
private String[] m_contentLanguage;
private String m_fileName;
private DataHandler m_dataHandler;
- private HashMap m_contentHeaders = new HashMap();
- private Flags m_setFlags = new Flags();
+ private final HashMap m_contentHeaders = new HashMap();
+ private final Flags m_setFlags = new Flags();
private boolean m_doMatch;
- public MockMimeMessage() throws MessagingException {
+ public MockMimeMessage() {
super((Session) null);
}
- public MockMimeMessage(int messageNumber) throws MessagingException {
+ public MockMimeMessage(int messageNumber) {
super((Session) null);
m_iMessageNumber = messageNumber;
}
@@ -96,11 +96,11 @@ public class MockMimeMessage extends Mim
public Address[] getRecipients(Message.RecipientType recipientType) throws MessagingException {
List recipientsList = getRecipientsList(recipientType);
List recipientAddresses = new ArrayList();
- for (Iterator iterator = recipientsList.iterator(); iterator.hasNext();) {
- String recipient = (String) iterator.next();
+ for (Object aRecipientsList : recipientsList) {
+ String recipient = (String) aRecipientsList;
recipientAddresses.add(new InternetAddress(recipient));
}
- return (Address[]) (recipientAddresses.toArray(new Address[]{}));
+ return (Address[]) (recipientAddresses.toArray(new Address[recipientAddresses.size()]));
}
private List getRecipientsList(Message.RecipientType recipientType) {
@@ -405,8 +405,7 @@ public class MockMimeMessage extends Mim
@Override
public Enumeration getMatchingHeaders(String[] names) throws MessagingException {
ArrayList matchingHeaders = new ArrayList();
- for (int i = 0; i < names.length; i++) {
- String name = names[i];
+ for (String name : names) {
String value = getHeader(name, null);
if (value == null) {
continue;
@@ -422,9 +421,8 @@ public class MockMimeMessage extends Mim
ArrayList nonMatchingHeaders = new ArrayList();
- Iterator iterator = m_contentHeaders.keySet().iterator();
- while (iterator.hasNext()) {
- String name = (String) iterator.next();
+ for (Object o : m_contentHeaders.keySet()) {
+ String name = (String) o;
if (existingHeaders.contains(name)) {
continue;
}
@@ -454,9 +452,8 @@ public class MockMimeMessage extends Mim
private ArrayList getHeadersAsStrings(HashMap contentHeaders) {
ArrayList headerLines = new ArrayList();
- Iterator iterator = contentHeaders.keySet().iterator();
- while (iterator.hasNext()) {
- String key = (String) iterator.next();
+ for (Object o : contentHeaders.keySet()) {
+ String key = (String) o;
String value = (String) contentHeaders.get(key);
headerLines.add(key + ":" + value);
}
@@ -466,8 +463,7 @@ public class MockMimeMessage extends Mim
@Override
public Enumeration getMatchingHeaderLines(String[] names) throws MessagingException {
ArrayList matchingHeaders = new ArrayList();
- for (int i = 0; i < names.length; i++) {
- String name = names[i];
+ for (String name : names) {
String value = getHeader(name, null);
if (value == null) {
continue;
@@ -483,9 +479,8 @@ public class MockMimeMessage extends Mim
ArrayList nonMatchingHeaders = new ArrayList();
- Iterator iterator = m_contentHeaders.keySet().iterator();
- while (iterator.hasNext()) {
- String name = (String) iterator.next();
+ for (Object o : m_contentHeaders.keySet()) {
+ String name = (String) o;
if (existingHeaders != null && existingHeaders.contains(name)) {
continue;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java Thu Feb 28 23:31:36 2013
@@ -30,11 +30,11 @@ public class MockMail implements Mail {
private MimeMessage msg = null;
private Collection recipients = new ArrayList();
private String name = null;
- private MailAddress sender = null;
+ private final MailAddress sender = null;
private String state = null;
private String errorMessage;
private Date lastUpdated;
- private HashMap attributes = new HashMap();
+ private final HashMap attributes = new HashMap();
private static final long serialVersionUID = 1L;
private long size = 0;
private String remoteAddr = "127.0.0.1";
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java Thu Feb 28 23:31:36 2013
@@ -33,7 +33,7 @@ import org.apache.mailet.TemporaryLookup
public class MockMailContext implements MailetContext {
- HashMap attributes = new HashMap();
+ final HashMap attributes = new HashMap();
@Override
public void bounce(Mail mail, String message) throws MessagingException {
@@ -46,7 +46,7 @@ public class MockMailContext implements
}
@Override
- public List<String> dnsLookup(String s, RecordType recordType) throws TemporaryLookupException, LookupException {
+ public List<String> dnsLookup(String s, RecordType recordType) throws LookupException {
throw new UnsupportedOperationException("Not yet implemented");
}
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java Thu Feb 28 23:31:36 2013
@@ -28,8 +28,8 @@ import org.apache.mailet.MailetContext;
*/
public class MockMailetConfig extends Properties implements MailetConfig {
- private String mailetName;
- private MailetContext mc;
+ private final String mailetName;
+ private final MailetContext mc;
public MockMailetConfig(String mailetName, MailetContext mc) {
super();
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java Thu Feb 28 23:31:36 2013
@@ -26,8 +26,8 @@ import org.apache.mailet.MatcherConfig;
*/
public class MockMatcherConfig implements MatcherConfig {
- private String matcherName;
- private MailetContext mc;
+ private final String matcherName;
+ private final MailetContext mc;
public MockMatcherConfig(String matcherName, MailetContext mc) {
super();
@@ -37,7 +37,7 @@ public class MockMatcherConfig implement
@Override
public String getCondition() {
- if (matcherName.indexOf("=") >= 0) {
+ if (matcherName.contains("=")) {
return matcherName.substring(getMatcherName().length() + 1);
} else {
return null;
@@ -51,7 +51,7 @@ public class MockMatcherConfig implement
@Override
public String getMatcherName() {
- if (matcherName.indexOf("=") >= 0) {
+ if (matcherName.contains("=")) {
return matcherName.split("=")[0];
} else {
return matcherName;
Modified: james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java Thu Feb 28 23:31:36 2013
@@ -67,11 +67,11 @@ public class MockSpamd implements Runnab
in = new BufferedReader(new InputStreamReader(spamd.getInputStream()));
out = spamd.getOutputStream();
- String line = null;
+ String line;
// Parse the message
while ((line = in.readLine()) != null) {
- if (line.indexOf(GTUBE) >= 0) {
+ if (line.contains(GTUBE)) {
spam = true;
}
}
Modified: james/server/trunk/queue/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue/queue-activemq/pom.xml Thu Feb 28 23:31:36 2013
@@ -95,11 +95,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
@@ -120,6 +115,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -127,6 +127,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
</plugin>
</plugins>
</build>
Modified: james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java (original)
+++ james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java Thu Feb 28 23:31:36 2013
@@ -86,14 +86,11 @@ import org.springframework.jms.connectio
*/
public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
- private boolean useBlob;
+ private final boolean useBlob;
/**
* Construct a {@link ActiveMQMailQueue} which only use {@link BlobMessage}
*
- * @throws NotCompliantMBeanException
- *
- * @see #ActiveMQMailQueue(ConnectionFactory, String, boolean, Logger)
*/
public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, final Logger logger) {
this(connectionFactory, queuename, true, logger);
@@ -106,7 +103,6 @@ public class ActiveMQMailQueue extends J
* @param queuename
* @param useBlob
* @param logger
- * @throws NotCompliantMBeanException
*/
public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, boolean useBlob, final Logger logger) {
super(connectionFactory, queuename, logger);
@@ -153,9 +149,6 @@ public class ActiveMQMailQueue extends J
// check if we should use a blob message here
if (useBlob) {
- MimeMessage mm = mail.getMessage();
- MimeMessage wrapper = mm;
-
ActiveMQSession amqSession = getAMQSession(session);
/*
@@ -188,7 +181,7 @@ public class ActiveMQMailQueue extends J
if (blobMessage == null) {
// just use the MimeMessageInputStream which can read every
// MimeMessage implementation
- blobMessage = amqSession.createBlobMessage(new MimeMessageInputStream(wrapper));
+ blobMessage = amqSession.createBlobMessage(new MimeMessageInputStream(mail.getMessage()));
}
@@ -232,7 +225,7 @@ public class ActiveMQMailQueue extends J
* @return amqSession
* @throws JMSException
*/
- protected ActiveMQSession getAMQSession(Session session) throws JMSException {
+ protected ActiveMQSession getAMQSession(Session session) {
ActiveMQSession amqSession;
if (session instanceof SessionProxy) {
@@ -256,8 +249,7 @@ public class ActiveMQMailQueue extends J
List<Message> mList = super.removeWithSelector(selector);
// Handle the blob messages
- for (int i = 0; i < mList.size(); i++) {
- Message m = mList.get(i);
+ for (Message m : mList) {
if (m instanceof ActiveMQBlobMessage) {
try {
// Should get remove once this issue is closed:
@@ -299,7 +291,7 @@ public class ActiveMQMailQueue extends J
MessageConsumer consumer = null;
MessageProducer producer = null;
TemporaryQueue replyTo = null;
- long size = -1;
+ long size;
try {
connection = connectionFactory.createConnection();
Modified: james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java (original)
+++ james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java Thu Feb 28 23:31:36 2013
@@ -18,6 +18,14 @@
****************************************************************/
package org.apache.james.queue.activemq;
+import org.apache.activemq.BlobMessage;
+import org.apache.activemq.blob.BlobDownloadStrategy;
+import org.apache.activemq.blob.BlobTransferPolicy;
+import org.apache.activemq.blob.BlobUploadStrategy;
+import org.apache.activemq.command.ActiveMQBlobMessage;
+import org.apache.james.filesystem.api.FileSystem;
+
+import javax.jms.JMSException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -26,15 +34,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import javax.jms.JMSException;
-
-import org.apache.activemq.BlobMessage;
-import org.apache.activemq.blob.BlobDownloadStrategy;
-import org.apache.activemq.blob.BlobTransferPolicy;
-import org.apache.activemq.blob.BlobUploadStrategy;
-import org.apache.activemq.command.ActiveMQBlobMessage;
-import org.apache.james.filesystem.api.FileSystem;
-
/**
* {@link BlobUploadStrategy} and {@link BlobDownloadStrategy} implementation
* which use the {@link FileSystem} to lookup the {@link File} for the
@@ -44,7 +43,8 @@ public class FileSystemBlobStrategy impl
private final FileSystem fileSystem;
private final BlobTransferPolicy policy;
- private int splitCount;
+ private final int splitCount;
+ private final Object lock = new Object();
public FileSystemBlobStrategy(final BlobTransferPolicy policy, final FileSystem fileSystem, int splitCount) {
this.fileSystem = fileSystem;
@@ -52,20 +52,12 @@ public class FileSystemBlobStrategy impl
this.splitCount = splitCount;
}
- /**
- * @see
- * org.apache.activemq.blob.BlobUploadStrategy#uploadFile(org.apache.activemq.command.ActiveMQBlobMessage,
- * java.io.File)
- */
+ @Override
public URL uploadFile(ActiveMQBlobMessage message, File file) throws JMSException, IOException {
return uploadStream(message, new FileInputStream(file));
}
- /**
- * @see
- * org.apache.activemq.blob.BlobUploadStrategy#uploadStream(org.apache.activemq.command.ActiveMQBlobMessage,
- * java.io.InputStream)
- */
+ @Override
public URL uploadStream(ActiveMQBlobMessage message, InputStream in) throws JMSException, IOException {
FileOutputStream out = null;
try {
@@ -98,13 +90,10 @@ public class FileSystemBlobStrategy impl
}
- /**
- * @see
- * org.apache.activemq.blob.BlobDownloadStrategy#deleteFile(org.apache.activemq.command.ActiveMQBlobMessage)
- */
+ @Override
public void deleteFile(ActiveMQBlobMessage message) throws IOException, JMSException {
File f = getFile(message);
- synchronized (f) {
+ synchronized (lock) {
if (f.exists() && !f.delete()) {
throw new IOException("Unable to delete file " + f);
}
@@ -114,15 +103,15 @@ public class FileSystemBlobStrategy impl
/**
* Returns a {@link FileInputStream} for the give {@link BlobMessage}
*/
+ @Override
public InputStream getInputStream(ActiveMQBlobMessage message) throws IOException, JMSException {
- File f = getFile(message);
- return new FileInputStream(f);
+ return new FileInputStream(getFile(message));
}
/**
* Return the {@link File} for the {@link ActiveMQBlobMessage}. The
* {@link File} is lookup via the {@link FileSystem} service
- *
+ *
* @param message
* @return file
* @throws JMSException
@@ -143,7 +132,7 @@ public class FileSystemBlobStrategy impl
File queueF = fileSystem.getFile(queueUrl);
- synchronized (queueF) {
+ synchronized (lock) {
// check if we need to create the queue folder
if (!queueF.exists() && !queueF.mkdirs()) {
throw new IOException("Unable to create directory " + queueF.getAbsolutePath());
@@ -151,6 +140,5 @@ public class FileSystemBlobStrategy impl
}
return fileSystem.getFile(queueUrl + "/" + filename);
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org