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 ad...@apache.org on 2017/07/05 13:59:08 UTC
[01/34] james-project git commit: JAMES-2085 Systematically log
uncatched errors with WARN/ERROR level with stacktraces
Repository: james-project
Updated Branches:
refs/heads/master 9d8d71cd0 -> 1128983f4
JAMES-2085 Systematically log uncatched errors with WARN/ERROR level with stacktraces
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bae03df6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bae03df6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bae03df6
Branch: refs/heads/master
Commit: bae03df63c56dbe55ae569e16a168090fb8db150
Parents: 02d86a4
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 10:04:59 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:11:10 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/protocols/api/Protocol.java | 6 ++++++
.../apache/james/protocols/api/ProtocolImpl.java | 3 +++
.../netty/BasicChannelUpstreamHandler.java | 16 ++++++++++------
.../java/org/apache/james/jmap/JMAPServlet.java | 7 +++++--
.../netty/ImapChannelUpstreamHandler.java | 3 +--
.../netty/ManageSieveChannelUpstreamHandler.java | 3 +--
6 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/bae03df6/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java b/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
index 5ba5bc3..00c47b3 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/Protocol.java
@@ -20,6 +20,7 @@
package org.apache.james.protocols.api;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
+import org.apache.james.protocols.api.logger.Logger;
/**
* Define a protocol
@@ -48,4 +49,9 @@ public interface Protocol {
*/
ProtocolSession newSession(ProtocolTransport transport);
+ /**
+ * @return The logger associated with the protocol
+ */
+ Logger getProtocolLogger();
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bae03df6/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
index 53d4827..d82cb9f 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java
@@ -61,4 +61,7 @@ public class ProtocolImpl implements Protocol{
return config;
}
+ public Logger getProtocolLogger() {
+ return logger;
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bae03df6/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
index 1464b2b..26e6ee8 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
@@ -35,6 +35,7 @@ import org.apache.james.protocols.api.handler.DisconnectHandler;
import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler;
+import org.apache.james.protocols.api.logger.Logger;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandler.Sharable;
@@ -165,9 +166,7 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
@Override
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
ProtocolSession session = (ProtocolSession) ctx.getAttachment();
- if (session != null) {
- session.getLogger().info("Connection closed for " + session.getRemoteAddress().getAddress().getHostAddress());
- }
+ getLogger(session).info("Connection closed for " + session.getRemoteAddress().getAddress().getHostAddress());
cleanup(ctx);
super.channelClosed(ctx, e);
@@ -221,11 +220,16 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
}
transport.writeResponse(Response.DISCONNECT, session);
}
- if (session != null) {
- session.getLogger().debug("Unable to process request", e.getCause());
- }
+ getLogger(session).error("Unable to process request", e.getCause());
cleanup(ctx);
}
}
+ private Logger getLogger(ProtocolSession session) {
+ if (session != null) {
+ return session.getLogger();
+ }
+ return protocol.getProtocolLogger();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bae03df6/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
index d07a89b..2b17bd8 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
@@ -48,7 +48,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class JMAPServlet extends HttpServlet {
- public static final Logger LOG = LoggerFactory.getLogger(JMAPServlet.class);
+ public static final Logger LOGGER = LoggerFactory.getLogger(JMAPServlet.class);
public static final String JSON_CONTENT_TYPE = "application/json";
public static final String JSON_CONTENT_TYPE_UTF8 = "application/json; charset=UTF-8";
@@ -78,8 +78,11 @@ public class JMAPServlet extends HttpServlet {
resp.setContentType(JSON_CONTENT_TYPE);
objectMapper.writeValue(resp.getOutputStream(), responses);
} catch (IOException e) {
- LOG.error("error handling request", e);
+ LOGGER.warn("error handling request", e);
resp.setStatus(SC_BAD_REQUEST);
+ } catch (Exception e) {
+ LOGGER.error("Error handling request", e);
+ throw new ServletException(e);
} finally {
timeMetric.stopAndPublish();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bae03df6/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
index 50114ec..40916fd 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
@@ -141,8 +141,7 @@ public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler imp
@Override
public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
- getLogger(ctx.getChannel()).warn("Error while processing imap request: " + e.getCause().getClass().getName() + " - " + e.getCause().getMessage());
- getLogger(ctx.getChannel()).debug("Error while processing imap request", e.getCause());
+ getLogger(ctx.getChannel()).warn("Error while processing imap request", e.getCause());
if (e.getCause() instanceof TooLongFrameException) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/bae03df6/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
index 636017b..a603161 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
@@ -79,8 +79,7 @@ public class ManageSieveChannelUpstreamHandler extends SimpleChannelUpstreamHand
@Override
public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
- getLogger(ctx.getChannel()).warn("Error while processing ManageSieve request: " + e.getCause().getClass().getName() + " - " + e.getCause().getMessage());
- getLogger(ctx.getChannel()).debug("Error while processing ManageSieve request", e.getCause());
+ getLogger(ctx.getChannel()).warn("Error while processing ManageSieve request", e.getCause());
if (e.getCause() instanceof TooLongFrameException) {
// Max line length exceeded
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[29/34] james-project git commit: JAMES-2085 Remove System.out calls
in code we rely on
Posted by ad...@apache.org.
JAMES-2085 Remove System.out calls in code we rely on
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e7558584
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e7558584
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e7558584
Branch: refs/heads/master
Commit: e75585843cffa645722a37db8162ff4a261350e1
Parents: 635e8e2
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 4 11:13:41 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:49 2017 +0700
----------------------------------------------------------------------
.../hbase/HBaseNonTransactionalMapper.java | 1 -
.../maildir/mail/MaildirMessageMapper.java | 6 ----
.../apache/mailet/base/FlowedMessageUtils.java | 12 ++++++--
.../org/apache/mailet/base/StringUtils.java | 2 +-
.../james/mpt/protocol/ProtocolSession.java | 29 ++++++++------------
.../AbstractLoaderBeanFactory.java | 9 +-----
.../org/apache/james/smtpserver/TLDLookup.java | 9 ++++--
.../james/queue/activemq/EmbeddedActiveMQ.java | 6 +++-
8 files changed, 34 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
index 93c4e77..bea36b8 100644
--- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
+++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseNonTransactionalMapper.java
@@ -34,6 +34,5 @@ public class HBaseNonTransactionalMapper extends NonTransactionalMapper {
@Override
public void endRequest() {
//TODO: maybe do some thing more wise here?
- //System.out.println("Bye!");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index 9a8e0db..1e77933 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -166,8 +166,6 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
MaildirMessageName messageName = folder.getMessageNameByUid(mailboxSession, member.getUid());
if (messageName != null) {
File messageFile = messageName.getFile();
- // System.out.println("save existing " + message +
- // " as " + messageFile.getName());
messageName.setFlags(member.createFlags());
// this automatically moves messages from new to cur if
// needed
@@ -314,16 +312,12 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
if (message.isRecent()) {
messageName.setFlags(message.createFlags());
newMessageFile = new File(folder.getNewFolder(), messageName.getFullName());
- // System.out.println("save new recent " + message + " as " +
- // newMessageFile.getName());
}
// appended via IMAP (might already have flags etc, goes to ./cur
// directly)
else {
messageName.setFlags(message.createFlags());
newMessageFile = new File(folder.getCurFolder(), messageName.getFullName());
- // System.out.println("save new not recent " + message + " as "
- // + newMessageFile.getName());
}
try {
FileUtils.moveFile(messageFile, newMessageFile);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java
index 86b29bd..105607d 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/FlowedMessageUtils.java
@@ -25,6 +25,9 @@ import javax.mail.internet.ContentType;
import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <p>Manages texts encoded as <code>text/plain; format=flowed</code>.</p>
* <p>As a reference see:</p>
@@ -48,6 +51,8 @@ import java.io.IOException;
* </ul>
*/
public final class FlowedMessageUtils {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FlowedMessageUtils.class);
+
public static final char RFC2646_SPACE = ' ';
public static final char RFC2646_QUOTE = '>';
public static final String RFC2646_SIGNATURE = "-- ";
@@ -157,9 +162,10 @@ public final class FlowedMessageUtils {
ct.getParameterList().remove("format");
ct.getParameterList().remove("delsp");
- if (ct.toString().contains("flowed"))
- System.out.println("\n\n*************************\n* ERROR!!! FlowedMessageUtils dind't remove the flowed correctly!\n******************\n\n" + ct.toString() + " \n " + ct.toString() + "\n");
-
+ if (ct.toString().contains("flowed")) {
+ LOGGER.error("FlowedMessageUtils dind't remove the flowed correctly");
+ }
+
m.setContent(deflowed, ct.toString());
m.saveChanges();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java
index 9c50591..703726e 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java
@@ -77,7 +77,7 @@ public final class StringUtils {
StringBuilder sb = new StringBuilder();
byte buf[] = message.getBytes();
byte[] md5 = md.digest(buf);
- //System.out.println(message);
+
for (byte aMd5 : md5) {
String tmpStr = "0" + Integer.toHexString((0xff & aMd5));
sb.append(tmpStr.substring(tmpStr.length() - 2));
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index bd26549..21ee26c 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -348,12 +348,7 @@ public class ProtocolSession implements ProtocolInteractor {
if (!match(expectedLine, testLine)) {
String errMsg = "\nLocation: " + location + "\nLastClientMsg: " + lastClientMessage + "\nExpected: '"
+ expectedLine + "'\nActual : '" + testLine + "'";
- if (continueAfterFailure) {
- System.out.println(errMsg);
- }
- else {
- throw new InvalidServerResponseException(errMsg);
- }
+ handleFailure(continueAfterFailure, errMsg);
}
}
@@ -467,12 +462,7 @@ public class ProtocolSession implements ProtocolInteractor {
errMsg.append(iter.next());
}
errMsg.append("\nActual: ").append(actualLine);
- if (continueAfterFailure) {
- System.out.println(errMsg.toString());
- }
- else {
- throw new InvalidServerResponseException(errMsg.toString());
- }
+ handleFailure(continueAfterFailure, errMsg.toString());
}
}
}
@@ -493,12 +483,7 @@ public class ProtocolSession implements ProtocolInteractor {
String testLine = session.readLine();
if (!"+".equals(testLine) || !continued) {
final String message = "Expected continuation";
- if (continueAfterFailure) {
- System.out.print(message);
- }
- else {
- throw new InvalidServerResponseException(message);
- }
+ handleFailure(continueAfterFailure, message);
}
continuationExpected = false;
continued = false;
@@ -513,6 +498,14 @@ public class ProtocolSession implements ProtocolInteractor {
}
}
+ private void handleFailure(boolean continueAfterFailure, String message) throws InvalidServerResponseException {
+ if (continueAfterFailure) {
+ LOGGER.warn(message);
+ } else {
+ throw new InvalidServerResponseException(message);
+ }
+ }
+
private class ReinitElement implements ProtocolElement {
private final int sessionNumber;
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/AbstractLoaderBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/AbstractLoaderBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/AbstractLoaderBeanFactory.java
index 3b37bf6..babee80 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/AbstractLoaderBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/AbstractLoaderBeanFactory.java
@@ -45,12 +45,6 @@ public abstract class AbstractLoaderBeanFactory<T> extends AbstractBeanFactory {
Class<T> c = (Class<T>) getBeanFactory().getBeanClassLoader().loadClass(fullName);
@SuppressWarnings("deprecation")
T t = (T) getBeanFactory().createBean(c, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, true);
- if (name.equals("LocalDelivery")) {
- System.out.println(t);
- }
- if (name.equals("SieveMailet")) {
- System.out.println(t);
- }
return t;
}
@@ -65,8 +59,7 @@ public abstract class AbstractLoaderBeanFactory<T> extends AbstractBeanFactory {
* @return not null
*/
protected MailetException loadFailed(String name, String type, Exception e) {
- final String builder = "Could not load " + type + " (" + name + ")";
- return new MailetException(builder.toString(), e);
+ return new MailetException("Could not load " + type + " (" + name + ")", e);
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
index 31ba869..1c12b43 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
@@ -21,12 +21,17 @@ package org.apache.james.smtpserver;
import java.util.HashSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A utility class that caches sets of multi-part top level domains (TLDs) for
* quick lookup.
*/
public class TLDLookup {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TLDLookup.class);
+
/**
* Simple regular expression to match strings in the cache. Note: if the
* collection of known mult-part TLDs change to contain characters other
@@ -168,7 +173,7 @@ public class TLDLookup {
*/
private static void debugOut(String msg) {
if (testing) {
- System.out.println(msg);
+ LOGGER.debug(msg);
}
}
@@ -177,7 +182,7 @@ public class TLDLookup {
*/
private static void debugOut(Throwable th) {
if (testing) {
- System.out.println(th);
+ LOGGER.debug("Error caught", th);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e7558584/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java
index f62108a..6e6b7bf 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java
@@ -32,11 +32,15 @@ import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.plugin.StatisticsBrokerPlugin;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.james.filesystem.api.FileSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
public class EmbeddedActiveMQ {
+ private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedActiveMQ.class);
+
private final ActiveMQConnectionFactory activeMQConnectionFactory;
private final PersistenceAdapter persistenceAdapter;
private BrokerService brokerService;
@@ -102,6 +106,6 @@ public class EmbeddedActiveMQ {
String[] transportConnectorsURIs = {"tcp://localhost:0"};
brokerService.setTransportConnectorURIs(transportConnectorsURIs);
brokerService.start();
- System.out.println("Started : " + brokerService.isStarted());
+ LOGGER.info("Started embedded activeMq");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[06/34] james-project git commit: JAMES-2085 JMAP should consider raw
MailboxException as unexpected
Posted by ad...@apache.org.
JAMES-2085 JMAP should consider raw MailboxException as unexpected
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/624cd01d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/624cd01d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/624cd01d
Branch: refs/heads/master
Commit: 624cd01db8dc5d495ab28413d4748d8da57117a8
Parents: 6ed945b
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 11:51:16 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:29 2017 +0700
----------------------------------------------------------------------
.../james/jmap/methods/SetMailboxesUpdateProcessor.java | 4 ++++
.../org/apache/james/jmap/methods/SetMessagesMethod.java | 9 +--------
.../java/org/apache/james/jmap/model/MailboxFactory.java | 7 ++++++-
3 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/624cd01d/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessor.java
index 208e342..459753c 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessor.java
@@ -49,6 +49,8 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.metrics.api.TimeMetric;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.github.fge.lambdas.Throwing;
import com.github.fge.lambdas.functions.ThrowingFunction;
@@ -58,6 +60,7 @@ import com.google.common.collect.Iterables;
public class SetMailboxesUpdateProcessor implements SetMailboxesProcessor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SetMailboxesUpdateProcessor.class);
private final MailboxUtils mailboxUtils;
private final MailboxManager mailboxManager;
private final MailboxFactory mailboxFactory;
@@ -132,6 +135,7 @@ public class SetMailboxesUpdateProcessor implements SetMailboxesProcessor {
.description("Cannot rename a mailbox to an already existing mailbox.")
.build());
} catch (MailboxException e) {
+ LOGGER.error("Error while updating mailbox", e);
responseBuilder.notUpdated(mailboxId, SetError.builder()
.type( "anErrorOccurred")
.description("An error occurred when updating the mailbox")
http://git-wip-us.apache.org/repos/asf/james-project/blob/624cd01d/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
index eff2345..8f9da9b 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesMethod.java
@@ -28,7 +28,6 @@ import org.apache.james.jmap.model.ClientId;
import org.apache.james.jmap.model.SetMessagesRequest;
import org.apache.james.jmap.model.SetMessagesResponse;
import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.metrics.api.TimeMetric;
@@ -69,18 +68,12 @@ public class SetMessagesMethod implements Method {
.responseName(RESPONSE_NAME)
.build());
return responses;
- } catch (MailboxException e) {
- return Stream.of(
- JmapResponse.builder().clientId(clientId)
- .error()
- .responseName(RESPONSE_NAME)
- .build());
} finally {
timeMetric.stopAndPublish();
}
}
- private SetMessagesResponse setMessagesResponse(SetMessagesRequest request, MailboxSession mailboxSession) throws MailboxException {
+ private SetMessagesResponse setMessagesResponse(SetMessagesRequest request, MailboxSession mailboxSession) {
return messagesProcessors.stream()
.map(processor -> processor.process(request, mailboxSession))
.reduce(SetMessagesResponse.builder(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/624cd01d/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java
index 25e274e..6f4e9b1 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java
@@ -30,14 +30,17 @@ import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.model.MailboxCounters;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxMetaData;
import org.apache.james.mailbox.model.MailboxPath;
+import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
+import com.google.common.base.Throwables;
public class MailboxFactory {
private final MailboxManager mailboxManager;
@@ -74,8 +77,10 @@ public class MailboxFactory {
try {
MessageManager mailbox = mailboxFactory.mailboxManager.getMailbox(id, session);
return mailboxFactory.fromMessageManager(mailbox, Optional.ofNullable(userMailboxesMetadata), session);
- } catch (MailboxException e) {
+ } catch (MailboxNotFoundException e) {
return Optional.empty();
+ } catch (MailboxException e) {
+ throw Throwables.propagate(e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[07/34] james-project git commit: JAMES-2085 LMTP should use error
upon unexpected exceptions
Posted by ad...@apache.org.
JAMES-2085 LMTP should use error upon unexpected exceptions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6ed945b9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6ed945b9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6ed945b9
Branch: refs/heads/master
Commit: 6ed945b96b7c02813f4b61912a2fbd357bdeee15
Parents: ae4c8ff
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 11:50:40 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:29 2017 +0700
----------------------------------------------------------------------
.../lmtpserver/hook/MailboxDeliverToRecipientHandler.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/6ed945b9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
index cd891b2..11d93b8 100644
--- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
+++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.Date;
import javax.inject.Inject;
-import javax.inject.Named;
+import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -59,7 +59,7 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook
}
@Inject
- public final void setMailboxManager(@Named("mailboxmanager") MailboxManager mailboxManager) {
+ public final void setMailboxManager(@Named("mailboxmanager") MailboxManager mailboxManager) {
this.mailboxManager = mailboxManager;
}
@@ -90,13 +90,13 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook
result = new HookResult(HookReturnCode.OK, SMTPRetCode.MAIL_OK, DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.CONTENT_OTHER) + " Message received");
} catch (IOException e) {
- session.getLogger().info("Unexpected error handling DATA stream", e);
+ session.getLogger().error("Unexpected error handling DATA stream", e);
result = new HookResult(HookReturnCode.DENYSOFT, " Temporary error deliver message to " + recipient);
} catch (MailboxException e) {
- session.getLogger().info("Unexpected error handling DATA stream", e);
+ session.getLogger().error("Unexpected error handling DATA stream", e);
result = new HookResult(HookReturnCode.DENYSOFT, " Temporary error deliver message to " + recipient);
} catch (UsersRepositoryException e) {
- session.getLogger().info("Unexpected error handling DATA stream", e);
+ session.getLogger().error("Unexpected error handling DATA stream", e);
result = new HookResult(HookReturnCode.DENYSOFT, " Temporary error deliver message to " + recipient);
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[25/34] james-project git commit: JAMES-2085 Remove reported todo due
to typos
Posted by ad...@apache.org.
JAMES-2085 Remove reported todo due to typos
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/35c63ce5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/35c63ce5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/35c63ce5
Branch: refs/heads/master
Commit: 35c63ce535f0020961c58662479c3c94cd66e1c5
Parents: 11f5efa
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:23:20 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/lucene/search/LuceneMessageSearchIndex.java | 2 +-
.../james/mailbox/maildir/mail/MaildirMessageMapper.java | 6 +++---
.../java/org/apache/james/smtpserver/MailPriorityHandler.java | 2 +-
.../java/org/apache/james/smtpserver/SetMimeHeaderHandler.java | 2 +-
.../apache/james/smtpserver/fastfail/JDBCGreylistHandler.java | 2 +-
.../org/apache/james/smtpserver/fastfail/MaxRcptHandler.java | 3 +--
.../apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java | 3 +--
.../src/main/java/org/apache/james/queue/api/MailQueue.java | 2 +-
8 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
index 61a32e1..e2c0f57 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
@@ -1056,7 +1056,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
}
}
}
- // add the uid sorting as last so if no other sorting was able todo the job it will get sorted by the uid
+ // add the uid sorting as last so if no other sorting was able to do the job it will get sorted by the uid
fields.add(UID_SORT);
Sort sort = new Sort();
sort.setSort(fields.toArray(new SortField[0]));
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index 9a8d766..e6c3514 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -447,7 +447,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
*/
@Override
protected void begin() throws MailboxException {
- // nothing todo
+ // nothing to do
}
/**
@@ -455,7 +455,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
*/
@Override
protected void commit() throws MailboxException {
- // nothing todo
+ // nothing to do
}
/**
@@ -463,7 +463,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
*/
@Override
protected void rollback() throws MailboxException {
- // nothing todo
+ // nothing to do
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
index b07f273..ff86a83 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java
@@ -93,7 +93,7 @@ public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler {
@Override
public void destroy() {
- // nothing todo
+ // nothing to do
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
index 3a1ed37..3740532 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
@@ -91,7 +91,7 @@ public class SetMimeHeaderHandler implements JamesMessageHook, ProtocolHandler {
@Override
public void destroy() {
- // nothing todo
+ // nothing to do
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
index d5bd551..0457354 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
@@ -452,6 +452,6 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot
@Override
public void destroy() {
- // nothing todo
+ // nothing to do
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
index a653bc9..9e882ba 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
@@ -33,7 +33,6 @@ public class MaxRcptHandler extends org.apache.james.protocols.smtp.core.fastfai
@Override
public void destroy() {
- // nothing todo
-
+ // nothing to do
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java
index b5a2c01..d677807 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/MaxUnknownCmdHandler.java
@@ -33,8 +33,7 @@ public class MaxUnknownCmdHandler extends org.apache.james.protocols.smtp.core.f
@Override
public void destroy() {
- // nothing todo
-
+ // nothing to do
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c63ce5/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
index 67c9282..ff76968 100644
--- a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
+++ b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
@@ -84,7 +84,7 @@ public interface MailQueue {
/**
* Dequeue the next ready-to-process Mail of the queue. This method will
* block until a Mail is ready and then process the operation.
- * Implementations should take care todo some kind of transactions to not
+ * Implementations should take care to do some kind of transactions to not
* loose any mail on error
*/
MailQueueItem deQueue() throws MailQueueException, InterruptedException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[21/34] james-project git commit: JAMES-2085 Increasing log level
when JMS cleanup fails
Posted by ad...@apache.org.
JAMES-2085 Increasing log level when JMS cleanup fails
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0d929110
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0d929110
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0d929110
Branch: refs/heads/master
Commit: 0d92911065dda4f583f40757e341143b088d1824
Parents: ea40433
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:56:38 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/queue/activemq/ActiveMQMailQueueItem.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0d929110/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
index 9890f12..61a2aa1 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
@@ -62,13 +62,12 @@ public class ActiveMQMailQueueItem extends JMSMailQueueItem implements ActiveMQS
try {
((ActiveMQBlobMessage) message).deleteFile();
} catch (IOException e) {
- logger.info("Unable to delete blob message file for mail " + getMail().getName());
+ logger.warn("Unable to delete blob message file for mail {}", getMail().getName());
} catch (JMSException e) {
- logger.info("Unable to delete blob message file for mail " + getMail().getName());
+ logger.warn("Unable to delete blob message file for mail {}", getMail().getName());
}
}
getMail().removeAttribute(JAMES_REUSE_BLOB_URL);
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[12/34] james-project git commit: JAMES-2085 Remove unneeded comments
in MimeMessageCopyOnWriteProxy
Posted by ad...@apache.org.
JAMES-2085 Remove unneeded comments in MimeMessageCopyOnWriteProxy
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ec72dbfa
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ec72dbfa
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ec72dbfa
Branch: refs/heads/master
Commit: ec72dbfade66d7d4a642c2036a28b95dd03b9824
Parents: 0ddf44b
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 15:40:33 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../james/core/MimeMessageCopyOnWriteProxy.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ec72dbfa/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java b/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
index 67dc405..f75d7dd 100644
--- a/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
+++ b/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
@@ -67,24 +67,10 @@ public class MimeMessageCopyOnWriteProxy extends MimeMessage implements Disposab
}
protected synchronized void incrementReferenceCount() {
- /*
- * Used to track references while debugging try { throw new
- * Exception("incrementReferenceCount: "+(wrapped != null ?
- * System.identityHashCode(wrapped)+"" :
- * "null")+" ["+referenceCount+"]"); } catch (Exception e) {
- * e.printStackTrace(); }
- */
referenceCount++;
}
protected synchronized void decrementReferenceCount() {
- /*
- * Used to track references while debugging try { throw new
- * Exception("decrementReferenceCount: "+(wrapped != null ?
- * System.identityHashCode(wrapped)+"" :
- * "null")+" ["+referenceCount+"]"); } catch (Exception e) {
- * e.printStackTrace(); }
- */
referenceCount--;
if (referenceCount <= 0) {
LifecycleUtil.dispose(wrapped);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[18/34] james-project git commit: JAMES-2085 Increasing
SendFailedException handling to info,
as the information might be usefull for admin
Posted by ad...@apache.org.
JAMES-2085 Increasing SendFailedException handling to info, as the information might be usefull for admin
No higher level, as this might get triggered by faulty SMTP servers
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ea40433d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ea40433d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ea40433d
Branch: refs/heads/master
Commit: ea40433db6c02eb86155cede203f7742a1131a13
Parents: 8152e5a
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:46:57 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../james/transport/mailets/remoteDelivery/MailDelivrer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ea40433d/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
index 936aaf2..1646177 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
@@ -249,10 +249,10 @@ public class MailDelivrer {
if (configuration.isDebug()) {
EnhancedMessagingException enhancedMessagingException = new EnhancedMessagingException(sfe);
if (enhancedMessagingException.hasReturnCode()) {
- logger.debug("SMTP SEND FAILED: Command [{}] RetCode: [{}] Response[{}]", enhancedMessagingException.computeCommand(),
+ logger.info("SMTP SEND FAILED: Command [{}] RetCode: [{}] Response[{}]", enhancedMessagingException.computeCommand(),
enhancedMessagingException.getReturnCode(), sfe.getMessage());
} else {
- logger.debug("Send failed: {}", sfe.toString());
+ logger.info("Send failed", sfe);
}
logLevels(sfe);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[14/34] james-project git commit: JAMES-2085 Replace printStackTrace
by logger when accurate
Posted by ad...@apache.org.
JAMES-2085 Replace printStackTrace by logger when accurate
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a3438cf6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a3438cf6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a3438cf6
Branch: refs/heads/master
Commit: a3438cf692997dbaa904302a706cbbb30951526d
Parents: 3f97dd7
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 10:46:03 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../mailbox/caching/CacheInvalidatingMailboxListener.java | 8 ++++++--
.../james/mailbox/maildir/mail/MaildirMailboxMapper.java | 5 ++++-
.../james/transport/mailets/SMIMECheckSignature.java | 1 -
.../james/protocols/api/future/FutureResponseImpl.java | 10 ++++------
.../java/org/apache/james/protocols/imap/IMAPRequest.java | 6 +++++-
.../james/user/jdbc/AbstractJdbcUsersRepository.java | 5 -----
6 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a3438cf6/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
index 3512fd3..1cd463b 100644
--- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
+++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
@@ -3,12 +3,17 @@ package org.apache.james.mailbox.caching;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxListenerSupport;
import org.apache.james.mailbox.exception.MailboxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* A MailboxListener that invalidates the configured caches in response to Events
*
*/
public class CacheInvalidatingMailboxListener implements MailboxListener {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CacheInvalidatingMailboxListener.class);
+
private final MailboxByPathCache mailboxCacheByPath;
private final MailboxMetadataCache mailboxMetadataCache;
@@ -48,8 +53,7 @@ public class CacheInvalidatingMailboxListener implements MailboxListener {
}
invalidateMailbox(event);
} catch (MailboxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.error("Error while invalidation cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a3438cf6/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
index a59ab1f..5661b91 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
@@ -43,9 +43,12 @@ import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.apache.james.mailbox.store.transaction.NonTransactionalMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MaildirMailboxMapper extends NonTransactionalMapper implements MailboxMapper {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MaildirMailboxMapper.class);
/**
* The {@link MaildirStore} the mailboxes reside in
*/
@@ -99,7 +102,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
FileUtils.forceDelete(file);
}
} catch (IOException e) {
- e.printStackTrace();
+ LOGGER.error("Error while deleting file " + file, e);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a3438cf6/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
----------------------------------------------------------------------
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
index e016a60..887329b 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java
@@ -182,7 +182,6 @@ public class SMIMECheckSignature extends GenericMailet {
log("Error during the analysis of the signed message", e);
signers = null;
} catch (Exception e) {
- e.printStackTrace();
log("Generic error occured during the analysis of the message", e);
signers = null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a3438cf6/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
index aa06a64..8987f82 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java
@@ -25,6 +25,8 @@ import java.util.List;
import org.apache.james.protocols.api.AbstractResponse;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.logger.Logger;
+import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter;
+import org.slf4j.LoggerFactory;
/**
* {@link FutureResponse} implementation which wraps a {@link AbstractResponse} implementation
@@ -36,7 +38,7 @@ public class FutureResponseImpl implements FutureResponse{
private final Logger logger;
public FutureResponseImpl() {
- this(null);
+ this(new ProtocolLoggerAdapter(LoggerFactory.getLogger(FutureResponseImpl.class)));
}
public FutureResponseImpl(Logger logger) {
@@ -154,11 +156,7 @@ public class FutureResponseImpl implements FutureResponse{
try {
listener.onResponse(this);
} catch (Throwable e) {
- if (logger != null) {
- logger.warn("An exception was thrown by the listener " + listener, e);
- } else {
- e.printStackTrace();
- }
+ logger.warn("An exception was thrown by the listener " + listener, e);
}
}
listeners = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a3438cf6/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
index 5b55292..1994601 100644
--- a/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
+++ b/protocols/imap/src/main/java/org/apache/james/protocols/imap/IMAPRequest.java
@@ -26,9 +26,13 @@ import java.util.Iterator;
import java.util.Locale;
import org.apache.james.protocols.api.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IMAPRequest implements Request {
+ private static final Logger LOGGER = LoggerFactory.getLogger(IMAPRequest.class);
+
private static final String US_ASCII = "US_ASCII";
private static final String CRLF = "\r\n";
@@ -90,7 +94,7 @@ public class IMAPRequest implements Request {
sb.append(new String(buf, US_ASCII));
} catch (UnsupportedEncodingException e) {
// Should never happend
- e.printStackTrace();
+ LOGGER.error("Unupported encoding", e);
}
if (linesIt.hasNext()) {
sb.append(CRLF);
http://git-wip-us.apache.org/repos/asf/james-project/blob/a3438cf6/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
index 7478d58..f37fbf5 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
@@ -469,7 +469,6 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
userList.add(user);
}
} catch (SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new UsersRepositoryException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCResultSet(rsUsers);
@@ -502,7 +501,6 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
addUserStatement.execute();
} catch (SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new UsersRepositoryException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCStatement(addUserStatement);
@@ -531,7 +529,6 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
removeUserStatement.setString(1, username);
removeUserStatement.execute();
} catch (SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new UsersRepositoryException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCStatement(removeUserStatement);
@@ -557,7 +554,6 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
setUserForUpdateStatement(user, updateUserStatement);
updateUserStatement.execute();
} catch (SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new UsersRepositoryException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCStatement(updateUserStatement);
@@ -642,7 +638,6 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
}
return user;
} catch (SQLException sqlExc) {
- sqlExc.printStackTrace();
throw new UsersRepositoryException("Error accessing database", sqlExc);
} finally {
theJDBCUtil.closeJDBCResultSet(rsUsers);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[31/34] james-project git commit: JAMES-2085 Stop swallowing
exceptions in JMS related code
Posted by ad...@apache.org.
JAMES-2085 Stop swallowing exceptions in JMS related code
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c5758e6c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c5758e6c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c5758e6c
Branch: refs/heads/master
Commit: c5758e6c5972c72fb7bb623f657d30dd4828c8f0
Parents: e755858
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 4 16:32:17 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:14:04 2017 +0700
----------------------------------------------------------------------
.../james/queue/activemq/ActiveMQMailQueue.java | 46 +---
.../activemq/ActiveMQMailQueueBlobTest.java | 12 -
.../apache/james/queue/jms/JMSMailQueue.java | 227 ++++++-------------
.../james/queue/jms/JMSMailQueueItem.java | 22 +-
.../jms/MimeMessageObjectMessageSource.java | 15 +-
.../queue/jms/AbstractJMSMailQueueTest.java | 17 +-
.../james/queue/jms/JMSMailQueueTest.java | 10 -
7 files changed, 97 insertions(+), 252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
index e39fb81..57c69c9 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
@@ -207,13 +207,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
}
throw e;
} finally {
-
- try {
- if (producer != null)
- producer.close();
- } catch (JMSException e) {
- // ignore here
- }
+ closeProducer(producer);
}
}
@@ -304,35 +298,16 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
size = reply.getLong("size");
return size;
} catch (NumberFormatException e) {
- // if we hit this we can't calculate the size so just catch
- // it
+ return super.getSize();
}
}
-
+ return super.getSize();
} catch (Exception e) {
throw new MailQueueException("Unable to remove mails", e);
} finally {
-
- if (consumer != null) {
-
- try {
- consumer.close();
- } catch (JMSException e1) {
- e1.printStackTrace();
- // ignore on rollback
- }
- }
-
- if (producer != null) {
-
- try {
- producer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
-
+ closeConsumer(consumer);
+ closeProducer(producer);
if (replyTo != null) {
try {
@@ -342,18 +317,11 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport {
// every TemporaryQueue which will never get unregistered
replyTo.delete();
} catch (JMSException e) {
+ logger.error("Error while deleting temporary queue", e);
}
}
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
+ closeSession(session);
}
-
- // if we came to this point we should just fallback to super method
- return super.getSize();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
index 92d97c2..b360913 100644
--- a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
+++ b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueBlobTest.java
@@ -35,8 +35,6 @@ public class ActiveMQMailQueueBlobTest extends ActiveMQMailQueueTest {
public final static String BASE_DIR = "file://target/james-test";
private MyFileSystem fs;
- private JMSMailQueue queue;
-
@Override
protected ActiveMQConnectionFactory createConnectionFactory() {
ActiveMQConnectionFactory factory = super.createConnectionFactory();
@@ -62,16 +60,6 @@ public class ActiveMQMailQueueBlobTest extends ActiveMQMailQueueTest {
}
@Override
- public JMSMailQueue getQueue() {
- return queue;
- }
-
- @Override
- public void setQueue(JMSMailQueue queue) {
- this.queue = queue;
- }
-
- @Override
protected boolean useBlobMessages() {
return true;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
index db65d45..39a6dd5 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
@@ -60,6 +60,7 @@ import org.apache.james.queue.api.ManageableMailQueue;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
@@ -76,6 +77,58 @@ import com.google.common.base.Throwables;
*/
public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPrioritySupport, Disposable {
+ protected static void closeSession(Session session) {
+ if (session != null) {
+ try {
+ session.close();
+ } catch (JMSException e) {
+ LOGGER.error("Error while closing session", e);
+ }
+ }
+ }
+
+ protected static void closeProducer(MessageProducer producer) {
+ if (producer != null) {
+ try {
+ producer.close();
+ } catch (JMSException e) {
+ LOGGER.error("Error while closing producer", e);
+ }
+ }
+ }
+
+ protected static void closeConsumer(MessageConsumer consumer) {
+ if (consumer != null) {
+ try {
+ consumer.close();
+ } catch (JMSException e) {
+ LOGGER.error("Error while closing consumer", e);
+ }
+ }
+ }
+
+ protected static void rollback(Session session) {
+ if (session != null) {
+ try {
+ session.rollback();
+ } catch (JMSException e) {
+ LOGGER.error("Error while rolling session back", e);
+ }
+ }
+ }
+
+ private static void closeBrowser(QueueBrowser browser) {
+ if (browser != null) {
+ try {
+ browser.close();
+ } catch (JMSException e) {
+ LOGGER.error("Error while closing browser", e);
+ }
+ }
+ }
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(JMSMailQueue.class);
+
protected final String queueName;
protected final Connection connection;
protected final MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory;
@@ -132,47 +185,14 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
return createMailQueueItem(connection, session, consumer, message);
} else {
session.commit();
-
- if (consumer != null) {
-
- try {
- consumer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
+ closeConsumer(consumer);
+ closeSession(session);
}
} catch (Exception e) {
- if (session != null) {
- try {
- session.rollback();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
-
- if (consumer != null) {
-
- try {
- consumer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
+ rollback(session);
+ closeConsumer(consumer);
+ closeSession(session);
throw new MailQueueException("Unable to dequeue next message", e);
} finally {
timeMetric.stopAndPublish();
@@ -209,23 +229,11 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
enqueuedMailsMetric.increment();
mailQueueSize.increment();
} catch (Exception e) {
- if (session != null) {
- try {
- session.rollback();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
+ rollback(session);
throw new MailQueueException("Unable to enqueue mail " + mail, e);
-
} finally {
timeMetric.stopAndPublish();
- try {
- if (session != null)
- session.close();
- } catch (JMSException e) {
- // ignore here
- }
+ closeSession(session);
}
}
@@ -267,15 +275,8 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
producer.send(message, Message.DEFAULT_DELIVERY_MODE, msgPrio, Message.DEFAULT_TIME_TO_LIVE);
} finally {
-
- try {
- if (producer != null)
- producer.close();
- } catch (JMSException e) {
- // ignore here
- }
+ closeProducer(producer);
}
-
}
/**
@@ -505,20 +506,8 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
logger.error("Unable to get size of queue " + queueName, e);
throw new MailQueueException("Unable to get size of queue " + queueName, e);
} finally {
- try {
- if (browser != null)
- browser.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
+ closeBrowser(browser);
+ closeSession(session);
}
}
@@ -557,37 +546,12 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
return count;
} catch (Exception e) {
logger.error("Unable to flush mail", e);
- try {
- session.rollback();
- } catch (JMSException e1) {
- // ignore on rollback
- }
+ rollback(session);
throw new MailQueueException("Unable to get size of queue " + queueName, e);
} finally {
- if (consumer != null) {
-
- try {
- consumer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
- if (producer != null) {
-
- try {
- producer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
-
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
+ closeConsumer(consumer);
+ closeProducer(producer);
+ closeSession(session);
}
}
@@ -636,30 +600,12 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
session.commit();
return messages;
} catch (Exception e) {
- try {
- session.rollback();
- } catch (JMSException e1) {
- // ignore on rollback
- }
+ rollback(session);
throw new MailQueueException("Unable to remove mails", e);
} finally {
- if (consumer != null) {
-
- try {
- consumer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
-
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
+ closeConsumer(consumer);
+ closeSession(session);
}
}
@@ -760,39 +706,15 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
@Override
public void close() {
-
- try {
- if (myBrowser != null)
- myBrowser.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
- try {
- if (mySession != null)
- mySession.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
+ closeBrowser(myBrowser);
+ closeSession(mySession);
}
};
} catch (Exception e) {
- try {
- if (browser != null)
- browser.close();
- } catch (JMSException e1) {
- // ignore here
- }
-
- try {
- if (session != null)
- session.close();
- } catch (JMSException e1) {
- // ignore here
- }
+ closeBrowser(browser);
+ closeSession(session);
logger.error("Unable to browse queue " + queueName, e);
throw new MailQueueException("Unable to browse queue " + queueName, e);
@@ -804,6 +726,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
try {
connection.close();
} catch (JMSException e) {
+ logger.error("Error while closing session", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java
index dd13591..5f195bd 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java
@@ -51,29 +51,13 @@ public class JMSMailQueueItem implements MailQueueItem {
if (success) {
session.commit();
} else {
- try {
- session.rollback();
- } catch (JMSException e1) {
- // ignore on rollback
- }
+ JMSMailQueue.rollback(session);
}
} catch (JMSException ex) {
throw new MailQueueException("Unable to commit dequeue operation for mail " + mail.getName(), ex);
} finally {
- if (consumer != null) {
-
- try {
- consumer.close();
- } catch (JMSException e1) {
- // ignore on rollback
- }
- }
- try {
- if (session != null)
- session.close();
- } catch (JMSException e) {
- // ignore here
- }
+ JMSMailQueue.closeConsumer(consumer);
+ JMSMailQueue.closeSession(session);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java
index 3ddd765..0b223dd 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java
@@ -25,9 +25,12 @@ import javax.jms.JMSException;
import javax.jms.ObjectMessage;
import javax.mail.util.SharedByteArrayInputStream;
+import org.apache.commons.io.IOUtils;
import org.apache.james.core.MimeMessageSource;
import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link MimeMessageSource} implementation which reads the data from the
@@ -36,6 +39,8 @@ import org.apache.james.lifecycle.api.LifecycleUtil;
*/
public class MimeMessageObjectMessageSource extends MimeMessageSource implements Disposable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MimeMessageObjectMessageSource.class);
+
private final ObjectMessage message;
private final SharedByteArrayInputStream in;
private final String id;
@@ -65,22 +70,18 @@ public class MimeMessageObjectMessageSource extends MimeMessageSource implements
@Override
public void dispose() {
- try {
- in.close();
- } catch (IOException e1) {
- // ignore on dispose
- }
+ IOUtils.closeQuietly(in);
LifecycleUtil.dispose(in);
try {
message.clearBody();
} catch (JMSException e) {
- // ignore on dispose
+ LOGGER.error("Error clearing JMS message body", e);
}
try {
message.clearProperties();
} catch (JMSException e) {
- // ignore on dispose
+ LOGGER.error("Error clearing JMS message properties", e);
}
content = null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
index 3947a58..52b1aef 100644
--- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
+++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
@@ -30,6 +30,7 @@ import java.util.Enumeration;
import java.util.Iterator;
import java.util.Properties;
import java.util.UUID;
+import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import javax.jms.ConnectionFactory;
@@ -48,6 +49,7 @@ import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator;
import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -61,9 +63,7 @@ public abstract class AbstractJMSMailQueueTest {
protected final static String QUEUE_NAME = "test";
- public abstract JMSMailQueue getQueue();
-
- public abstract void setQueue(JMSMailQueue queue);
+ private JMSMailQueue queue;
protected ActiveMQConnectionFactory createConnectionFactory() {
return new ActiveMQConnectionFactory("vm://localhost?create=false");
@@ -77,12 +77,11 @@ public abstract class AbstractJMSMailQueueTest {
@Before
public void setUp() throws Exception {
ConnectionFactory connectionFactory = createConnectionFactory();
- setQueue(createQueue(connectionFactory, new RawMailQueueItemDecoratorFactory(), QUEUE_NAME));
+ queue = createQueue(connectionFactory, new RawMailQueueItemDecoratorFactory(), QUEUE_NAME);
}
@Test
public void testFIFO() throws MessagingException, InterruptedException, IOException, MailAddressException {
- final JMSMailQueue queue = getQueue();
// should be empty
assertEquals(0, queue.getSize());
@@ -123,7 +122,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testDelayedDeQueue() throws MessagingException, InterruptedException, IOException, MailAddressException {
- final JMSMailQueue queue = getQueue();
// should be empty
assertEquals(0, queue.getSize());
@@ -159,7 +157,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testFlush() throws MessagingException, InterruptedException, IOException, MailAddressException {
- final JMSMailQueue queue = getQueue();
// should be empty
assertEquals(0, queue.getSize());
@@ -203,8 +200,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testRemoveWithRecipient() throws MessagingException, InterruptedException, MailAddressException {
- final JMSMailQueue queue = getQueue();
-
assertEquals(0, queue.getSize());
Mail mail = createMail();
@@ -231,7 +226,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testRemoveWithSender() throws MessagingException, InterruptedException, MailAddressException {
- final JMSMailQueue queue = getQueue();
assertEquals(0, queue.getSize());
MailImpl mail = createMail();
@@ -258,7 +252,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testRemoveWithName() throws MessagingException, InterruptedException, MailAddressException {
- final JMSMailQueue queue = getQueue();
assertEquals(0, queue.getSize());
MailImpl mail = createMail();
@@ -335,7 +328,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testPrioritySupport() throws InterruptedException, MessagingException, IOException, MailAddressException {
- final JMSMailQueue queue = getQueue();
// should be empty
assertEquals(0, queue.getSize());
@@ -371,7 +363,6 @@ public abstract class AbstractJMSMailQueueTest {
@Test
public void testBrowse() throws MessagingException, InterruptedException, IOException, MailAddressException {
- final JMSMailQueue queue = getQueue();
// should be empty
assertEquals(0, queue.getSize());
http://git-wip-us.apache.org/repos/asf/james-project/blob/c5758e6c/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
index 6e7cfc5..d14f65f 100644
--- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
+++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
@@ -10,7 +10,6 @@ import java.util.Arrays;
public class JMSMailQueueTest extends AbstractJMSMailQueueTest {
- private JMSMailQueue queue;
private static BrokerService broker;
@BeforeClass
@@ -43,13 +42,4 @@ public class JMSMailQueueTest extends AbstractJMSMailQueueTest {
return aBroker;
}
- @Override
- public JMSMailQueue getQueue() {
- return queue;
- }
-
- @Override
- public void setQueue(JMSMailQueue queue) {
- this.queue = queue;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[03/34] james-project git commit: JAMES-2085 Log when mailbox can not
be retrieved
Posted by ad...@apache.org.
JAMES-2085 Log when mailbox can not be retrieved
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cb181cab
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cb181cab
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cb181cab
Branch: refs/heads/master
Commit: cb181cabffbc4dbf55d65477e9defe69f3ba9194
Parents: 1eaca58
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 10:37:00 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:25 2017 +0700
----------------------------------------------------------------------
.../mailbox/store/StoreMessageIdManager.java | 37 ++++++--------------
1 file changed, 11 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/cb181cab/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
index dcf812b..9964d6c 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
@@ -58,6 +58,7 @@ import org.apache.james.mailbox.store.quota.QuotaChecker;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -158,7 +159,7 @@ public class StoreMessageIdManager implements MessageIdManager {
allowOnMailboxSession(mailboxIds, mailboxSession, mailboxMapper);
List<MailboxMessage> mailboxMessages = FluentIterable.from(messageIdMapper.find(ImmutableList.of(messageId), MessageMapper.FetchType.Full))
- .filter(belongsToUser(mailboxSession, mailboxMapper))
+ .filter(messageBelongsToUser(mailboxSession, mailboxMapper))
.toList();
if (!mailboxMessages.isEmpty()) {
@@ -264,20 +265,6 @@ public class StoreMessageIdManager implements MessageIdManager {
};
}
- private Predicate<MailboxMessage> belongsToUser(final MailboxSession mailboxSession, final MailboxMapper mailboxMapper) {
- return new Predicate<MailboxMessage>() {
- @Override
- public boolean apply(MailboxMessage input) {
- try {
- Mailbox currentMailbox = mailboxMapper.findMailboxById(input.getMailboxId());
- return belongsToCurrentUser(currentMailbox, mailboxSession);
- } catch (MailboxException e) {
- return false;
- }
- }
- };
- }
-
private Predicate<MailboxId> mailboxBelongsToUser(final MailboxSession mailboxSession, final MailboxMapper mailboxMapper) {
return new Predicate<MailboxId>() {
@Override
@@ -286,12 +273,19 @@ public class StoreMessageIdManager implements MessageIdManager {
Mailbox currentMailbox = mailboxMapper.findMailboxById(mailboxId);
return belongsToCurrentUser(currentMailbox, mailboxSession);
} catch (MailboxException e) {
+ mailboxSession.getLog().error(String.format("Can not retrieve mailboxPath associated with %s", mailboxId.serialize()), e);
return false;
}
}
};
}
+ private Predicate<MailboxMessage> messageBelongsToUser(MailboxSession mailboxSession, MailboxMapper mailboxMapper) {
+ return Predicates.compose(
+ mailboxBelongsToUser(mailboxSession, mailboxMapper),
+ EXTRACT_MAILBOX_ID_FUNCTION);
+ }
+
private void allowOnMailboxSession(List<MailboxId> mailboxIds, MailboxSession mailboxSession, MailboxMapper mailboxMapper) throws MailboxNotFoundException {
Optional<MailboxId> mailboxForbidden = FluentIterable.from(mailboxIds)
.firstMatch(isMailboxOfOtherUser(mailboxSession, mailboxMapper))
@@ -302,17 +296,8 @@ public class StoreMessageIdManager implements MessageIdManager {
}
}
- private Predicate<MailboxId> isMailboxOfOtherUser(final MailboxSession mailboxSession, final MailboxMapper mailboxMapper) {
- return new Predicate<MailboxId>() {
- @Override
- public boolean apply(MailboxId mailboxId) {
- try {
- return !belongsToCurrentUser(mailboxMapper.findMailboxById(mailboxId), mailboxSession);
- } catch (MailboxException e) {
- return true;
- }
- }
- };
+ private Predicate<MailboxId> isMailboxOfOtherUser(MailboxSession mailboxSession, MailboxMapper mailboxMapper) {
+ return Predicates.not(mailboxBelongsToUser(mailboxSession, mailboxMapper));
}
private boolean belongsToCurrentUser(Mailbox mailbox, MailboxSession session) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[23/34] james-project git commit: JAMES-2085 Remove TODO
Auto-generated method stub
Posted by ad...@apache.org.
JAMES-2085 Remove TODO Auto-generated method stub
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2a8be113
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2a8be113
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2a8be113
Branch: refs/heads/master
Commit: 2a8be113f6c3b0271dca3dea915e06a10b6d9c74
Parents: 35c63ce
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:31:08 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/james/mpt/session/ImapSessionImpl.java | 2 --
.../org/apache/james/mpt/user/InMemoryMailboxUserManager.java | 2 --
.../test/java/org/apache/james/imap/decode/parser/MockLogger.java | 3 +--
.../java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java | 3 ---
.../spring/lifecycle/osgi/OSGIConfigurationProvider.java | 1 -
.../java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java | 3 +--
.../java/org/apache/james/smtpserver/ValidRcptHandlerTest.java | 2 --
7 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java
index e86b93d..7703913 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java
@@ -111,12 +111,10 @@ public class ImapSessionImpl implements ImapSession {
}
public void pushLineHandler(ImapLineHandler lineHandler) {
- // TODO Auto-generated method stub
}
public void popLineHandler() {
- // TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java
index 013ec04..20b5211 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java
@@ -91,12 +91,10 @@ public class InMemoryMailboxUserManager implements SubscriptionManager {
}
public void endProcessingRequest(MailboxSession session) {
- // TODO Auto-generated method stub
}
public void startProcessingRequest(MailboxSession session) {
- // TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
index 97a574d..716172f 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
@@ -89,8 +89,7 @@ final class MockLogger implements Logger {
}
public String getName() {
- // TODO Auto-generated method stub
- return null;
+ return null;
}
public void info(Marker arg0, String arg1, Object arg2, Object arg3) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
index 59ac40d..ab2efc3 100644
--- a/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
+++ b/server/container/cli/src/main/java/org/apache/james/cli/probe/impl/JmxMailboxProbe.java
@@ -96,7 +96,6 @@ public class JmxMailboxProbe implements MailboxProbe, JmxProbe {
@Override
public Mailbox getMailbox(String namespace, String user, String name) {
- // TODO Auto-generated method stub
return null;
}
@@ -104,14 +103,12 @@ public class JmxMailboxProbe implements MailboxProbe, JmxProbe {
@Override
public ComposedMessageId appendMessage(String username, MailboxPath mailboxPath, InputStream message,
Date internalDate, boolean isRecent, Flags flags) throws MailboxException {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<String> listSubscriptions(String user) throws Exception {
- // TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
index 05a5028..3eac87f 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIConfigurationProvider.java
@@ -29,7 +29,6 @@ public class OSGIConfigurationProvider implements org.apache.james.container.spr
@Override
public void registerConfiguration(String beanName, HierarchicalConfiguration conf) {
- // TODO Auto-generated method stub
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
index 78f8d5b..26a9ea8 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
@@ -252,7 +252,6 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
@Override
public void destroy() {
- // TODO Auto-generated method stub
-
+
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8be113/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
index acd379b..562bc59 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
@@ -237,13 +237,11 @@ public class ValidRcptHandlerTest {
@Override
public String getGreeting() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getSoftwareName() {
- // TODO Auto-generated method stub
return null;
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[11/34] james-project git commit: JAMES-2085 Improve error management
in James23ImporterManagement
Posted by ad...@apache.org.
JAMES-2085 Improve error management in James23ImporterManagement
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/abf61efe
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/abf61efe
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/abf61efe
Branch: refs/heads/master
Commit: abf61efe781e39930bc22dc246946eec69a05186
Parents: ec72dbf
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 15:41:04 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../spring/tool/James23ImporterManagement.java | 48 ++++----------------
1 file changed, 10 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/abf61efe/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
index b1a5e49..2f0f203 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
@@ -18,19 +18,18 @@
****************************************************************/
package org.apache.james.container.spring.tool;
-import org.apache.james.domainlist.api.DomainListException;
-import org.apache.james.mailrepository.api.MailRepositoryStore.MailRepositoryStoreException;
-import org.apache.james.user.api.UsersRepositoryException;
-
import javax.inject.Inject;
-import javax.mail.MessagingException;
-import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link James23Importer} support via JMX.
*/
public class James23ImporterManagement implements James23ImporterManagementMBean {
+ private static final Logger LOGGER = LoggerFactory.getLogger(James23ImporterManagement.class);
+
@Inject
private James23Importer james23Importer;
@@ -38,16 +37,8 @@ public class James23ImporterManagement implements James23ImporterManagementMBean
public void importUsersAndMailsFromJames23(String james23MailRepositoryPath, String defaultPassword) throws Exception {
try {
james23Importer.importUsersAndMailsFromJames23(james23MailRepositoryPath, defaultPassword);
- } catch (MailRepositoryStoreException e) {
- throw new Exception(e.getMessage());
- } catch (MessagingException e) {
- throw new Exception(e.getMessage());
- } catch (UsersRepositoryException e) {
- throw new Exception(e.getMessage());
- } catch (DomainListException e) {
- throw new Exception(e.getMessage());
- } catch (IOException e) {
- throw new Exception(e.getMessage());
+ } catch (Exception e) {
+ throw new Exception("Error while importing users and mails", e);
}
}
@@ -55,12 +46,8 @@ public class James23ImporterManagement implements James23ImporterManagementMBean
public void importUsersFromJames23(String defaultPassword) throws Exception {
try {
james23Importer.importUsersFromJames23(defaultPassword);
- } catch (MessagingException e) {
- throw new Exception(e.getMessage());
- } catch (UsersRepositoryException e) {
- throw new Exception(e.getMessage());
- } catch (DomainListException e) {
- throw new Exception(e.getMessage());
+ } catch (Exception e) {
+ throw new Exception("Error while importing users", e);
}
}
@@ -69,23 +56,8 @@ public class James23ImporterManagement implements James23ImporterManagementMBean
try {
james23Importer.importMailsFromJames23(james23MailRepositoryPath);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Error while importing mail", e);
throw new Exception(e.getMessage());
- // } catch (MailboxException e) {
- // e.printStackTrace();
- // throw new Exception(e.getMessage());
- // } catch (MailRepositoryStoreException e) {
- // e.printStackTrace();
- // throw new Exception(e.getMessage());
- // } catch (MessagingException e) {
- // e.printStackTrace();
- // throw new Exception(e.getMessage());
- // } catch (UsersRepositoryException e) {
- // e.printStackTrace();
- // throw new Exception(e.getMessage());
- // } catch (IOException e) {
- // e.printStackTrace();
- // throw new Exception(e.getMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[09/34] james-project git commit: JAMES-2085 JpaMigrator should not
use System.out
Posted by ad...@apache.org.
JAMES-2085 JpaMigrator should not use System.out
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/99b49877
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/99b49877
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/99b49877
Branch: refs/heads/master
Commit: 99b49877415558d19fcf05a6308bf2ef96b1730f
Parents: fc97d22
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:20:09 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/jpa/migrator/JpaMigrator.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/99b49877/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
index 6b5adc4..2eea2e0 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
@@ -26,12 +26,16 @@ import javax.persistence.Persistence;
import org.apache.james.mailbox.jpa.migrator.command.JpaMigrateCommand;
import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The class that will manage the migration commands for the James JPA database.
* All SQL commands should be moved from JAVA code to a separate file.
*/
public class JpaMigrator {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(JpaMigrator.class);
/**
* The package name where all commands reside.
@@ -44,30 +48,25 @@ public class JpaMigrator {
* You can also invoke with many JIRA at once. They will be all serially executed.</p>
*
* TODO Extract the SQL in JAVA classes to XML file.
- * TODO Log with slf4j.
*
* @param jiras the JIRAs numbers
* @throws JpaMigrateException
*/
public static void main(String[] jiras) throws JpaMigrateException {
-
+
try {
-
EntityManagerFactory factory = Persistence.createEntityManagerFactory("JamesMigrator");
EntityManager em = factory.createEntityManager();
for (String jira: jiras) {
JpaMigrateCommand jiraJpaMigratable = (JpaMigrateCommand) Class.forName(JPA_MIGRATION_COMMAND_PACKAGE + "." + jira.toUpperCase(Locale.US) + JpaMigrateCommand.class.getSimpleName()).newInstance();
- System.out.println("Now executing " + jira + " migration.");
+ LOGGER.info("Now executing " + jira + " migration.");
em.getTransaction().begin();
jiraJpaMigratable.migrate(em);
em.getTransaction().commit();
- System.out.println(jira + " migration is successfully achieved.");
+ LOGGER.info(jira + " migration is successfully achieved.");
}
-
- }
-
- catch (Throwable t) {
+ } catch (Throwable t) {
throw new JpaMigrateException(t);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[17/34] james-project git commit: JAMES-2085 Improve logging: log
distant failed addresses
Posted by ad...@apache.org.
JAMES-2085 Improve logging: log distant failed addresses
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8a7485e6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8a7485e6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8a7485e6
Branch: refs/heads/master
Commit: 8a7485e6b1011391975c91a903e577f665cc769c
Parents: 746bbc8
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:44:29 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../james/transport/mailets/remoteDelivery/MailDelivrer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8a7485e6/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
index c2c75e5..b5311b8 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
@@ -38,6 +38,7 @@ import org.slf4j.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@SuppressWarnings("deprecation")
@@ -226,7 +227,7 @@ public class MailDelivrer {
if (sfe.getValidUnsentAddresses() != null && sfe.getValidUnsentAddresses().length > 0) {
if (configuration.isDebug())
- logger.debug("Send failed, {} valid addresses remain, continuing with any other servers", sfe.getValidUnsentAddresses().length);
+ logger.debug("Send failed, {} valid addresses remain, continuing with any other servers", ImmutableList.copyOf(sfe.getValidUnsentAddresses()));
return sfe;
} else {
// There are no valid addresses left to send, so rethrow
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[16/34] james-project git commit: JAMES-2085 Remove unneeded
exception handling
Posted by ad...@apache.org.
JAMES-2085 Remove unneeded exception handling
MessageId serialization is handled by capabilities
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/746bbc89
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/746bbc89
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/746bbc89
Branch: refs/heads/master
Commit: 746bbc89748141723194ca03cac499877f911d78
Parents: 8a88876
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:37:46 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../json/IndexableMessageTest.java | 32 ------------------
.../james/mailbox/store/search/SearchUtil.java | 11 +++---
.../comparator/AbstractHeaderComparator.java | 10 +++---
.../mailbox/store/search/SearchUtilTest.java | 35 --------------------
4 files changed, 9 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/746bbc89/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
index db221b7..5fbb373 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
@@ -502,38 +502,6 @@ public class IndexableMessageTest {
// Then
assertThat(indexableMessage.getText()).contains("subject should be parsed");
}
-
- @Test
- public void shouldHandleCorrectlyMessageIdHavingSerializeMethodThatThrowAnException() throws Exception {
- MessageId invalidMessageIdThatThrowException = mock(MessageId.class);
- when(invalidMessageIdThatThrowException.serialize())
- .thenThrow(new UnsupportedOperationException());
-
- // When
- MailboxMessage mailboxMessage = mock(MailboxMessage.class);
- TestId mailboxId = TestId.of(1);
- when(mailboxMessage.getMailboxId())
- .thenReturn(mailboxId);
- when(mailboxMessage.getMessageId())
- .thenReturn(invalidMessageIdThatThrowException);
- when(mailboxMessage.getFullContent())
- .thenReturn(new ByteArrayInputStream(IOUtils.toByteArray(ClassLoader.getSystemResourceAsStream("eml/bodyMakeTikaToFail.eml"))));
- when(mailboxMessage.createFlags())
- .thenReturn(new Flags());
- when(mailboxMessage.getUid())
- .thenReturn(MESSAGE_UID);
-
- IndexableMessage indexableMessage = IndexableMessage.builder()
- .message(mailboxMessage)
- .users(ImmutableList.of(new MockMailboxSession("username").getUser()))
- .extractor(textExtractor)
- .zoneId(ZoneId.of("Europe/Paris"))
- .indexAttachments(IndexAttachments.YES)
- .build();
-
- // Then
- assertThat(indexableMessage.getMessageId()).isNull();
- }
@Test
public void shouldHandleCorrectlyMessageIdHavingSerializeMethodThatReturnNull() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/746bbc89/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
index 39ec71b..703385c 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
@@ -180,13 +180,10 @@ public class SearchUtil {
public static String getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(MailboxMessage mailboxMessage) {
- try {
- MessageId messageId = mailboxMessage.getMessageId();
- if (messageId != null) {
- return messageId.serialize();
- }
- } catch(UnsupportedOperationException e) {}
-
+ MessageId messageId = mailboxMessage.getMessageId();
+ if (messageId != null) {
+ return messageId.serialize();
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/746bbc89/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
index b626482..37f2c0f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
@@ -43,11 +43,11 @@ public abstract class AbstractHeaderComparator implements Comparator<MailboxMess
try {
final List<Header> headers = ResultUtils.createHeaders(message);
for (Header header : headers) {
- String name = header.getName();
- if (headerName.equalsIgnoreCase(name)) {
- final String value = header.getValue();
- return value.toUpperCase(Locale.US);
- }
+ String name = header.getName();
+ if (headerName.equalsIgnoreCase(name)) {
+ final String value = header.getValue();
+ return value.toUpperCase(Locale.US);
+ }
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/746bbc89/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
index 542ef9c..8dcccff 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilTest.java
@@ -104,24 +104,6 @@ public class SearchUtilTest {
}
@Test
- public void getSerializedMessageIdIfSupportedByUnderlyingStorageOrNullForMessageIdThatSerializeReturnUnsupportedOperationExceptionShouldReturnNull() {
- //given
- MessageId invalidMessageIdThatThrowException = mock(MessageId.class);
- when(invalidMessageIdThatThrowException.serialize())
- .thenThrow(new UnsupportedOperationException());
-
- MailboxMessage message = mock(MailboxMessage.class);
- when(message.getMessageId())
- .thenReturn(invalidMessageIdThatThrowException);
-
- //when
- String serialiazedMessageId = SearchUtil.getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(message);
-
- //expect
- assertNull(serialiazedMessageId);
- }
-
- @Test
public void getSerializedMessageIdIfSupportedByUnderlyingStorageOrNullForValidMessageIdShouldReturnSerializedId() {
//given
String messageIdString = "http://www.labraxeenne.com/#/";
@@ -140,21 +122,4 @@ public class SearchUtilTest {
assertEquals(serialiazedMessageId, messageIdString);
}
- @Test
- public void getSerializedMessageIdIfSupportedByUnderlyingStorageOrNullForMessageIdThatReturnUssuportedOperationException() {
- //given
- MessageId messageId = mock(MessageId.class);
- when(messageId.serialize())
- .thenThrow(new UnsupportedOperationException());
-
- MailboxMessage message = mock(MailboxMessage.class);
- when(message.getMessageId())
- .thenReturn(messageId);
-
- //when
- String serialiazedMessageId = SearchUtil.getSerializedMessageIdIfSupportedByUnderlyingStorageOrNull(message);
-
- //expect
- assertEquals(serialiazedMessageId, null);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[05/34] james-project git commit: JAMES-2085 Avoid unneeded error
handling in Header comparator and avoid swallowing errors
Posted by ad...@apache.org.
JAMES-2085 Avoid unneeded error handling in Header comparator and avoid swallowing errors
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ae4c8ff8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ae4c8ff8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ae4c8ff8
Branch: refs/heads/master
Commit: ae4c8ff875ed719c8d0ae9cbf72150998cfacc27
Parents: bbba86f
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 10:44:22 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:28 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/james/mailbox/model/MessageResult.java | 4 ++--
.../org/apache/james/mailbox/store/MimeDescriptorImpl.java | 6 +-----
.../java/org/apache/james/mailbox/store/ResultHeader.java | 4 ++--
.../store/search/comparator/AbstractHeaderComparator.java | 9 +++++----
.../james/mailbox/store/streaming/FullByteContent.java | 6 +-----
.../apache/james/imap/processor/fetch/MimeBodyElement.java | 6 +-----
6 files changed, 12 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ae4c8ff8/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
index 045e3d0..128760a 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
@@ -176,7 +176,7 @@ public interface MessageResult extends Comparable<MessageResult>, MessageMetaDat
* @return name of this header
* @throws MessagingException
*/
- String getName() throws MailboxException;
+ String getName();
/**
* Gets the (unparsed) value of this header.
@@ -184,7 +184,7 @@ public interface MessageResult extends Comparable<MessageResult>, MessageMetaDat
* @return value of this header
* @throws MessagingException
*/
- String getValue() throws MailboxException;
+ String getValue();
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/ae4c8ff8/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 351c5e9..7137040 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -331,11 +331,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
Iterator<MessageResult.Header> hIt = headers.iterator();
while(hIt.hasNext()) {
MessageResult.Header header = hIt.next();
- try {
- sb.append(header.getName()).append(": " ).append(header.getValue()).append("\r\n");
- } catch (MailboxException e) {
- throw new IOException("Unable to read headers", e);
- }
+ sb.append(header.getName()).append(": " ).append(header.getValue()).append("\r\n");
}
sb.append("\r\n");
return new ByteArrayInputStream(sb.toString().getBytes(US_ASCII));
http://git-wip-us.apache.org/repos/asf/james-project/blob/ae4c8ff8/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
index 904c9aa..d01c13f 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultHeader.java
@@ -47,14 +47,14 @@ public final class ResultHeader implements MessageResult.Header {
/**
* @see org.apache.james.mailbox.model.MessageResult.Header#getName()
*/
- public String getName() throws MailboxException {
+ public String getName() {
return name;
}
/**
* @see org.apache.james.mailbox.model.MessageResult.Header#getValue()
*/
- public String getValue() throws MailboxException {
+ public String getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ae4c8ff8/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
index 9dfa4f1..b626482 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/AbstractHeaderComparator.java
@@ -27,10 +27,14 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MessageResult.Header;
import org.apache.james.mailbox.store.ResultUtils;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractHeaderComparator implements Comparator<MailboxMessage>{
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractHeaderComparator.class);
+
public final static String FROM ="from";
public final static String TO ="to";
public final static String CC ="cc";
@@ -39,18 +43,15 @@ public abstract class AbstractHeaderComparator implements Comparator<MailboxMess
try {
final List<Header> headers = ResultUtils.createHeaders(message);
for (Header header : headers) {
- try {
String name = header.getName();
if (headerName.equalsIgnoreCase(name)) {
final String value = header.getValue();
return value.toUpperCase(Locale.US);
}
- } catch (MailboxException e) {
- // skip the header line
- }
}
} catch (IOException e) {
+ LOGGER.warn("Exception encountered, skipping header line", e);
// skip the header
}
return "";
http://git-wip-us.apache.org/repos/asf/james-project/blob/ae4c8ff8/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java
index 2316812..c9bef98 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/FullByteContent.java
@@ -65,11 +65,7 @@ public class FullByteContent implements Content {
ByteArrayOutputStream out = new ByteArrayOutputStream();
for (Header header : headers) {
if (header != null) {
- try {
- out.write((header.getName() + ": " + header.getValue() + "\r\n").getBytes("US-ASCII"));
- } catch (MailboxException e) {
- throw new IOException("Unable to read headers", e);
- }
+ out.write((header.getName() + ": " + header.getValue() + "\r\n").getBytes("US-ASCII"));
}
}
out.write("\r\n".getBytes("US-ASCII"));
http://git-wip-us.apache.org/repos/asf/james-project/blob/ae4c8ff8/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
index 2287f6a..7e2afa2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimeBodyElement.java
@@ -91,11 +91,7 @@ public class MimeBodyElement implements BodyElement {
ByteArrayOutputStream out = new ByteArrayOutputStream();
for (MessageResult.Header header : headers) {
- try {
- out.write((header.getName() + ": " + header.getValue() + ImapConstants.LINE_END).getBytes(US_ASCII));
- } catch (MailboxException e) {
- throw new IOException("Unable to read header", e);
- }
+ out.write((header.getName() + ": " + header.getValue() + ImapConstants.LINE_END).getBytes(US_ASCII));
}
// no empty line with CRLF for MIME headers. See IMAP-297
if (size > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[19/34] james-project git commit: JAMES-2085 Correct javadoc error
Posted by ad...@apache.org.
JAMES-2085 Correct javadoc error
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8152e5ac
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8152e5ac
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8152e5ac
Branch: refs/heads/master
Commit: 8152e5acce0a1cec6def6a98e0ab8f2efce430c0
Parents: 8a7485e
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:44:46 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../apache/james/transport/mailets/remoteDelivery/MailDelivrer.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8152e5ac/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
index b5311b8..936aaf2 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java
@@ -71,7 +71,6 @@ public class MailDelivrer {
* throw an exception.
*
* @param mail org.apache.james.core.MailImpl
- * @param session javax.mail.Session
* @return boolean Whether the delivery was successful and the message can be deleted
*/
public ExecutionResult deliver(Mail mail) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[27/34] james-project git commit: JAMES-2085 Remove other useless
TODOs
Posted by ad...@apache.org.
JAMES-2085 Remove other useless TODOs
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8a888769
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8a888769
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8a888769
Branch: refs/heads/master
Commit: 8a88876981ffc43a00751532ded1ad77a8502964
Parents: 2a8be11
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:32:02 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/jpa/migrator/JpaMigratorTest.java | 13 +++++--------
.../apache/james/imap/api/message/MessageFlags.java | 2 +-
.../methods/integration/cucumber/DownloadStepdefs.java | 2 --
3 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8a888769/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
index b3de9cb..bd47945 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
@@ -21,38 +21,35 @@ package org.apache.james.mailbox.jpa.migrator;
import org.junit.Ignore;
import org.junit.Test;
-// TODO
@Ignore("This class needs to be reviewed")
public class JpaMigratorTest {
-
@Test
public void testImap165() throws Exception {
JpaMigrator.main(new String[]{"IMAP165"});
}
- @Test()
+ @Test
public void testImap168() throws Exception {
JpaMigrator.main(new String[]{"IMAP168"});
}
- @Test()
+ @Test
public void testImap172() throws Exception {
JpaMigrator.main(new String[]{"IMAP172"});
}
- @Test()
+ @Test
public void testImap176() throws Exception {
JpaMigrator.main(new String[]{"IMAP176"});
}
- @Test()
+ @Test
public void testImap180() throws Exception {
JpaMigrator.main(new String[]{"IMAP180"});
}
- @Test()
+ @Test
public void testImap184() throws Exception {
JpaMigrator.main(new String[]{"IMAP184"});
}
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/8a888769/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
index 3466a43..2a890c0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import javax.mail.Flags;
/**
- * The set of flags associated with a message. TODO - why not use
+ * The set of flags associated with a message.
* javax.mail.Flags instead of having our own.
*
* <p>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8a888769/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
index 68ba2ae..a60506a 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -103,8 +103,6 @@ public class DownloadStepdefs {
ClassLoader.getSystemResourceAsStream("eml/oneInlinedImage.eml"), new Date(), false, new Flags());
attachmentsByMessageId.put(messageId, attachmentId);
- // TODO
- //blobIdByAttachmentId.put(attachmentId, "<correctComputedBlobId>");
}
@Given("^\"([^\"]*)\" mailbox \"([^\"]*)\" contains a message \"([^\"]*)\" with multiple same inlined attachments \"([^\"]*)\"$")
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[02/34] james-project git commit: JAMES-2085 Improve method not found
JMAP exception log message
Posted by ad...@apache.org.
JAMES-2085 Improve method not found JMAP exception log message
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1eaca586
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1eaca586
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1eaca586
Branch: refs/heads/master
Commit: 1eaca586a14046276972072e647dadfd7a75b069
Parents: bae03df
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 10:05:25 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:11:13 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/james/jmap/methods/RequestHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1eaca586/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java
index 5dd75de..19a8633 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/RequestHandler.java
@@ -56,7 +56,7 @@ public class RequestHandler {
return Optional.ofNullable(methods.get(request.getMethodName()))
.map(extractAndProcess(request))
.map(jmapResponseWriter::formatMethodResponse)
- .orElseThrow(() -> new IllegalStateException("unknown method"));
+ .orElseThrow(() -> new IllegalStateException("unknown method " + request.getMethodName()));
}
private Function<Method, Stream<JmapResponse>> extractAndProcess(AuthenticatedProtocolRequest request) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[33/34] james-project git commit: JAMES-2085 Use ExpectedException
where possible
Posted by ad...@apache.org.
JAMES-2085 Use ExpectedException where possible
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5da9d3d4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5da9d3d4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5da9d3d4
Branch: refs/heads/master
Commit: 5da9d3d40abd20e368aa2d22334910cb95384b6e
Parents: 550c1c5
Author: benwa <bt...@linagora.com>
Authored: Wed Jul 5 09:37:29 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:14:08 2017 +0700
----------------------------------------------------------------------
.../AbstractStateCompositeProcessorTest.java | 87 ++++++++++----------
1 file changed, 45 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5da9d3d4/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
index a654b59..9a36ab9 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
@@ -18,10 +18,15 @@
****************************************************************/
package org.apache.james.mailetcontainer.lib;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.util.Arrays;
import java.util.List;
+
import javax.mail.MessagingException;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -29,66 +34,64 @@ import org.apache.james.core.MailImpl;
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.james.mailetcontainer.api.mock.MockMailProcessor;
import org.apache.mailet.Mail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractStateCompositeProcessorTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStateCompositeProcessorTest.class);
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
@Test
public void testChooseRightProcessor() throws Exception {
- AbstractStateCompositeProcessor processor = new AbstractStateCompositeProcessor() {
-
- @Override
- protected MailProcessor createMailProcessor(final String state, HierarchicalConfiguration config) throws
- Exception {
- return new MockMailProcessor("") {
+ AbstractStateCompositeProcessor processor = new AbstractStateCompositeProcessor() {
@Override
- public void service(Mail mail) throws MessagingException {
- // check if the right processor was selected depending on the state
- assertEquals(state, mail.getState());
- super.service(mail);
+ protected MailProcessor createMailProcessor(final String state, HierarchicalConfiguration config) throws
+ Exception {
+ return new MockMailProcessor("") {
+
+ @Override
+ public void service(Mail mail) throws MessagingException {
+ // check if the right processor was selected depending on the state
+ assertEquals(state, mail.getState());
+ super.service(mail);
+ }
+ };
}
};
- }
- };
- Logger log = LoggerFactory.getLogger("MockLog");
- // slf4j can't set programmatically any log level. It's just a facade
- // log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
- processor.setLog(log);
- processor.configure(createConfig(Arrays.asList("root", "error", "test")));
- processor.init();
+ Logger log = LoggerFactory.getLogger("MockLog");
+ // slf4j can't set programmatically any log level. It's just a facade
+ // log.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
+ processor.setLog(log);
+ processor.configure(createConfig(Arrays.asList("root", "error", "test")));
+ processor.init();
- try {
- Mail mail1 = new MailImpl();
- mail1.setState(Mail.DEFAULT);
- Mail mail2 = new MailImpl();
- mail2.setState(Mail.ERROR);
+ try {
+ Mail mail1 = new MailImpl();
+ mail1.setState(Mail.DEFAULT);
+ Mail mail2 = new MailImpl();
+ mail2.setState(Mail.ERROR);
- Mail mail3 = new MailImpl();
- mail3.setState("test");
+ Mail mail3 = new MailImpl();
+ mail3.setState("test");
- Mail mail4 = new MailImpl();
- mail4.setState("invalid");
+ Mail mail4 = new MailImpl();
+ mail4.setState("invalid");
- processor.service(mail1);
- processor.service(mail2);
- processor.service(mail3);
+ processor.service(mail1);
+ processor.service(mail2);
+ processor.service(mail3);
- try {
- processor.service(mail4);
- fail("should fail because of no mapping to a processor for this state");
- } catch (MessagingException e) {
- LOGGER.info("Ignored error", e);
- }
+ expectedException.expect(MessagingException.class);
- } finally {
- processor.dispose();
- }
+ processor.service(mail4);
+ } finally {
+ processor.dispose();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[13/34] james-project git commit: JAMES-2085 Correct error handling
in MimeMessageWrapper tests
Posted by ad...@apache.org.
JAMES-2085 Correct error handling in MimeMessageWrapper tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/972001da
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/972001da
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/972001da
Branch: refs/heads/master
Commit: 972001da5c48d98611de896f13257ff4fad293db
Parents: a3438cf
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 15:59:24 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../james/core/MimeMessageWrapperTest.java | 61 ++++++--------------
1 file changed, 19 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/972001da/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
index 10fe7e3..64c6723 100644
--- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
+++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
@@ -151,59 +151,36 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest {
mmw.writeTo(System.out);
}
- /*
- * Class under test for String getSubject()
- */
@Test
- public void testGetSubjectFolding() {
- try {
- StringBuilder res = new StringBuilder();
- BufferedReader r = new BufferedReader(new InputStreamReader(mw.getInputStream()));
- String line;
- while (r.ready()) {
- line = r.readLine();
- res.append(line).append("\r\n");
- }
- r.close();
- assertEquals(body, res.toString());
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ public void testGetSubjectFolding() throws Exception {
+ StringBuilder res = new StringBuilder();
+ BufferedReader r = new BufferedReader(new InputStreamReader(mw.getInputStream()));
+ String line;
+ while (r.ready()) {
+ line = r.readLine();
+ res.append(line).append("\r\n");
}
+ r.close();
+ assertEquals(body, res.toString());
}
- /*
- * Class under test for String getSubject()
- */
@Test
- public void testAddHeaderAndSave() {
- try {
- mw.addHeader("X-Test", "X-Value");
-
- assertEquals("X-Value", mw.getHeader("X-Test")[0]);
+ public void testAddHeaderAndSave() throws Exception {
+ mw.addHeader("X-Test", "X-Value");
- mw.saveChanges();
+ assertEquals("X-Value", mw.getHeader("X-Test")[0]);
- ByteArrayOutputStream rawMessage = new ByteArrayOutputStream();
- mw.writeTo(rawMessage);
+ mw.saveChanges();
- assertEquals("X-Value", mw.getHeader("X-Test")[0]);
+ ByteArrayOutputStream rawMessage = new ByteArrayOutputStream();
+ mw.writeTo(rawMessage);
- String res = rawMessage.toString();
+ assertEquals("X-Value", mw.getHeader("X-Test")[0]);
- boolean found = res.indexOf("X-Test: X-Value") > 0;
- assertEquals(true, found);
+ String res = rawMessage.toString();
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ boolean found = res.indexOf("X-Test: X-Value") > 0;
+ assertEquals(true, found);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[28/34] james-project git commit: JAMES-2085 Run intellij code
inspection to find where log messages can be enhanced
Posted by ad...@apache.org.
JAMES-2085 Run intellij code inspection to find where log messages can be enhanced
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fb09b562
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fb09b562
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fb09b562
Branch: refs/heads/master
Commit: fb09b562114c8480c76c62b795cc4bab78a472ab
Parents: 7342623
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 18:18:58 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:49 2017 +0700
----------------------------------------------------------------------
.../store/json/event/dto/MessageMetaDataDataTransferObject.java | 2 +-
.../java/org/apache/james/imap/processor/SearchProcessor.java | 2 +-
.../org/apache/james/imap/processor/fetch/EnvelopeBuilder.java | 2 +-
.../org/apache/james/mailrepository/file/FileMailRepository.java | 3 +--
.../java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java | 2 +-
.../james/mailetcontainer/lib/AbstractStateMailetProcessor.java | 4 ++--
.../java/org/apache/james/jmap/send/PostDequeueDecorator.java | 2 +-
.../protocols/lib/netty/AbstractConfigurableAsyncServer.java | 2 +-
8 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MessageMetaDataDataTransferObject.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MessageMetaDataDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MessageMetaDataDataTransferObject.java
index 299f906..e7c3e93 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MessageMetaDataDataTransferObject.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MessageMetaDataDataTransferObject.java
@@ -91,7 +91,7 @@ public class MessageMetaDataDataTransferObject {
try {
return new SimpleMessageMetaData(MessageUid.of(uid), modseq, flags.getFlags(), size, parse(date), messageId);
} catch(ParseException parseException) {
- LOG.error("Parse exception while parsing date while deserializing metadata upon event serialization. Using nowadays date instead.");
+ LOG.error("Parse exception while parsing date while deserializing metadata upon event serialization. Using nowadays date instead.", parseException);
return new SimpleMessageMetaData(MessageUid.of(uid), modseq, flags.getFlags(), size, new Date(), messageId);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
index cce35f8..2b556e4 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
@@ -370,7 +370,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp
long modSeq = key.getModSeq();
return SearchQuery.or(SearchQuery.modSeqEquals(modSeq), SearchQuery.modSeqGreaterThan(modSeq));
default:
- session.getLog().warn("Ignoring unknown search key.");
+ session.getLog().warn("Ignoring unknown search key " + type);
return SearchQuery.all();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
index 6b02a7c..b658d51 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
@@ -145,7 +145,7 @@ public final class EnvelopeBuilder {
addresses.add(mailboxAddress);
} else {
- logger.warn("Unknown address type");
+ logger.warn("Unknown address type " + address.getClass());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
index 00f04aa..d92b20e 100644
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
@@ -235,8 +235,7 @@ public class FileMailRepository extends AbstractMailRepository {
remove(key);
}
final String errorMessage = exceptionBuffer.toString();
- getLogger().warn(errorMessage);
- getLogger().debug(errorMessage, re);
+ getLogger().warn(errorMessage, re);
return null;
}
MimeMessageStreamRepositorySource source = new MimeMessageStreamRepositorySource(streamRepository, destination, key);
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
index fafc072..ff0cf09 100644
--- a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
+++ b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
@@ -337,7 +337,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
// so we can't add it to the server list. In this
// case we return an empty list of servers
logBuffer = new StringBuffer(128).append("Couldn't resolve IP address for host ").append(hostname).append(".");
- logger.error(logBuffer.toString());
+ logger.error(logBuffer.toString(), uhe);
}
}
timeMetric.stopAndPublish();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index ab84ba1..1580014 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -429,8 +429,8 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
// error processor. That is currently the
// normal situation for James, and the message
// will show up in the error store.
- String warnBuffer = "Message " + mail.getName() + " reached the end of this processor, and is automatically deleted. This may indicate a configuration error.";
- logger.warn(warnBuffer.toString());
+ logger.warn("Message " + mail.getName() + " reached the end of this processor, and is automatically deleted." +
+ " This may indicate a configuration error.");
}
// Set the mail to ghost state
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java
index 5631c83..ab42ce3 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java
@@ -102,7 +102,7 @@ public class PostDequeueDecorator extends MailQueueItemDecorator {
try {
messageIdFactory.fromString((String) messageId);
} catch (Exception e) {
- LOG.error("Invalid messageId: " + messageId);
+ LOG.error("Invalid messageId: " + messageId, e);
return false;
}
return true;
http://git-wip-us.apache.org/repos/asf/james-project/blob/fb09b562/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index 4556ea2..c1ebb81 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -501,7 +501,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
try {
bind();
} catch (Exception e) {
- logger.error("Unable to start server");
+ logger.error("Unable to start server", e);
return false;
}
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[22/34] james-project git commit: JAMES-2085 Enhance a bit log
formatting
Posted by ad...@apache.org.
JAMES-2085 Enhance a bit log formatting
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ad20e72a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ad20e72a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ad20e72a
Branch: refs/heads/master
Commit: ad20e72a3a6d7f1283b86ee512469f969b89a5fa
Parents: 0d92911
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 17:04:25 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../mailrepositorystore/MailRepositoryStoreBeanFactory.java | 9 +--------
.../AddressesArrayToMailAddressListConverter.java | 2 +-
.../apache/james/imapserver/netty/ImapIdleStateHandler.java | 4 +++-
.../lib/netty/AbstractConfigurableAsyncServer.java | 9 +++------
4 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ad20e72a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index 65e0b78..3ef99be 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -122,14 +122,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
}
if (infoEnabled) {
- StringBuilder infoBuffer = new StringBuilder(128);
- infoBuffer.append("Registering Repository instance of class ");
- infoBuffer.append(className);
- infoBuffer.append(" to handle ");
- infoBuffer.append(protocol);
- infoBuffer.append(" protocol requests for repositories with key ");
- infoBuffer.append(protocol);
- getLogger().info(infoBuffer.toString());
+ getLogger().info("Registering Repository instance of class {} to handle {} protocol requests", className, protocol);
}
if (classes.get(protocol) != null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/ad20e72a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java
index 8d7dcec..1f308bb 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java
@@ -46,7 +46,7 @@ public class AddressesArrayToMailAddressListConverter {
try {
return Optional.of(new MailAddress(input.toString()));
} catch (AddressException e) {
- logger.debug("Can't parse unsent address: {}", e.getMessage());
+ logger.debug("Can't parse unsent address " + input, e);
return Optional.absent();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ad20e72a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
index a77c00e..fd27f8d 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
@@ -40,7 +40,9 @@ public class ImapIdleStateHandler extends IdleStateAwareChannelHandler implement
ImapSession session = (ImapSession) attributes.get(ctx.getChannel());
InetSocketAddress address = (InetSocketAddress) ctx.getChannel().getRemoteAddress();
- session.getLog().info("Logout client " + address.getHostName() + " (" + address.getAddress().getHostAddress() + ") because it idled for too long...");
+ session.getLog().info("Logout client {} ({}) because it idled for too long...",
+ address.getHostName(),
+ address.getAddress().getHostAddress());
// logout the client
session.logout();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ad20e72a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
index 211dd74..4556ea2 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -185,8 +185,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
}
address = new InetSocketAddress(ip, port);
- String infoBuffer = getServiceType() + " bound to: " + ip + ":" + port;
- logger.info(infoBuffer);
+ logger.info(getServiceType() + " bound to: " + ip + ":" + port);
bindAddresses.add(address);
}
@@ -346,8 +345,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
hostName = "localhost";
}
- infoBuffer = new StringBuilder(64).append(getServiceType()).append(" is running on: ").append(hostName);
- getLogger().info(infoBuffer.toString());
+ getLogger().info("{} is running on: {}", getServiceType(), hostName);
boolean autodetect = handlerConfiguration.getBoolean(HELLO_NAME + ".[@autodetect]", true);
if (autodetect) {
@@ -359,8 +357,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
}
}
- infoBuffer = new StringBuilder(64).append(getServiceType()).append(" handler hello name is: ").append(helloName);
- getLogger().info(infoBuffer.toString());
+ getLogger().info("{} handler hello name is: {}", getServiceType(), helloName);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[10/34] james-project git commit: JAMES-2085 Avoid rethrowing an
exception in AbstractFileRepository
Posted by ad...@apache.org.
JAMES-2085 Avoid rethrowing an exception in AbstractFileRepository
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3f97dd75
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3f97dd75
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3f97dd75
Branch: refs/heads/master
Commit: 3f97dd75ba01006713038b77da0076f447bde4fc
Parents: abf61ef
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 15:54:48 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../repository/file/AbstractFileRepository.java | 39 +++++++++-----------
1 file changed, 17 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3f97dd75/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
index 8531c69..7ceb96d 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
@@ -118,29 +118,24 @@ public abstract class AbstractFileRepository implements Repository, Configurable
FilenameFilter num_filter = new NumberedRepositoryFileFilter(getExtensionDecorator());
final String[] names = directory.list(num_filter);
- try {
- for (String origFilename : names) {
- // This needs to handle (skip over) the possible repository
- // numbers
- int pos = origFilename.length() - m_postfix.length();
- while (pos >= 1 && Character.isDigit(origFilename.charAt(pos - 1))) {
- pos--;
- }
- pos -= ".".length() + m_name.length();
- String newFilename = origFilename.substring(0, pos) + m_extension;
-
- File origFile = new File(directory, origFilename);
- File newFile = new File(directory, newFilename);
-
- if (origFile.renameTo(newFile)) {
- getLogger().info("Renamed " + origFile + " to " + newFile);
- } else {
- getLogger().info("Unable to rename " + origFile + " to " + newFile);
- }
+ for (String origFilename : names) {
+ // This needs to handle (skip over) the possible repository
+ // numbers
+ int pos = origFilename.length() - m_postfix.length();
+ while (pos >= 1 && Character.isDigit(origFilename.charAt(pos - 1))) {
+ pos--;
+ }
+ pos -= ".".length() + m_name.length();
+ String newFilename = origFilename.substring(0, pos) + m_extension;
+
+ File origFile = new File(directory, origFilename);
+ File newFile = new File(directory, newFilename);
+
+ if (origFile.renameTo(newFile)) {
+ getLogger().info("Renamed " + origFile + " to " + newFile);
+ } else {
+ getLogger().info("Unable to rename " + origFile + " to " + newFile);
}
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[04/34] james-project git commit: JAMES-2085 Increase logging level
in ListeningMessageSearchIndex
Posted by ad...@apache.org.
JAMES-2085 Increase logging level in ListeningMessageSearchIndex
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bbba86f5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bbba86f5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bbba86f5
Branch: refs/heads/master
Commit: bbba86f5f8bf03ace54f9a43f0b303bc0efe6000
Parents: cb181ca
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 10:40:01 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:28 2017 +0700
----------------------------------------------------------------------
...lasticSearchListeningMessageSearchIndex.java | 22 ++++++++++++--------
.../store/search/LazyMessageSearchIndex.java | 3 +--
.../search/ListeningMessageSearchIndex.java | 9 ++++----
.../mailbox/store/search/MessageSearches.java | 2 +-
4 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbba86f5/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
index bfd8c1f..aca1dc7 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
@@ -117,18 +117,19 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
indexer.indexMessage(indexIdFor(mailbox, message.getUid()), messageToElasticSearchJson.convertToJson(message, ImmutableList.of(session.getUser())));
} catch (Exception e) {
try {
- LOGGER.warn("Indexing mailbox {}-{} of user {} on message {} without attachments ",
+ LOGGER.warn(String.format("Indexing mailbox %s-%s of user %s on message %s without attachments ",
mailbox.getName(),
- mailbox.getMailboxId(),
+ mailbox.getMailboxId().serialize(),
session.getUser().getUserName(),
- message.getUid());
+ message.getUid().toString()),
+ e);
indexer.indexMessage(indexIdFor(mailbox, message.getUid()), messageToElasticSearchJson.convertToJsonWithoutAttachment(message, ImmutableList.of(session.getUser())));
} catch (JsonProcessingException e1) {
- LOGGER.error("Error when indexing mailbox {}-{} of user {} on message {} without its attachment",
+ LOGGER.error(String.format("Error when indexing mailbox %s-%s of user %s on message %s without its attachment",
mailbox.getName(),
- mailbox.getMailboxId(),
+ mailbox.getMailboxId().serialize(),
session.getUser().getUserName(),
- message.getUid(),
+ message.getUid().toString()),
e1);
}
}
@@ -141,7 +142,10 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
.map(uid -> indexIdFor(mailbox, uid))
.collect(Collectors.toList()));
} catch (Exception e) {
- LOGGER.error("Error when deleting messages {} in mailbox {} from index", mailbox.getMailboxId().serialize(), expungedUids, e);
+ LOGGER.error(String.format("Error when deleting messages %s in mailbox %s from index",
+ mailbox.getMailboxId().serialize(),
+ ImmutableList.copyOf(expungedUids).toString()),
+ e);
}
}
@@ -153,7 +157,7 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
JsonMessageConstants.MAILBOX_ID,
mailbox.getMailboxId().serialize()));
} catch (Exception e) {
- LOGGER.error("Error when deleting all messages in mailbox {}", mailbox.getMailboxId().serialize(), e);
+ LOGGER.error(String.format("Error when deleting all messages in mailbox %s", mailbox.getMailboxId().serialize()), e);
}
}
@@ -164,7 +168,7 @@ public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSe
.map(updatedFlags -> createUpdatedDocumentPartFromUpdatedFlags(mailbox, updatedFlags))
.collect(Collectors.toList()));
} catch (Exception e) {
- LOGGER.error("Error when updating index on mailbox {}", mailbox.getMailboxId().serialize(), e);
+ LOGGER.error(String.format("Error when updating index on mailbox %s", mailbox.getMailboxId().serialize()), e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbba86f5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
index 07c6188..c3ec988 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
@@ -110,9 +110,8 @@ public class LazyMessageSearchIndex extends ListeningMessageSearchIndex {
try {
add(session, mailbox, message);
} catch (MailboxException e) {
- session.getLog().debug("Unable to index message " + message.getUid() + " in mailbox " + mailbox.getName(), e);
+ session.getLog().error("Unable to index message " + message.getUid() + " in mailbox " + mailbox.getName(), e);
}
-
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbba86f5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
index 6cc40b9..11464d3 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java
@@ -83,7 +83,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
try {
add(session, mailbox, message);
} catch (MailboxException e) {
- session.getLog().debug("Unable to index message " + message.getUid() + " for mailbox " + mailbox, e);
+ session.getLog().error("Unable to index message " + message.getUid() + " for mailbox " + mailbox, e);
}
}
@@ -93,7 +93,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
try {
delete(session, expunged.getMailbox(), expunged.getUids());
} catch (MailboxException e) {
- session.getLog().debug("Unable to deleted messages " + expunged.getUids() + " from index for mailbox " + expunged.getMailbox(), e);
+ session.getLog().error("Unable to deleted messages " + expunged.getUids() + " from index for mailbox " + expunged.getMailbox(), e);
}
} else if (event instanceof EventFactory.FlagsUpdatedImpl) {
EventFactory.FlagsUpdatedImpl flagsUpdated = (EventFactory.FlagsUpdatedImpl) event;
@@ -102,15 +102,14 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex,
try {
update(session, mailbox, flagsUpdated.getUpdatedFlags());
} catch (MailboxException e) {
- session.getLog().debug("Unable to update flags in index for mailbox " + mailbox, e);
+ session.getLog().error("Unable to update flags in index for mailbox " + mailbox, e);
}
}
} else if (event instanceof EventFactory.MailboxDeletionImpl) {
deleteAll(session, ((EventFactory.MailboxDeletionImpl) event).getMailbox());
}
} catch (MailboxException e) {
- session.getLog().debug("Unable to update index", e);
-
+ session.getLog().error("Unable to update index", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbba86f5/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
index ae5690e..84dc5fc 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
@@ -116,7 +116,7 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search
}
} catch (MailboxException e) {
if (session != null && session.getLog() != null) {
- session.getLog().debug("Unable to search message " + m.getUid(), e);
+ session.getLog().error("Unable to search message " + m.getUid(), e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[08/34] james-project git commit: JAMES-2085 IMAP should consider raw
MailboxException as unexpected
Posted by ad...@apache.org.
JAMES-2085 IMAP should consider raw MailboxException as unexpected
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0ddf44bf
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0ddf44bf
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0ddf44bf
Branch: refs/heads/master
Commit: 0ddf44bf5e74f2c2a444f12b0acf9c369637b622
Parents: 624cd01
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 11:51:32 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:43 2017 +0700
----------------------------------------------------------------------
.../imap/api/display/HumanReadableText.java | 6 +++++
.../imap/processor/AbstractAuthProcessor.java | 4 +---
.../processor/AbstractMailboxProcessor.java | 3 +--
.../AbstractMessageRangeProcessor.java | 9 +++----
.../processor/AbstractSelectionProcessor.java | 2 +-
.../james/imap/processor/AppendProcessor.java | 19 ++++-----------
.../james/imap/processor/CloseProcessor.java | 4 +---
.../james/imap/processor/CreateProcessor.java | 4 +---
.../imap/processor/DeleteACLProcessor.java | 6 +----
.../james/imap/processor/DeleteProcessor.java | 4 +---
.../james/imap/processor/ExpungeProcessor.java | 4 +---
.../james/imap/processor/GetACLProcessor.java | 6 +----
.../imap/processor/GetAnnotationProcessor.java | 2 +-
.../james/imap/processor/IdleProcessor.java | 11 +++------
.../james/imap/processor/LSubProcessor.java | 4 +---
.../james/imap/processor/ListProcessor.java | 25 ++++----------------
.../imap/processor/ListRightsProcessor.java | 6 +----
.../james/imap/processor/LogoutProcessor.java | 4 +---
.../james/imap/processor/MyRightsProcessor.java | 5 +---
.../james/imap/processor/RenameProcessor.java | 6 ++---
.../james/imap/processor/SearchProcessor.java | 4 +---
.../james/imap/processor/SetACLProcessor.java | 6 +----
.../imap/processor/SetAnnotationProcessor.java | 2 +-
.../james/imap/processor/StatusProcessor.java | 4 +---
.../james/imap/processor/StoreProcessor.java | 8 +++----
.../imap/processor/SystemMessageProcessor.java | 6 ++---
.../processor/base/SelectedMailboxImpl.java | 4 +---
.../processor/fetch/ContentBodyElement.java | 2 +-
.../imap/processor/fetch/FetchProcessor.java | 12 ++++------
29 files changed, 55 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
index 57a98e0..d126f2e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
@@ -25,6 +25,8 @@ import javax.mail.Flags;
import org.apache.james.imap.api.ImapConstants;
+import com.google.common.base.Joiner;
+
/**
* Keys human response text that may be displayed to the user.
*/
@@ -259,4 +261,8 @@ public class HumanReadableText {
public String toString() {
return defaultValue;
}
+
+ public String asString() {
+ return key + " " + defaultValue + "[" + Joiner.on(", ").join(parameters) + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 54b5d4f..8f7fbd0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -77,9 +77,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
manageFailureCount(session, tag, command, responder, failed);
}
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Login failed", e);
- }
+ session.getLog().error("Error encountered while login", e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index 59fb616..66e828f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -320,8 +320,7 @@ abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
}
private void handleResponseException(ImapProcessor.Responder responder, MailboxException e, HumanReadableText message, ImapSession session) {
- session.getLog().info(message.toString());
- session.getLog().debug(message.toString(), e);
+ session.getLog().error(message.toString(), e);
// TODO: consider whether error message should be passed to the user
final StatusResponse response = factory.untaggedNo(message);
responder.respond(response);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
index e845096..7a58e67 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
@@ -42,6 +42,9 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.metrics.api.MetricFactory;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRangeRequest> extends AbstractMailboxProcessor<M> {
public AbstractMessageRangeProcessor(Class<M> acceptableClass, ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
@@ -104,13 +107,11 @@ public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRan
}
} catch (MessageRangeException e) {
if (session.getLog().isDebugEnabled()) {
- session.getLog().debug(getOperationName() + " failed from mailbox " + currentMailbox.getPath() + " to " + targetMailbox + " for invalid sequence-set " + idSet.toString(), e);
+ session.getLog().debug(getOperationName() + " failed from mailbox " + currentMailbox.getPath() + " to " + targetMailbox + " for invalid sequence-set " + ImmutableList.copyOf(idSet), e);
}
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info(getOperationName() + " failed from mailbox " + currentMailbox.getPath() + " to " + targetMailbox + " for sequence-set " + idSet.toString(), e);
- }
+ session.getLog().error(getOperationName() + " failed from mailbox " + currentMailbox.getPath() + " to " + targetMailbox + " for sequence-set " + ImmutableList.copyOf(idSet), e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
index e5a98c0..4a80611 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
@@ -92,7 +92,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
session.getLog().debug("Select failed as mailbox does not exist " + mailboxName, e);
responder.respond(statusResponseFactory.taggedNo(tag, command, HumanReadableText.FAILURE_NO_SUCH_MAILBOX));
} catch (MailboxException e) {
- session.getLog().info("Select failed for mailbox " + mailboxName , e);
+ session.getLog().error("Select failed for mailbox " + mailboxName , e);
no(command, tag, responder, HumanReadableText.SELECT);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
index 2d976c7..5bc46fd 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
@@ -88,7 +88,7 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> {
// consume message on exception
consume(messageIn);
- session.getLog().info("Append failed for mailbox " + mailboxPath, e);
+ session.getLog().error("Append failed for mailbox " + mailboxPath, e);
// Some other issue
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
@@ -121,11 +121,7 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> {
* not null
*/
private void tryCreate(ImapSession session, String tag, ImapCommand command, Responder responder, MailboxNotFoundException e) {
-
- final Logger logger = session.getLog();
- if (logger.isDebugEnabled()) {
- logger.debug("Cannot open mailbox: ", e);
- }
+ session.getLog().debug("Cannot open mailbox: ", e);
no(command, tag, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX, StatusResponse.ResponseCode.tryCreate());
}
@@ -146,21 +142,14 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> {
unsolicitedResponses(session, responder, false);
- // in case of MULTIAPPEND support we will push more then one UID
- // here
+ // in case of MULTIAPPEND support we will push more then one UID here
okComplete(command, tag, ResponseCode.appendUid(uidValidity, new UidRange[] { new UidRange(messageId.getUid()) }), responder);
} catch (MailboxNotFoundException e) {
// Indicates that the mailbox does not exist
// So TRY CREATE
tryCreate(session, tag, command, responder, e);
- /*
- * } catch (StorageException e) { taggedBad(command, tag, responder,
- * e.getKey());
- */
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Unable to append message to mailbox " + mailboxPath, e);
- }
+ session.getLog().error("Unable to append message to mailbox " + mailboxPath, e);
// Some other issue
no(command, tag, responder, HumanReadableText.SAVE_FAILED);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
index 477ded2..195086b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
@@ -57,9 +57,7 @@ public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> {
}
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Close failed for mailbox " + session.getSelected().getPath() , e);
- }
+ session.getLog().error("Close failed for mailbox " + session.getSelected().getPath() , e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
index 36c7385..66ad8ed 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
@@ -66,9 +66,7 @@ public class CreateProcessor extends AbstractMailboxProcessor<CreateRequest> {
}
taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Create failed for mailbox " + mailboxPath, e);
- }
+ session.getLog().error("Create failed for mailbox " + mailboxPath, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
index 86d5a14..742b4dc 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java
@@ -43,7 +43,6 @@ import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.apache.james.metrics.api.MetricFactory;
-import org.slf4j.Logger;
/**
* DELETEACL Processor.
@@ -128,10 +127,7 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques
} catch (MailboxNotFoundException e) {
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- Logger log = session.getLog();
- if (log.isInfoEnabled()) {
- log.info(command.getName() +" failed for mailbox " + mailboxName, e);
- }
+ session.getLog().error(command.getName() +" failed for mailbox " + mailboxName, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
index 4b212a9..20b2be7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
@@ -71,9 +71,7 @@ public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> {
}
taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Delete failed for mailbox " + mailboxPath, e);
- }
+ session.getLog().error("Delete failed for mailbox " + mailboxPath, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
index 8e6bb15..bca50c3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
@@ -99,9 +99,7 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i
}
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Expunge failed for mailbox " + session.getSelected().getPath(), e);
- }
+ session.getLog().error("Expunge failed for mailbox " + session.getSelected().getPath(), e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
index 2e7edf9..25270f5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.exception.MailboxNotFoundException;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.apache.james.metrics.api.MetricFactory;
-import org.slf4j.Logger;
/**
* GETACL Processor.
@@ -102,10 +101,7 @@ public class GetACLProcessor extends AbstractMailboxProcessor<GetACLRequest> imp
} catch (MailboxNotFoundException e) {
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- Logger log = session.getLog();
- if (log.isInfoEnabled()) {
- log.info(command.getName() +" failed for mailbox " + mailboxName, e);
- }
+ session.getLog().error(command.getName() +" failed for mailbox " + mailboxName, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
index 03fdfff..c68cb76 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java
@@ -69,7 +69,7 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati
session.getLog().info("The command: {} is failed because not found mailbox {}", command.getName(), message.getMailboxName());
no(command, tag, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX, ResponseCode.tryCreate());
} catch (MailboxException e) {
- session.getLog().info("The command: {} on mailbox {} is failed", command.getName(), message.getMailboxName());
+ session.getLog().error("GetAnnotation on mailbox " + message.getMailboxName() + " failed for user " + ImapSessionUtils.getUserName(session), e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
index 46cf5e3..e02043a 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
@@ -82,7 +82,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme
final MailboxManager mailboxManager = getMailboxManager();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
final SelectedMailbox sm = session.getSelected();
- final MailboxListener idleListener;
+ final IdleMailboxListener idleListener;
if (sm != null) {
idleListener = new IdleMailboxListener(session, responder);
mailboxManager.addListener(sm.getPath(), idleListener , mailboxSession);
@@ -111,9 +111,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme
try {
mailboxManager.removeListener(sm.getPath(), idleListener, mailboxSession);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Unable to remove idle listener from mailbox", e);
- }
+ session.getLog().error("Unable to remove idle listener for mailbox {0}", sm.getPath(), e);
}
}
session.popLineHandler();
@@ -161,10 +159,7 @@ public class IdleProcessor extends AbstractMailboxProcessor<IdleRequest> impleme
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Enable idle for " + session.getSelected().getPath() + " failed", e);
- }
- // TODO: What should we do here?
+ session.getLog().error("Enable idle for " + session.getSelected().getPath() + " failed", e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
index 7a3cba0..f062ec0 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
@@ -126,9 +126,7 @@ public class LSubProcessor extends AbstractSubscriptionProcessor<LsubRequest> {
okComplete(command, tag, responder);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("LSub failed for reference " + referenceName + " and pattern " + mailboxPattern, e);
- }
+ session.getLog().error("LSub failed for reference " + referenceName + " and pattern " + mailboxPattern, e);
final HumanReadableText displayTextKey = HumanReadableText.GENERIC_LSUB_FAILURE;
no(command, tag, responder, displayTextKey);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
index 7004737..8a450c2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java
@@ -92,15 +92,13 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> {
* @param responder
*/
protected final void doProcess(String referenceName, String mailboxName, ImapSession session, String tag, ImapCommand command, Responder responder, MailboxTyper mailboxTyper) {
+ String user = ImapSessionUtils.getUserName(session);
+ final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
try {
// Should the namespace section be returned or not?
final boolean isRelative;
-
final List<MailboxMetaData> results;
- final String user = ImapSessionUtils.getUserName(session);
- final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
-
if (mailboxName.length() == 0) {
// An empty mailboxName signifies a request for the hierarchy
// delimiter and root name of the referenceName argument
@@ -127,31 +125,18 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> {
results = new ArrayList<MailboxMetaData>(1);
results.add(new MailboxMetaData() {
- /**
- * @see org.apache.james.mailbox.MailboxMetaData#inferiors()
- */
public Children inferiors() {
return Children.CHILDREN_ALLOWED_BUT_UNKNOWN;
}
- /**
- * @see org.apache.james.mailbox.MailboxMetaData#getSelectability()
- */
public Selectability getSelectability() {
return Selectability.NOSELECT;
}
-
- /**
- * @see org.apache.james.mailbox.MailboxMetaData#getHierarchyDelimiter()
- */
+
public char getHierarchyDelimiter() {
return mailboxSession.getPathDelimiter();
}
- /**
- * (non-Javadoc)
- * @see org.apache.james.mailbox.MailboxMetaData#getPath()
- */
public MailboxPath getPath() {
return rootPath;
}
@@ -190,9 +175,7 @@ public class ListProcessor extends AbstractMailboxProcessor<ListRequest> {
okComplete(command, tag, responder);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("List failed", e);
- }
+ session.getLog().error("List failed for mailboxName " + mailboxName + " and user" + user, e);
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
index cb69d0e..cb8c7a6 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.apache.james.metrics.api.MetricFactory;
-import org.slf4j.Logger;
/**
* LISTRIGHTS Processor.
@@ -118,10 +117,7 @@ public class ListRightsProcessor extends AbstractMailboxProcessor<ListRightsRequ
} catch (MailboxNotFoundException e) {
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- Logger log = session.getLog();
- if (log.isInfoEnabled()) {
- log.info(command.getName() +" failed for mailbox " + mailboxName, e);
- }
+ session.getLog().error(command.getName() + " failed for mailbox " + mailboxName, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
index f15dc18..acec17c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
@@ -46,9 +46,7 @@ public class LogoutProcessor extends AbstractMailboxProcessor<LogoutRequest> {
bye(responder);
okComplete(command, tag, responder);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Logout failed", e);
- }
+ session.getLog().error("Logout failed for user " + mailboxSession.getUser().getUserName(), e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
index aad1ad5..d011ff5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java
@@ -99,10 +99,7 @@ public class MyRightsProcessor extends AbstractMailboxProcessor<MyRightsRequest>
} catch (MailboxNotFoundException e) {
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- Logger log = session.getLog();
- if (log.isInfoEnabled()) {
- log.info(command.getName() + " failed for mailbox " + mailboxName, e);
- }
+ session.getLog().error(command.getName() + " failed for mailbox " + mailboxName, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
index a52aa3a..2ce9187 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
@@ -61,7 +61,7 @@ public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> {
MailboxSession mailboxsession = ImapSessionUtils.getMailboxSession(session);
mailboxManager.renameMailbox(existingPath, newPath, mailboxsession);
- if (existingPath.getName().equalsIgnoreCase(ImapConstants.INBOX_NAME) && mailboxManager.mailboxExists(existingPath, mailboxsession) == false) {
+ if (existingPath.getName().equalsIgnoreCase(ImapConstants.INBOX_NAME) && !mailboxManager.mailboxExists(existingPath, mailboxsession)) {
mailboxManager.createMailbox(existingPath, mailboxsession);
}
okComplete(command, tag, responder);
@@ -82,9 +82,7 @@ public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> {
}
taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Rename from " + existingPath + " to " + newPath + " failed", e);
- }
+ session.getLog().error("Rename from " + existingPath + " to " + newPath + " failed", e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
index c3ca21f..cce35f8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
@@ -204,9 +204,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp
}
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Search failed in mailbox " + session.getSelected().getPath(), e);
- }
+ session.getLog().error("Search failed in mailbox " + session.getSelected().getPath(), e);
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
if (resultOptions.contains(SearchResultOption.SAVE)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
index e37da8f..8d26d3e 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java
@@ -45,7 +45,6 @@ import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.apache.james.metrics.api.MetricFactory;
-import org.slf4j.Logger;
/**
* SETACL Processor.
@@ -148,10 +147,7 @@ public class SetACLProcessor extends AbstractMailboxProcessor<SetACLRequest> imp
} catch (MailboxNotFoundException e) {
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- Logger log = session.getLog();
- if (log.isInfoEnabled()) {
- log.info(command.getName() +" failed for mailbox " + mailboxName, e);
- }
+ session.getLog().error(command.getName() + " failed for mailbox " + mailboxName, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
index 69223a5..774b74d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SetAnnotationProcessor.java
@@ -70,7 +70,7 @@ public class SetAnnotationProcessor extends AbstractMailboxProcessor<SetAnnotati
session.getLog().info(command.getName() + " failed for mailbox " + mailboxName, e);
no(command, tag, responder, new HumanReadableText(HumanReadableText.MAILBOX_ANNOTATION_KEY, e.getMessage()));
} catch (MailboxException e) {
- session.getLog().info(command.getName() + " failed for mailbox " + mailboxName, e);
+ session.getLog().error(command.getName() + " failed for mailbox " + mailboxName, e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
index 3d806c4..8b10e8c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
@@ -91,9 +91,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
okComplete(command, tag, responder);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Status failed for mailbox " + mailboxPath, e);
- }
+ session.getLog().error("Status failed for mailbox " + mailboxPath, e);
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
index 4919cab..d9e213b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
@@ -57,6 +57,8 @@ import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MessageResultIterator;
import org.apache.james.metrics.api.MetricFactory;
+import com.google.common.collect.ImmutableList;
+
public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
/**
@@ -210,13 +212,11 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
}
} catch (MessageRangeException e) {
if (session.getLog().isDebugEnabled()) {
- session.getLog().debug("Store failed for mailbox " + session.getSelected().getPath() + " because of an invalid sequence-set " + idSet.toString(), e);
+ session.getLog().debug("Store failed for mailbox " + session.getSelected().getPath() + " because of an invalid sequence-set " + ImmutableList.copyOf(idSet), e);
}
taggedBad(imapCommand, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Store failed for mailbox " + session.getSelected().getPath(), e);
- }
+ session.getLog().error("Store failed for mailbox " + session.getSelected().getPath() + " and sequence-set " + ImmutableList.copyOf(idSet), e);
no(imapCommand, tag, responder, HumanReadableText.SAVE_FAILED);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
index 9f3db77..07f881c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
@@ -49,13 +49,11 @@ public class SystemMessageProcessor extends AbstractChainedProcessor<SystemMessa
forceLogout(session);
break;
default:
+ session.getLog().info("Unknown system message " + message);
break;
}
} catch (MailboxException e) {
- final Logger log = session.getLog();
- if (log.isDebugEnabled()) {
- log.debug("Cannot force logout", e);
- }
+ session.getLog().error("Cannot force logout", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
index d56c6ef..103369d 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
@@ -121,9 +121,7 @@ public class SelectedMailboxImpl implements SelectedMailbox, MailboxListener{
try {
mailboxManager.removeListener(path, this, mailboxSession);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Unable to remove listener " + this + " from mailbox while closing it", e);
- }
+ session.getLog().error("Unable to remove listener " + this + " from mailbox while closing it", e);
}
uidMsnConverter.clear();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
index fef9c65..5d87729 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/ContentBodyElement.java
@@ -55,7 +55,7 @@ class ContentBodyElement implements BodyElement {
try {
return content.size();
} catch (MailboxException e) {
- throw new IOException("Unable to get size for body element",e);
+ throw new IOException("Unable to get size for body element", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0ddf44bf/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
index 6072e15..a02fdd1 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
@@ -51,6 +51,8 @@ import org.apache.james.mailbox.model.MessageResult.MimePath;
import org.apache.james.mailbox.model.MessageResultIterator;
import org.apache.james.metrics.api.MetricFactory;
+import com.google.common.collect.ImmutableList;
+
public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
public FetchProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory,
@@ -127,13 +129,11 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
okComplete(command, tag, responder);
} catch (MessageRangeException e) {
if (session.getLog().isDebugEnabled()) {
- session.getLog().debug("Fetch failed for mailbox " + session.getSelected().getPath() + " because of invalid sequence-set " + idSet.toString(), e);
+ session.getLog().debug("Fetch failed for mailbox " + session.getSelected().getPath() + " because of invalid sequence-set " + ImmutableList.copyOf(idSet), e);
}
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (session.getLog().isInfoEnabled()) {
- session.getLog().info("Fetch failed for mailbox " + session.getSelected().getPath() + " and sequence-set " + idSet.toString(), e);
- }
+ session.getLog().error("Fetch failed for mailbox " + session.getSelected().getPath() + " and sequence-set " + ImmutableList.copyOf(idSet), e);
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
@@ -181,9 +181,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
// So we just skip it
//
// See IMAP-347
- if (session.getLog().isDebugEnabled()) {
- session.getLog().debug("Unable to fetch message with uid " + result.getUid() + ", so skip it", e);
- }
+ session.getLog().error("Unable to fetch message with uid " + result.getUid() + ", so skip it", e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[32/34] james-project git commit: JAMES-2085 Rely more on Log string
formatting
Posted by ad...@apache.org.
JAMES-2085 Rely more on Log string formatting
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/550c1c5c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/550c1c5c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/550c1c5c
Branch: refs/heads/master
Commit: 550c1c5ccdf977b80fcd237ced87318d40f7c636
Parents: c5758e6
Author: benwa <bt...@linagora.com>
Authored: Wed Jul 5 09:26:59 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:14:08 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/mailbox/jpa/migrator/JpaMigrator.java | 4 ++--
.../org/apache/james/imap/processor/SearchProcessor.java | 2 +-
.../apache/james/imap/processor/fetch/EnvelopeBuilder.java | 2 +-
.../apache/james/mailrepository/jcr/JCRMailRepository.java | 8 +++-----
.../apache/james/repository/file/AbstractFileRepository.java | 4 ++--
.../mailetcontainer/lib/AbstractStateMailetProcessor.java | 4 ++--
6 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/550c1c5c/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
index 2eea2e0..a557acc 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
@@ -60,11 +60,11 @@ public class JpaMigrator {
for (String jira: jiras) {
JpaMigrateCommand jiraJpaMigratable = (JpaMigrateCommand) Class.forName(JPA_MIGRATION_COMMAND_PACKAGE + "." + jira.toUpperCase(Locale.US) + JpaMigrateCommand.class.getSimpleName()).newInstance();
- LOGGER.info("Now executing " + jira + " migration.");
+ LOGGER.info("Now executing {} migration", jira);
em.getTransaction().begin();
jiraJpaMigratable.migrate(em);
em.getTransaction().commit();
- LOGGER.info(jira + " migration is successfully achieved.");
+ LOGGER.info("{} migration is successfully achieved", jira);
}
} catch (Throwable t) {
throw new JpaMigrateException(t);
http://git-wip-us.apache.org/repos/asf/james-project/blob/550c1c5c/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
index 2b556e4..2713d73 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
@@ -370,7 +370,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp
long modSeq = key.getModSeq();
return SearchQuery.or(SearchQuery.modSeqEquals(modSeq), SearchQuery.modSeqGreaterThan(modSeq));
default:
- session.getLog().warn("Ignoring unknown search key " + type);
+ session.getLog().warn("Ignoring unknown search key {}", type);
return SearchQuery.all();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/550c1c5c/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
index b658d51..1c1eff1 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
@@ -145,7 +145,7 @@ public final class EnvelopeBuilder {
addresses.add(mailboxAddress);
} else {
- logger.warn("Unknown address type " + address.getClass());
+ logger.warn("Unknown address type {}", address.getClass());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/550c1c5c/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
index 9e4c7bd..0c76f8d 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
@@ -65,8 +65,6 @@ import org.apache.mailet.MailAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import sun.misc.IOUtils;
-
/**
* Mail repository that is backed by a JCR content repository.
*/
@@ -618,9 +616,9 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
nodes.nextNode().remove();
}
session.save();
- LOGGER.info("Mail " + key + " removed from repository");
+ LOGGER.info("Mail {} removed from repository", key);
} else {
- LOGGER.warn("Mail " + key + " not found");
+ LOGGER.warn("Mail {} not found", key);
}
} finally {
session.logout();
@@ -655,7 +653,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
setMail(node, mail);
}
session.save();
- LOGGER.info("Mail " + mail.getName() + " stored in repository");
+ LOGGER.info("Mail {} stored in repository", mail.getName());
} finally {
session.logout();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/550c1c5c/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
index 7ceb96d..3f6409e 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
@@ -132,9 +132,9 @@ public abstract class AbstractFileRepository implements Repository, Configurable
File newFile = new File(directory, newFilename);
if (origFile.renameTo(newFile)) {
- getLogger().info("Renamed " + origFile + " to " + newFile);
+ getLogger().info("Renamed {} to {}", origFile, newFile);
} else {
- getLogger().info("Unable to rename " + origFile + " to " + newFile);
+ getLogger().info("Unable to rename {} to {}", origFile, newFile);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/550c1c5c/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index 1580014..2086e40 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -429,8 +429,8 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
// error processor. That is currently the
// normal situation for James, and the message
// will show up in the error store.
- logger.warn("Message " + mail.getName() + " reached the end of this processor, and is automatically deleted." +
- " This may indicate a configuration error.");
+ logger.warn("Message {} reached the end of this processor, and is automatically deleted. " +
+ "This may indicate a configuration error.", mail.getName());
}
// Set the mail to ghost state
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[26/34] james-project git commit: JAMES-2085 JpaMigratorTest should
not be commented and should not print stacktraces
Posted by ad...@apache.org.
JAMES-2085 JpaMigratorTest should not be commented and should not print stacktraces
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/11f5efa3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/11f5efa3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/11f5efa3
Branch: refs/heads/master
Commit: 11f5efa36176d8413507cc6ed240cffc2f6c07b2
Parents: 99b4987
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:22:42 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../mailbox/jpa/migrator/JpaMigratorTest.java | 58 ++++++--------------
1 file changed, 17 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/11f5efa3/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
index ca83271..b3de9cb 100644
--- a/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
+++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
@@ -18,65 +18,41 @@
****************************************************************/
package org.apache.james.mailbox.jpa.migrator;
+import org.junit.Ignore;
import org.junit.Test;
-/**
- * TODO this test class needs to be reviewed.
- */
+// TODO
+@Ignore("This class needs to be reviewed")
public class JpaMigratorTest {
-
- @Test()
- public void testImap165() {
-// try {
-// JpaMigrator.main(new String[]{"IMAP165"});
-// } catch (JpaMigrateException e) {
-// e.printStackTrace();
-// }
+
+ @Test
+ public void testImap165() throws Exception {
+ JpaMigrator.main(new String[]{"IMAP165"});
}
@Test()
- public void testImap168() {
-// try {
-// JpaMigrator.main(new String[]{"IMAP168"});
-// } catch (JpaMigrateException e) {
-// e.printStackTrace();
-// }
+ public void testImap168() throws Exception {
+ JpaMigrator.main(new String[]{"IMAP168"});
}
@Test()
- public void testImap172() {
-// try {
-// JpaMigrator.main(new String[]{"IMAP172"});
-// } catch (JpaMigrateException e) {
-// e.printStackTrace();
-// }
+ public void testImap172() throws Exception {
+ JpaMigrator.main(new String[]{"IMAP172"});
}
@Test()
- public void testImap176() {
-// try {
-// JpaMigrator.main(new String[]{"IMAP176"});
-// } catch (JpaMigrateException e) {
-// e.printStackTrace();
-// }
+ public void testImap176() throws Exception {
+ JpaMigrator.main(new String[]{"IMAP176"});
}
@Test()
- public void testImap180() {
-// try {
-// JpaMigrator.main(new String[]{"IMAP180"});
-// } catch (JpaMigrateException e) {
-// e.printStackTrace();
-// }
+ public void testImap180() throws Exception {
+ JpaMigrator.main(new String[]{"IMAP180"});
}
@Test()
- public void testImap184() {
-// try {
-// JpaMigrator.main(new String[]{"IMAP184"});
-// } catch (JpaMigrateException e) {
-// e.printStackTrace();
-// }
+ public void testImap184() throws Exception {
+ JpaMigrator.main(new String[]{"IMAP184"});
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[34/34] james-project git commit: Merge remote-tracking branch
'btellier/JAMES-2085'
Posted by ad...@apache.org.
Merge remote-tracking branch 'btellier/JAMES-2085'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1128983f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1128983f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1128983f
Branch: refs/heads/master
Commit: 1128983f434f6a4d5f470af6dd2a63b31ffa9e14
Parents: 9d8d71c 5da9d3d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Wed Jul 5 15:58:27 2017 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Wed Jul 5 15:58:27 2017 +0200
----------------------------------------------------------------------
.../exception/MalformedSoredACLException.java | 38 ----
.../james/mailbox/model/MessageResult.java | 4 +-
.../CacheInvalidatingMailboxListener.java | 8 +-
.../mail/CassandraMailboxMapperTest.java | 6 +-
...lasticSearchListeningMessageSearchIndex.java | 22 +-
.../json/IndexableMessageTest.java | 32 ---
.../hbase/HBaseNonTransactionalMapper.java | 1 -
.../lucene/search/LuceneMessageSearchIndex.java | 2 +-
.../maildir/mail/MaildirMailboxMapper.java | 5 +-
.../maildir/mail/MaildirMessageMapper.java | 25 +-
.../james/mailbox/store/MimeDescriptorImpl.java | 6 +-
.../james/mailbox/store/ResultHeader.java | 4 +-
.../mailbox/store/StoreMessageIdManager.java | 37 +--
.../dto/MessageMetaDataDataTransferObject.java | 2 +-
.../store/search/LazyMessageSearchIndex.java | 3 +-
.../search/ListeningMessageSearchIndex.java | 9 +-
.../mailbox/store/search/MessageSearches.java | 2 +-
.../james/mailbox/store/search/SearchUtil.java | 11 +-
.../comparator/AbstractHeaderComparator.java | 17 +-
.../store/streaming/FullByteContent.java | 6 +-
.../mailbox/store/search/SearchUtilTest.java | 35 ---
.../james/mailbox/jpa/migrator/JpaMigrator.java | 17 +-
.../mailbox/jpa/migrator/JpaMigratorTest.java | 67 ++----
.../apache/mailet/base/FlowedMessageUtils.java | 12 +-
.../org/apache/mailet/base/StringUtils.java | 2 +-
.../transport/mailets/SMIMECheckSignature.java | 1 -
.../james/transport/mailets/ClamAVScan.java | 85 +------
.../james/transport/mailets/LogMessage.java | 1 +
.../james/mpt/protocol/ProtocolSession.java | 29 +--
.../james/mpt/session/ImapSessionImpl.java | 2 -
.../mpt/user/InMemoryMailboxUserManager.java | 2 -
.../apache/james/protocols/api/Protocol.java | 6 +
.../james/protocols/api/ProtocolImpl.java | 3 +
.../api/future/FutureResponseImpl.java | 10 +-
.../imap/api/display/HumanReadableText.java | 6 +
.../james/imap/api/message/MessageFlags.java | 2 +-
.../imap/processor/AbstractAuthProcessor.java | 4 +-
.../processor/AbstractMailboxProcessor.java | 3 +-
.../AbstractMessageRangeProcessor.java | 9 +-
.../processor/AbstractSelectionProcessor.java | 2 +-
.../james/imap/processor/AppendProcessor.java | 19 +-
.../james/imap/processor/CloseProcessor.java | 4 +-
.../james/imap/processor/CreateProcessor.java | 4 +-
.../imap/processor/DeleteACLProcessor.java | 6 +-
.../james/imap/processor/DeleteProcessor.java | 4 +-
.../james/imap/processor/ExpungeProcessor.java | 4 +-
.../james/imap/processor/GetACLProcessor.java | 6 +-
.../imap/processor/GetAnnotationProcessor.java | 2 +-
.../james/imap/processor/IdleProcessor.java | 11 +-
.../james/imap/processor/LSubProcessor.java | 4 +-
.../james/imap/processor/ListProcessor.java | 25 +-
.../imap/processor/ListRightsProcessor.java | 6 +-
.../james/imap/processor/LogoutProcessor.java | 4 +-
.../james/imap/processor/MyRightsProcessor.java | 5 +-
.../james/imap/processor/RenameProcessor.java | 6 +-
.../james/imap/processor/SearchProcessor.java | 6 +-
.../james/imap/processor/SetACLProcessor.java | 6 +-
.../imap/processor/SetAnnotationProcessor.java | 2 +-
.../james/imap/processor/StatusProcessor.java | 4 +-
.../james/imap/processor/StoreProcessor.java | 8 +-
.../imap/processor/SystemMessageProcessor.java | 6 +-
.../processor/base/SelectedMailboxImpl.java | 4 +-
.../processor/fetch/ContentBodyElement.java | 2 +-
.../imap/processor/fetch/EnvelopeBuilder.java | 2 +-
.../imap/processor/fetch/FetchProcessor.java | 12 +-
.../imap/processor/fetch/MimeBodyElement.java | 6 +-
.../james/protocols/imap/IMAPRequest.java | 6 +-
.../james/imap/decode/parser/MockLogger.java | 3 +-
.../netty/BasicChannelUpstreamHandler.java | 16 +-
.../james/cli/probe/impl/JmxMailboxProbe.java | 3 -
.../java/org/apache/james/core/MailImpl.java | 8 +-
.../james/core/MimeMessageCopyOnWriteProxy.java | 14 --
.../core/MimeMessageCopyOnWriteProxyTest.java | 6 +-
.../james/core/MimeMessageWrapperTest.java | 81 +++----
.../org/apache/james/GuiceJamesServerTest.java | 7 +-
.../AbstractLoaderBeanFactory.java | 9 +-
.../MailRepositoryStoreBeanFactory.java | 9 +-
.../osgi/OSGIConfigurationProvider.java | 1 -
.../spring/tool/James23ImporterManagement.java | 48 +---
.../util/bayesian/JDBCBayesianAnalyzer.java | 6 +
.../mailrepository/file/FileMailRepository.java | 3 +-
.../mailrepository/jcr/JCRMailRepository.java | 15 +-
.../user/jdbc/AbstractJdbcUsersRepository.java | 5 -
.../repository/file/AbstractFileRepository.java | 39 ++--
.../domainlist/lib/AbstractDomainListTest.java | 8 +-
.../AbstractMailRepositoryTest.java | 9 +-
.../dnsservice/dnsjava/DNSJavaService.java | 4 +-
.../dnsservice/dnsjava/DNSJavaServiceTest.java | 4 +
.../lib/AbstractStateMailetProcessor.java | 4 +-
.../AbstractStateCompositeProcessorTest.java | 85 +++----
.../transport/mailets/BayesianAnalysis.java | 1 +
.../mailets/BayesianAnalysisFeeder.java | 4 +-
.../transport/mailets/WhiteListManager.java | 3 +
...ddressesArrayToMailAddressListConverter.java | 2 +-
.../mailets/remoteDelivery/MailDelivrer.java | 8 +-
.../integration/cucumber/DownloadStepdefs.java | 2 -
.../java/org/apache/james/jmap/JMAPServlet.java | 7 +-
.../james/jmap/methods/RequestHandler.java | 2 +-
.../methods/SetMailboxesUpdateProcessor.java | 4 +
.../james/jmap/methods/SetMessagesMethod.java | 9 +-
.../apache/james/jmap/model/MailboxFactory.java | 7 +-
.../james/jmap/send/PostDequeueDecorator.java | 2 +-
.../netty/ImapChannelUpstreamHandler.java | 3 +-
.../imapserver/netty/ImapIdleStateHandler.java | 4 +-
.../netty/AbstractConfigurableAsyncServer.java | 11 +-
.../hook/MailboxDeliverToRecipientHandler.java | 10 +-
.../ManageSieveChannelUpstreamHandler.java | 3 +-
.../james/smtpserver/MailPriorityHandler.java | 2 +-
.../SenderAuthIdentifyVerificationRcptHook.java | 4 +-
.../james/smtpserver/SetMimeHeaderHandler.java | 2 +-
.../org/apache/james/smtpserver/TLDLookup.java | 9 +-
.../fastfail/JDBCGreylistHandler.java | 2 +-
.../smtpserver/fastfail/MaxRcptHandler.java | 3 +-
.../fastfail/MaxUnknownCmdHandler.java | 3 +-
.../smtpserver/fastfail/URIRBLHandler.java | 3 +-
.../smtpserver/jmx/SMTPCommandHandlerStats.java | 5 +-
.../apache/james/smtpserver/SMTPServerTest.java | 9 +-
.../james/smtpserver/ValidRcptHandlerTest.java | 2 -
.../james/queue/activemq/ActiveMQMailQueue.java | 46 +---
.../queue/activemq/ActiveMQMailQueueItem.java | 5 +-
.../james/queue/activemq/EmbeddedActiveMQ.java | 6 +-
.../activemq/ActiveMQMailQueueBlobTest.java | 12 -
.../org/apache/james/queue/api/MailQueue.java | 2 +-
.../james/queue/api/mock/MockMailQueue.java | 16 +-
.../apache/james/queue/jms/JMSMailQueue.java | 227 ++++++-------------
.../james/queue/jms/JMSMailQueueItem.java | 22 +-
.../jms/MimeMessageObjectMessageSource.java | 15 +-
.../queue/jms/AbstractJMSMailQueueTest.java | 17 +-
.../james/queue/jms/JMSMailQueueTest.java | 10 -
129 files changed, 542 insertions(+), 1061 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[24/34] james-project git commit: JAMES-2085 Review "should never
happen" in catch blocks
Posted by ad...@apache.org.
JAMES-2085 Review "should never happen" in catch blocks
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/154a7402
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/154a7402
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/154a7402
Branch: refs/heads/master
Commit: 154a740200e68b65a5416fb9f523d4cc0db91d9e
Parents: ad20e72
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 17:18:39 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../core/src/main/java/org/apache/james/core/MailImpl.java | 8 ++++++--
.../apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java | 5 ++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/154a7402/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
index ca94a9d..c0cbdeb 100644
--- a/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
+++ b/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
@@ -25,6 +25,8 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.PerRecipientHeaders;
import org.apache.mailet.PerRecipientHeaders.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -67,6 +69,8 @@ import java.util.UUID;
*/
public class MailImpl implements Disposable, Mail {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailImpl.class);
+
/**
* We hardcode the serialVersionUID so that from James 1.2 on, MailImpl will
* be deserializable (so your mail doesn't get lost)
@@ -181,10 +185,10 @@ public class MailImpl implements Disposable, Mail {
setAttributesRaw(attribs);
}
} catch (IOException e) {
- // should never happen for in memory streams
+ LOGGER.error("Error while deserializing attributes", e);
setAttributesRaw(new HashMap<String, Object>());
} catch (ClassNotFoundException e) {
- // should never happen as we just serialized it
+ LOGGER.error("Error while deserializing attributes", e);
setAttributesRaw(new HashMap<String, Object>());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/154a7402/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
index 32abe94..8539dee 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java
@@ -29,6 +29,8 @@ import org.apache.james.lifecycle.api.Disposable;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,6 +38,7 @@ import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
*/
public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats implements SMTPCommandHandlerStatsMBean, Disposable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SMTPCommandHandlerStats.class);
private final AtomicLong temp = new AtomicLong(0);
private final AtomicLong perm = new AtomicLong(0);
private final AtomicLong ok = new AtomicLong(0);
@@ -84,7 +87,7 @@ public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats impleme
}
} catch (NumberFormatException e) {
- // should never happen
+ LOGGER.error("Error while reading SMTP return code " + response.getRetCode(), e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[15/34] james-project git commit: JAMES-2085 Increase log level in
DNSJava
Posted by ad...@apache.org.
JAMES-2085 Increase log level in DNSJava
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fc97d22b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fc97d22b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fc97d22b
Branch: refs/heads/master
Commit: fc97d22b7f54dcf06be78187a709dabd439dcfca
Parents: 972001d
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 16:00:34 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:47 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fc97d22b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
index 766dde2..fafc072 100644
--- a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
+++ b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
@@ -374,7 +374,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
} catch (IllegalStateException ise) {
// This is okay, because it mimics the original behaviour
// TODO find out if it's a bug in DNSJava
- logger.debug("Error determining result ", ise);
+ logger.warn("Error determining result ", ise);
throw new TemporaryResolutionException("DNSService is temporary not reachable");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[20/34] james-project git commit: JAMES-2085 Use intellij inspection
to remove empty catch blocks
Posted by ad...@apache.org.
JAMES-2085 Use intellij inspection to remove empty catch blocks
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/73426233
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/73426233
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/73426233
Branch: refs/heads/master
Commit: 73426233fe193517275814337a6c042c30040340
Parents: 154a740
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 3 17:50:51 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:48 2017 +0700
----------------------------------------------------------------------
.../mail/CassandraMailboxMapperTest.java | 6 +-
.../maildir/mail/MaildirMessageMapper.java | 13 +--
.../james/transport/mailets/ClamAVScan.java | 85 +++-----------------
.../james/transport/mailets/LogMessage.java | 1 +
.../core/MimeMessageCopyOnWriteProxyTest.java | 6 +-
.../james/core/MimeMessageWrapperTest.java | 20 ++---
.../org/apache/james/GuiceJamesServerTest.java | 7 +-
.../util/bayesian/JDBCBayesianAnalyzer.java | 6 ++
.../mailrepository/jcr/JCRMailRepository.java | 17 ++--
.../domainlist/lib/AbstractDomainListTest.java | 8 +-
.../AbstractMailRepositoryTest.java | 9 +--
.../dnsservice/dnsjava/DNSJavaServiceTest.java | 4 +
.../AbstractStateCompositeProcessorTest.java | 2 +
.../transport/mailets/BayesianAnalysis.java | 1 +
.../mailets/BayesianAnalysisFeeder.java | 4 +-
.../transport/mailets/WhiteListManager.java | 3 +
.../SenderAuthIdentifyVerificationRcptHook.java | 4 +-
.../apache/james/smtpserver/SMTPServerTest.java | 9 ++-
.../james/queue/api/mock/MockMailQueue.java | 16 +---
19 files changed, 82 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 22113d8..d163233 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -37,14 +37,15 @@ import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CassandraMailboxMapperTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CassandraMailboxMapperTest.class);
public static final int MAX_RETRY = 10;
public static final int UID_VALIDITY = 52;
public static final MailboxPath MAILBOX_PATH = new MailboxPath("#private", "user", "name");
- public static final int THREAD_COUNT = 10;
- public static final int OPERATION_COUNT = 10;
private CassandraCluster cassandra;
private CassandraMailboxPathDAO mailboxPathDAO;
private CassandraMailboxMapper testee;
@@ -75,6 +76,7 @@ public class CassandraMailboxMapperTest {
testee.save(newMailbox);
fail("TooLongMailboxNameException expected");
} catch (TooLongMailboxNameException e) {
+ LOGGER.info("Ignored error", e);
}
Optional<CassandraIdAndPath> cassandraIdAndPath = mailboxPathDAO.retrieveId(MAILBOX_PATH).get();
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index e6c3514..9a8e0db 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -35,6 +35,7 @@ import javax.mail.Flags;
import javax.mail.Flags.Flag;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
@@ -305,16 +306,8 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
} catch (IOException ioe) {
throw new MailboxException("Failure while save MailboxMessage " + message + " in Mailbox " + mailbox, ioe);
} finally {
- try {
- if (fos != null)
- fos.close();
- } catch (IOException e) {
- }
- try {
- if (input != null)
- input.close();
- } catch (IOException e) {
- }
+ IOUtils.closeQuietly(fos);
+ IOUtils.closeQuietly(input);
}
File newMessageFile = null;
// delivered via SMTP, goes to ./new without flags
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
index 3b86b88..e8fe602 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
@@ -20,6 +20,7 @@
package org.apache.james.transport.mailets;
+import org.apache.commons.io.IOUtils;
import org.apache.mailet.Experimental;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -703,85 +704,16 @@ public class ClamAVScan extends GenericMailet {
log("Exception caught calling CLAMD on " + socket.getInetAddress() + ": " + ex.getMessage(), ex);
throw new MessagingException("Exception caught", ex);
} finally {
- shutdownReader(reader);
- shutdownWriter(writer);
- shutdownStream(bos);
- shutdownSocket(streamSocket);
- shutdownSocket(socket);
+ IOUtils.closeQuietly(reader);
+ IOUtils.closeQuietly(writer);
+ IOUtils.closeQuietly(bos);
+ IOUtils.closeQuietly(streamSocket);
+ IOUtils.closeQuietly(socket);
}
}
/**
- * Unconditionally close an <code>OutputStream</code>.
- * Equivalent to {@link OutputStream#close()}, except any exceptions will be ignored.
- *
- * @param output A (possibly null) OutputStream
- */
- private static void shutdownStream(OutputStream output) {
- if (null == output) {
- return;
- }
-
- try {
- output.close();
- } catch (IOException ignored) {
- }
- }
-
- /**
- * Unconditionally close an <code>Socket</code>.
- * Equivalent to {@link Socket#close()}, except any exceptions will be ignored.
- *
- * @param socket A (possibly null) Socket
- */
- private static void shutdownSocket(Socket socket) {
- if (null == socket) {
- return;
- }
-
- try {
- socket.close();
- } catch (IOException ioe) {
- }
- }
-
- /**
- * Unconditionally close an <code>Writer</code>.
- * Equivalent to {@link Writer#close()}, except any exceptions will be ignored.
- *
- * @param output A (possibly null) Writer
- */
- private void shutdownWriter(Writer output) {
- if (null == output) {
- return;
- }
-
- try {
- output.close();
- } catch (IOException ioe) {
- }
- }
-
-
- /**
- * Unconditionally close an <code>Reader</code>.
- * Equivalent to {@link Reader#close()}, except any exceptions will be ignored.
- *
- * @param input A (possibly null) Reader
- */
- private void shutdownReader(Reader input) {
- if (null == input) {
- return;
- }
-
- try {
- input.close();
- } catch (IOException ioe) {
- }
- }
-
- /**
* Tries to "ping" all the CLAMD daemons to
* check if they are up and accepting requests.
*/
@@ -872,10 +804,11 @@ public class ClamAVScan extends GenericMailet {
protected final int getStreamPortFromAnswer(String answer) throws ConnectException {
int port = -1;
if (answer != null && answer.startsWith(STREAM_PORT_STRING)) {
+ String portSubstring = answer.substring(STREAM_PORT_STRING.length());
try {
- port = Integer.parseInt(answer.substring(STREAM_PORT_STRING.length()));
+ port = Integer.parseInt(portSubstring);
} catch (NumberFormatException nfe) {
-
+ log("Can not parse port from substring " + portSubstring);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
index c1c065f..ce71916 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
@@ -63,6 +63,7 @@ public class LogMessage extends GenericMailet {
bodyMax = (getInitParameter("maxBody") == null) ? 0 : Integer.parseInt(getInitParameter("maxBody"));
comment = getInitParameter("comment");
} catch (Exception e) {
+ log("Caught exception while initializing LogMessage", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
index 431b1c5..c9c2e42 100644
--- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
+++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
@@ -40,11 +40,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@Override
protected MimeMessage getMessageFromSources(String sources) throws Exception {
- MimeMessageInputStreamSource mmis = null;
- try {
- mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream(sources.getBytes()));
- } catch (MessagingException e) {
- }
+ MimeMessageInputStreamSource mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream(sources.getBytes()));
return new MimeMessageCopyOnWriteProxy(mmis);
// return new MimeMessage(Session.getDefaultInstance(new
// Properties()),new ByteArrayInputStream(sources.getBytes()));
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
index 64c6723..75a29ba 100644
--- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
+++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
@@ -40,7 +40,9 @@ import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.mailet.base.RFC2822Headers;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
/**
* Test the subject folding issue.
@@ -87,13 +89,12 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest {
final String sep = "\r\n\r\n";
final String body = "bar\r\n";
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
@Override
protected MimeMessage getMessageFromSources(String sources) throws Exception {
- MimeMessageInputStreamSource mmis = null;
- try {
- mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream(sources.getBytes()));
- } catch (MessagingException e) {
- }
+ MimeMessageInputStreamSource mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream(sources.getBytes()));
return new TestableMimeMessageWrapper(mmis);
}
@@ -130,11 +131,10 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest {
@Test
public void testDeferredHeaderLoading() throws MessagingException, IOException {
mw.setHeadersLoadable(false);
- try {
- assertEquals("foo", mw.getSubject());
- fail("subject should not be loadable here, headers loading is disabled");
- } catch (IllegalStateException e) {
- }
+
+ expectedException.expect(IllegalStateException.class);
+
+ mw.getSubject();
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
index 59327bb..4bcc2b5 100644
--- a/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
+++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/GuiceJamesServerTest.java
@@ -11,11 +11,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
import com.google.inject.multibindings.Multibinder;
public class GuiceJamesServerTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(GuiceJamesServerTest.class);
public static final ConfigurationPerformer THROWING_CONFIGURATION_PERFORMER = new ConfigurationPerformer() {
@Override
@@ -109,7 +112,9 @@ public class GuiceJamesServerTest {
try {
overWrittenServer.start();
- } catch (RuntimeException e) {}
+ } catch (RuntimeException e) {
+ LOGGER.info("Ignored expected exception", e);
+ }
assertThat(overWrittenServer.isStarted()).isFalse();
} finally {
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
index 4abe7e1..0987b73 100644
--- a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
+++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
@@ -21,6 +21,8 @@ package org.apache.james.util.bayesian;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -47,6 +49,8 @@ import java.sql.DatabaseMetaData;
abstract public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JDBCBayesianAnalyzer.class);
+
/** Public object representing a lock on database activity. */
public final static String DATABASE_LOCK = "database lock";
@@ -213,6 +217,7 @@ abstract public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
try {
rs.close();
} catch (java.sql.SQLException se) {
+ LOGGER.info("Exception ignored", se);
}
rs = null;
@@ -222,6 +227,7 @@ abstract public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
try {
pstmt.close();
} catch (java.sql.SQLException se) {
+ LOGGER.info("Exception ignored", se);
}
pstmt = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
index a380c97..9e4c7bd 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
@@ -63,11 +63,15 @@ import org.apache.james.mailrepository.lib.AbstractMailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import sun.misc.IOUtils;
/**
* Mail repository that is backed by a JCR content repository.
*/
public class JCRMailRepository extends AbstractMailRepository implements MailRepository {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JCRMailRepository.class);
private final static String MAIL_PATH = "mailrepository";
@@ -75,7 +79,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
private SimpleCredentials creds;
private String workspace;
- private Logger logger;
@Inject
public void setRepository(Repository repository) {
@@ -526,11 +529,9 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
try {
message.writeTo(output);
} catch (Exception e) {
+ LOGGER.info("Exception ignored", e);
} finally {
- try {
- output.close();
- } catch (IOException e) {
- }
+ org.apache.commons.io.IOUtils.closeQuietly(output);
}
}
}.start();
@@ -617,9 +618,9 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
nodes.nextNode().remove();
}
session.save();
- logger.info("Mail " + key + " removed from repository");
+ LOGGER.info("Mail " + key + " removed from repository");
} else {
- logger.warn("Mail " + key + " not found");
+ LOGGER.warn("Mail " + key + " not found");
}
} finally {
session.logout();
@@ -654,7 +655,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
setMail(node, mail);
}
session.save();
- logger.info("Mail " + mail.getName() + " stored in repository");
+ LOGGER.info("Mail " + mail.getName() + " stored in repository");
} finally {
session.logout();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
index 511d9c0..2f4b66d 100644
--- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
@@ -32,11 +32,15 @@ import org.apache.james.domainlist.api.DomainListException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
public abstract class AbstractDomainListTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDomainListTest.class);
+
private final String DOMAIN_1 = "domain1.tld";
private final String DOMAIN_2 = "domain2.tld";
private final String DOMAIN_3 = "domain3.tld";
@@ -110,7 +114,7 @@ public abstract class AbstractDomainListTest {
try {
domainList.removeDomain(DOMAIN_2);
} catch (DomainListException e) {
-
+ LOGGER.info("Ignored error", e);
}
assertThat(domainList.getDomains()).containsOnly(DOMAIN_1);
}
@@ -169,7 +173,7 @@ public abstract class AbstractDomainListTest {
try {
domainList.removeDomain(domain);
} catch(DomainListException e) {
-
+ LOGGER.info("Ignored error", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
index 2b73354..8619229 100644
--- a/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
@@ -52,14 +52,9 @@ public abstract class AbstractMailRepositoryTest {
@Before
public void setUp() throws Exception {
-
mailRepository = getMailRepository();
- MimeMessageInputStreamSource mmis = null;
- try {
- mmis = new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream((content + sep + body).
- getBytes()));
- } catch (MessagingException e) {
- }
+ MimeMessageInputStreamSource mmis = new MimeMessageInputStreamSource("test",
+ new SharedByteArrayInputStream((content + sep + body).getBytes()));
mimeMessage = new MimeMessageCopyOnWriteProxy(mmis);
Collection<MailAddress> recipients = new ArrayList<MailAddress>();
recipients.add(new MailAddress("rec1", "domain.com"));
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
index 0a9f522..fa59ed8 100644
--- a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
+++ b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
@@ -32,6 +32,8 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
+
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xbill.DNS.Cache;
import org.xbill.DNS.DClass;
@@ -47,6 +49,7 @@ import java.util.ArrayList;
import java.util.Collection;
public class DNSJavaServiceTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DNSJavaServiceTest.class);
private TestableDNSServer dnsServer;
private static final byte[] DNS_SERVER_CONFIG = ("<dnsserver>" +
@@ -142,6 +145,7 @@ public class DNSJavaServiceTest {
res.add("");
fail("MX Collection should not be modifiable");
} catch (UnsupportedOperationException e) {
+ LOGGER.info("Ignored error", e);
}
assertEquals(1, res.size());
assertEquals("mail.test-zone.com.", res.iterator().next());
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
index 2a70f36..a654b59 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractStateCompositeProcessorTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStateCompositeProcessorTest.class);
@Test
public void testChooseRightProcessor() throws Exception {
@@ -82,6 +83,7 @@ public abstract class AbstractStateCompositeProcessorTest {
processor.service(mail4);
fail("should fail because of no mapping to a processor for this state");
} catch (MessagingException e) {
+ LOGGER.info("Ignored error", e);
}
} finally {
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
index bc6a213..6f3d28d 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
@@ -397,6 +397,7 @@ public class BayesianAnalysis extends GenericMailet {
message.setSubject(toAppend + " " + subject, "iso-8859-1");
}
} catch (MessagingException ex) {
+ log("Ignored error while modifying subject", ex);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
index edab232..9bcbf3a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
@@ -325,6 +325,7 @@ public class BayesianAnalysisFeeder extends GenericMailet {
dbUpdated = false;
}
} catch (Exception e) {
+ log("Ignored error while rolling back", e);
}
theJDBCUtil.closeJDBCConnection(conn);
}
@@ -338,7 +339,8 @@ public class BayesianAnalysisFeeder extends GenericMailet {
Header header = headers.nextElement();
try {
message.removeHeader(header.getName());
- } catch (javax.mail.MessagingException me) {
+ } catch (MessagingException me) {
+ log("Ignored error while removing header", me);
}
}
message.saveChanges();
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
index e17c6eb..2af44bd 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
@@ -372,6 +372,7 @@ public class WhiteListManager extends GenericMailet {
dbUpdated = false;
}
} catch (Exception e) {
+ log("Ignored exception upon rollback", e);
}
theJDBCUtil.closeJDBCConnection(conn);
}
@@ -540,6 +541,7 @@ public class WhiteListManager extends GenericMailet {
dbUpdated = false;
}
} catch (Exception e) {
+ log("Ignored exception upon rollback", e);
}
theJDBCUtil.closeJDBCConnection(conn);
}
@@ -660,6 +662,7 @@ public class WhiteListManager extends GenericMailet {
dbUpdated = false;
}
} catch (Exception e) {
+ log("Ignored exception upon rollback", e);
}
theJDBCUtil.closeJDBCConnection(conn);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
index 721c698..8f9e027 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
@@ -32,6 +32,8 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
+import com.google.common.base.Throwables;
+
/**
* Handler which check if the authenticated user is incorrect
*/
@@ -88,8 +90,8 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId
try {
return users.supportVirtualHosting();
} catch (UsersRepositoryException e) {
+ throw Throwables.propagate(e);
}
- return false;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
index 40afa1c..e0af73b 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
@@ -168,7 +168,7 @@ public class SMTPServerTest {
private static final long HALF_SECOND = 500;
private static final int MAX_ITERATIONS = 10;
- private static final Logger log = LoggerFactory.getLogger(SMTPServerTest.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(SMTPServerTest.class);
protected SMTPTestConfiguration smtpConfiguration;
protected final InMemoryUsersRepository usersRepository = new InMemoryUsersRepository();
@@ -370,6 +370,7 @@ public class SMTPServerTest {
Thread.sleep(3000);
fail("Shold disconnect connection 3");
} catch (Exception e) {
+ LOGGER.info("Ignored error", e);
}
ensureIsDisconnected(smtpProtocol);
@@ -627,17 +628,17 @@ public class SMTPServerTest {
SMTPClient smtp = new SMTPClient();
InetSocketAddress bindedAddress = new ProtocolServerUtils(smtpServer).retrieveBindedAddress();
smtp.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- if (log.isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
smtp.addProtocolCommandListener(new ProtocolCommandListener() {
@Override
public void protocolCommandSent(ProtocolCommandEvent event) {
- log.debug("> " + event.getMessage().trim());
+ LOGGER.debug("> " + event.getMessage().trim());
}
@Override
public void protocolReplyReceived(ProtocolCommandEvent event) {
- log.debug("< " + event.getMessage().trim());
+ LOGGER.debug("< " + event.getMessage().trim());
}
});
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/73426233/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
index 9af5fae..4ff7d13 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
@@ -28,6 +28,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.mail.MessagingException;
+
+import org.apache.commons.io.IOUtils;
import org.apache.james.core.MailImpl;
import org.apache.james.queue.api.MailQueue;
import org.apache.mailet.Mail;
@@ -94,18 +96,8 @@ public class MockMailQueue implements MailQueue {
log.error("", ex);
throw new RuntimeException(ex);
} finally {
- try {
- if (bais != null) {
- bais.close();
- }
- } catch (IOException ex) {
- }
- try {
- if (baos != null) {
- baos.close();
- }
- } catch (IOException ex) {
- }
+ IOUtils.closeQuietly(bais);
+ IOUtils.closeQuietly(baos);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[30/34] james-project git commit: JAMES-2085 Remove unused exception
class
Posted by ad...@apache.org.
JAMES-2085 Remove unused exception class
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/635e8e2e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/635e8e2e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/635e8e2e
Branch: refs/heads/master
Commit: 635e8e2e16b29e7ea5e2fbda7e2160b02682750b
Parents: fb09b56
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 4 10:31:22 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 17:13:49 2017 +0700
----------------------------------------------------------------------
.../exception/MalformedSoredACLException.java | 38 --------------------
1 file changed, 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/635e8e2e/mailbox/api/src/main/java/org/apache/james/mailbox/exception/MalformedSoredACLException.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/MalformedSoredACLException.java b/mailbox/api/src/main/java/org/apache/james/mailbox/exception/MalformedSoredACLException.java
deleted file mode 100644
index 225e586..0000000
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/exception/MalformedSoredACLException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.james.mailbox.exception;
-
-public class MalformedSoredACLException extends MailboxException {
-
- public MalformedSoredACLException() {
-
- }
-
- public MalformedSoredACLException(String message) {
- super(message);
- }
-
- public MalformedSoredACLException(String msg, Exception cause) {
- super(msg, cause);
- }
-
-
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org