http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/imap/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java index b44749b..cf933fa 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/CapabilityResponse.java @@ -61,18 +61,23 @@ public class CapabilityResponse implements ImapResponseMessage { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final CapabilityResponse other = (CapabilityResponse) obj; if (capabilities == null) { - if (other.capabilities != null) + if (other.capabilities != null) { return false; - } else if (!capabilities.equals(other.capabilities)) + } + } else if (!capabilities.equals(other.capabilities)) { return false; + } return true; }
http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/imap/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java index c12d113..7c58a93 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/FlagsResponse.java @@ -50,18 +50,23 @@ public class FlagsResponse implements ImapResponseMessage { } public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final FlagsResponse other = (FlagsResponse) obj; if (flags == null) { - if (other.flags != null) + if (other.flags != null) { return false; - } else if (!flags.equals(other.flags)) + } + } else if (!flags.equals(other.flags)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java index 0b57d73..274e078 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/NamespaceResponse.java @@ -110,20 +110,26 @@ public class NamespaceResponse implements ImapResponseMessage { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final Namespace other = (Namespace) obj; - if (delimiter != other.delimiter) + if (delimiter != other.delimiter) { return false; + } if (prefix == null) { - if (other.prefix != null) + if (other.prefix != null) { return false; - } else if (!prefix.equals(other.prefix)) + } + } else if (!prefix.equals(other.prefix)) { return false; + } return true; } @@ -145,28 +151,37 @@ public class NamespaceResponse implements ImapResponseMessage { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final NamespaceResponse other = (NamespaceResponse) obj; if (personal == null) { - if (other.personal != null) + if (other.personal != null) { return false; - } else if (!personal.equals(other.personal)) + } + } else if (!personal.equals(other.personal)) { return false; + } if (shared == null) { - if (other.shared != null) + if (other.shared != null) { return false; - } else if (!shared.equals(other.shared)) + } + } else if (!shared.equals(other.shared)) { return false; + } if (users == null) { - if (other.users != null) + if (other.users != null) { return false; - } else if (!users.equals(other.users)) + } + } else if (!users.equals(other.users)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java b/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java index d7fa4dc..f6c89a1 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/response/SearchResponse.java @@ -75,17 +75,22 @@ public class SearchResponse implements ImapResponseMessage { */ // @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final SearchResponse other = (SearchResponse) obj; - if (!Arrays.equals(ids, other.ids)) + if (!Arrays.equals(ids, other.ids)) { return false; - if (highestModSeq != other.highestModSeq) + } + if (highestModSeq != other.highestModSeq) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 81e4c1e..1a0bbf8 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 @@ -223,8 +223,9 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab if (!flagUpdateUids.isEmpty()) { Iterator<MessageRange> ranges = MessageRange.toRanges(flagUpdateUids).iterator(); while(ranges.hasNext()) { - if (messageManager == null) - messageManager = getMailbox(session, selected); + if (messageManager == null) { + messageManager = getMailbox(session, selected); + } addFlagsResponses(session, selected, responder, useUid, ranges.next(), messageManager, mailboxSession); } @@ -373,13 +374,15 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab sb.append(mailboxPath.getNamespace()); } if (mailboxPath.getUser() != null && !mailboxPath.getUser().equals("")) { - if (sb.length() > 0) + if (sb.length() > 0) { sb.append(delimiter); + } sb.append(mailboxPath.getUser()); } if (mailboxPath.getName() != null && !mailboxPath.getName().equals("")) { - if (sb.length() > 0) + if (sb.length() > 0) { sb.append(delimiter); + } sb.append(mailboxPath.getName()); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java index a9bc77c..a826515 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java @@ -109,8 +109,9 @@ public final class FetchResponseBuilder { final MessageUid resultUid = result.getUid(); final int resultMsn = selected.msn(resultUid); - if (resultMsn == SelectedMailbox.NO_SUCH_MESSAGE) + if (resultMsn == SelectedMailbox.NO_SUCH_MESSAGE) { throw new MessageRangeException("No such message found with uid " + resultUid); + } reset(resultMsn); // setMsn(resultMsn); @@ -320,15 +321,16 @@ public final class FetchResponseBuilder { result.noBody(); } - } else + } else { try { if (content(messageResult, name, path, isBase).size() <= 0) { - // Seems like this mail has no body + // Seems like this mail has no body result.noBody(); } } catch (IOException e) { throw new MailboxException("Unable to get size of header body element", e); } + } } return result; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java index 9bb6a7c..538c104 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/MimePathImpl.java @@ -46,15 +46,19 @@ final class MimePathImpl implements MessageResult.MimePath { } public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final MimePathImpl other = (MimePathImpl) obj; - if (!Arrays.equals(positions, other.positions)) + if (!Arrays.equals(positions, other.positions)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java index 9a947d4..a0398d8 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractAsyncServer.java @@ -58,7 +58,9 @@ public abstract class AbstractAsyncServer implements ProtocolServer{ private List<InetSocketAddress> addresses = new ArrayList<>(); public synchronized void setListenAddresses(InetSocketAddress... addresses) { - if (started) throw new IllegalStateException("Can only be set when the server is not running"); + if (started) { + throw new IllegalStateException("Can only be set when the server is not running"); + } this.addresses = ImmutableList.copyOf(addresses); } @@ -68,7 +70,9 @@ public abstract class AbstractAsyncServer implements ProtocolServer{ * @param ioWorker */ public void setIoWorkerCount(int ioWorker) { - if (started) throw new IllegalStateException("Can only be set when the server is not running"); + if (started) { + throw new IllegalStateException("Can only be set when the server is not running"); + } this.ioWorker = ioWorker; } @@ -87,9 +91,13 @@ public abstract class AbstractAsyncServer implements ProtocolServer{ * @see org.apache.james.protocols.api.ProtocolServer#bind() */ public synchronized void bind() throws Exception { - if (started) throw new IllegalStateException("Server running already"); + if (started) { + throw new IllegalStateException("Server running already"); + } - if (addresses.isEmpty()) throw new RuntimeException("Please specify at least on socketaddress to which the server should get bound!"); + if (addresses.isEmpty()) { + throw new RuntimeException("Please specify at least on socketaddress to which the server should get bound!"); + } bootstrap = new ServerBootstrap(createSocketChannelFactory()); ChannelPipelineFactory factory = createPipelineFactory(channels); @@ -127,7 +135,9 @@ public abstract class AbstractAsyncServer implements ProtocolServer{ * @see org.apache.james.protocols.api.ProtocolServer#unbind() */ public synchronized void unbind() { - if (started == false) return; + if (started == false) { + return; + } ChannelPipelineFactory factory = bootstrap.getPipelineFactory(); if (factory instanceof ExternalResourceReleasable) { ((ExternalResourceReleasable) factory).releaseExternalResources(); @@ -164,7 +174,9 @@ public abstract class AbstractAsyncServer implements ProtocolServer{ * @param timeout */ public void setTimeout(int timeout) { - if (started) throw new IllegalStateException("Can only be set when the server is not running"); + if (started) { + throw new IllegalStateException("Can only be set when the server is not running"); + } this.timeout = timeout; } @@ -175,7 +187,9 @@ public abstract class AbstractAsyncServer implements ProtocolServer{ * @param backlog */ public void setBacklog(int backlog) { - if (started) throw new IllegalStateException("Can only be set when the server is not running"); + if (started) { + throw new IllegalStateException("Can only be set when the server is not running"); + } this.backlog = backlog; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java ---------------------------------------------------------------------- diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java index ccfb013..6b8e33c 100644 --- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java +++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java @@ -107,7 +107,9 @@ public class NettyServer extends AbstractAsyncServer { * @param size the thread count to use */ public void setUseExecutionHandler(boolean useHandler, int size) { - if (isBound()) throw new IllegalStateException("Server running already"); + if (isBound()) { + throw new IllegalStateException("Server running already"); + } if (useHandler) { eHandler = createExecutionHandler(size); } else { @@ -119,12 +121,16 @@ public class NettyServer extends AbstractAsyncServer { } public void setMaxConcurrentConnections(int maxCurConnections) { - if (isBound()) throw new IllegalStateException("Server running already"); + if (isBound()) { + throw new IllegalStateException("Server running already"); + } this.maxCurConnections = maxCurConnections; } public void setMaxConcurrentConnectionsPerIP(int maxCurConnectionsPerIP) { - if (isBound()) throw new IllegalStateException("Server running already"); + if (isBound()) { + throw new IllegalStateException("Server running already"); + } this.maxCurConnectionsPerIP = maxCurConnectionsPerIP; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java index c30d81e..a621d44 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java @@ -45,8 +45,9 @@ public class MailEnvelopeImpl implements MailEnvelope{ * @see org.apache.james.protocols.smtp.MailEnvelope#getSize() */ public long getSize() { - if (outputStream == null) + if (outputStream == null) { return -1; + } return outputStream.size(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java index 414ec2d..5717971 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java @@ -195,10 +195,12 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p String smtpDesc = result.getSmtpDescription(); if ((rCode &HookReturnCode.DENY) == HookReturnCode.DENY) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.TRANSACTION_FAILED; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Email rejected"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); if ((rCode & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) { @@ -206,10 +208,12 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p } return response; } else if ((rCode & HookReturnCode.DENYSOFT) == HookReturnCode.DENYSOFT) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.LOCAL_ERROR; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Temporary problem. Please try again later"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); if ((rCode & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) { @@ -217,10 +221,12 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p } return response; } else if ((rCode & HookReturnCode.OK) == HookReturnCode.OK) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.MAIL_OK; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Command accepted"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); if ((rCode & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) { @@ -228,10 +234,12 @@ public abstract class AbstractHookableCmdHandler<Hook extends org.apache.james.p } return response; } else if ((rCode & HookReturnCode.DISCONNECT) == HookReturnCode.DISCONNECT) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.TRANSACTION_FAILED; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Server disconnected"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); response.setEndSession(true); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java index 142b029..3c13270 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java @@ -431,10 +431,12 @@ public class AuthCmdHandler String smtpDesc = result.getSmtpDescription(); if ((rCode & HookReturnCode.DENY) == HookReturnCode.DENY) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.AUTH_FAILED; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Authentication Failed"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); @@ -443,10 +445,12 @@ public class AuthCmdHandler } return response; } else if ((rCode & HookReturnCode.DENYSOFT) == HookReturnCode.DENYSOFT) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.LOCAL_ERROR; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Temporary problem. Please try again later"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); @@ -455,10 +459,12 @@ public class AuthCmdHandler } return response; } else if ((rCode & HookReturnCode.OK) == HookReturnCode.OK) { - if (smtpRetCode == null) + if (smtpRetCode == null) { smtpRetCode = SMTPRetCode.AUTH_OK; - if (smtpDesc == null) + } + if (smtpDesc == null) { smtpDesc = "Authentication Succesfull"; + } SMTPResponse response = new SMTPResponse(smtpRetCode, smtpDesc); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java index e99d1d0..ab91fea 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java @@ -71,8 +71,12 @@ public abstract class AbstractGreylistHandler implements RcptHook { String recip = ""; String sender = ""; - if (recipAddress != null) recip = recipAddress.toString(); - if (senderAddress != null) sender = senderAddress.toString(); + if (recipAddress != null) { + recip = recipAddress.toString(); + } + if (senderAddress != null) { + sender = senderAddress.toString(); + } long time = System.currentTimeMillis(); String ipAddress = session.getRemoteAddress().getAddress().getHostAddress(); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java index 437d4e1..6f5b9e4 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java @@ -46,19 +46,27 @@ public final class HookResult { boolean match = false; if ((result & HookReturnCode.DECLINED) == HookReturnCode.DECLINED) { - if (match == true) throw new IllegalArgumentException(); + if (match == true) { + throw new IllegalArgumentException(); + } match = true; } if ((result & HookReturnCode.OK) == HookReturnCode.OK) { - if (match == true) throw new IllegalArgumentException(); + if (match == true) { + throw new IllegalArgumentException(); + } match = true; } if ((result & HookReturnCode.DENY) == HookReturnCode.DENY) { - if (match == true) throw new IllegalArgumentException(); + if (match == true) { + throw new IllegalArgumentException(); + } match = true; } if ((result & HookReturnCode.DENYSOFT) == HookReturnCode.DENYSOFT) { - if (match == true) throw new IllegalArgumentException(); + if (match == true) { + throw new IllegalArgumentException(); + } match = true; } this.result = result; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java index 8d6193a..5d77318 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java @@ -110,8 +110,9 @@ public class ResolvableEhloHeloHandlerTest { @Override protected String resolve(String host) throws UnknownHostException { - if (host.equals(INVALID_HOST)) + if (host.equals(INVALID_HOST)) { throw new UnknownHostException(); + } return InetAddress.getLocalHost().getHostName(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java index 1a37cfc..d61b98e 100644 --- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java +++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageWrapper.java @@ -168,8 +168,9 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { */ @Override protected void updateMessageID() throws MessagingException { - if (getMessageID() == null) + if (getMessageID() == null) { super.updateMessageID(); + } } /** @@ -310,8 +311,9 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { } else { // The headers was modified so we need to call saveChanges() just to be sure // See JAMES-1320 - if (!saved) + if (!saved) { saveChanges(); + } myHeaders = headers; } @SuppressWarnings("unchecked") @@ -324,8 +326,9 @@ public class MimeMessageWrapper extends MimeMessage implements Disposable { } else { // save the changes as the message was modified // See JAMES-1320 - if (!saved) + if (!saved) { saveChanges(); + } // MimeMessageUtil.writeToInternal(this, headerOs, bodyOs, // ignoreList); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java index f9b02a0..d58f342 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java @@ -77,8 +77,9 @@ public class MailboxCopierManagement implements MailboxCopierManagementMBean { * #copy(java.lang.String, java.lang.String) */ public void copy(String srcBean, String dstBean) throws Exception { - if (srcBean.equals(dstBean)) + if (srcBean.equals(dstBean)) { throw new IllegalArgumentException("srcBean and dstBean can not have the same name!"); + } try { copier.copyMailboxes(resolver.resolveMailboxManager(srcBean), resolver.resolveMailboxManager(dstBean)); } catch (MailboxManagerResolverException | MailboxException | IOException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 7c7699a..5e48cf4 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 @@ -150,8 +150,9 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen @SuppressWarnings("deprecation") public synchronized MailRepository select(String destination) throws MailRepositoryStoreException { int idx = destination.indexOf(':'); - if (idx == -1) + if (idx == -1) { throw new MailRepositoryStoreException("Destination is malformed. Must be a valid URL: " + destination); + } String protocol = destination.substring(0, idx); String repID = destination; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java index adbd3b1..5795712 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/IndexerConfigurationBeanFactoryPostProcessor.java @@ -61,8 +61,9 @@ public class IndexerConfigurationBeanFactoryPostProcessor implements BeanFactory reIndexer = "fake-reindexer"; } - if (indexer == null) + if (indexer == null) { throw new ConfigurationException("Indexer provider " + provider + " not supported!"); + } registry.registerAlias(indexer, "indexer"); registry.registerAlias(reIndexer, "reindexer"); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java index 516dec4..6c64b82 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java @@ -101,8 +101,9 @@ public class MailboxConfigurationBeanFactoryPostProcessor implements BeanFactory mailboxIdFactory = "cassandra-mailboxIdFactory"; } - if (mailbox == null) + if (mailbox == null) { throw new ConfigurationException("Mailboxmanager provider " + provider + " not supported!"); + } registry.registerAlias(mailbox, "mailboxmanager"); registry.registerAlias(subscription, "subscriptionManager"); registry.registerAlias(messageMapperFactory, "messageMapperFactory"); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java index 274f9ce..df45b7d 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java @@ -99,8 +99,9 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid TreeMap<String, String> levels = new TreeMap<>(); for (String name : logMap.keySet()) { String level = getLogLevel(name); - if (level != null) + if (level != null) { levels.put(name, level); + } } return levels; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java index 91fa919..a8492a0 100644 --- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java +++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java @@ -85,10 +85,11 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati @SuppressWarnings("rawtypes") static void setInterfaces(Object importer, Class[] classes) { - if (importer instanceof OsgiServiceProxyFactoryBean) + if (importer instanceof OsgiServiceProxyFactoryBean) { ((OsgiServiceProxyFactoryBean) importer).setInterfaces(classes); - else + } else { ((OsgiServiceCollectionProxyFactoryBean) importer).setInterfaces(classes); + } } static void setBundleContext(Object importer, BundleContext context) { @@ -100,10 +101,11 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati } static void setCardinality(Object importer, Cardinality cardinality) { - if (importer instanceof OsgiServiceProxyFactoryBean) + if (importer instanceof OsgiServiceProxyFactoryBean) { ((OsgiServiceProxyFactoryBean) importer).setCardinality(cardinality); - else + } else { ((OsgiServiceCollectionProxyFactoryBean) importer).setCardinality(cardinality); + } } @@ -112,19 +114,21 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati } static void setFilter(Object importer, String filter) { - if (importer instanceof OsgiServiceProxyFactoryBean) + if (importer instanceof OsgiServiceProxyFactoryBean) { ((OsgiServiceProxyFactoryBean) importer).setFilter(filter); - else + } else { ((OsgiServiceCollectionProxyFactoryBean) importer).setFilter(filter); + } } @SuppressWarnings("unused") static void setServiceBean(Object importer, String name) { - if (importer instanceof OsgiServiceProxyFactoryBean) + if (importer instanceof OsgiServiceProxyFactoryBean) { ((OsgiServiceProxyFactoryBean) importer).setServiceBeanName(name); - else + } else { ((OsgiServiceCollectionProxyFactoryBean) importer).setServiceBeanName(name); + } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 229e187..e5f7626 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 @@ -106,8 +106,9 @@ public class FileMailRepository extends AbstractMailRepository { streamRepository.configure(reposConfiguration); streamRepository.init(); - if (cacheKeys) + if (cacheKeys) { keys = Collections.synchronizedSet(new HashSet<String>()); + } // Finds non-matching pairs and deletes the extra files HashSet<String> streamKeys = new HashSet<>(); @@ -207,8 +208,9 @@ public class FileMailRepository extends AbstractMailRepository { } } finally { - if (out != null) + if (out != null) { out.close(); + } } } // Always save the header information @@ -254,18 +256,19 @@ public class FileMailRepository extends AbstractMailRepository { // Fix ConcurrentModificationException by cloning // the keyset before getting an iterator final ArrayList<String> clone; - if (keys != null) + if (keys != null) { synchronized (lock) { clone = new ArrayList<>(keys); } - else { + } else { clone = new ArrayList<>(); for (Iterator<String> i = objectRepository.list(); i.hasNext(); ) { clone.add(i.next()); } } - if (fifo) + if (fifo) { Collections.sort(clone); // Keys is a HashSet; impose FIFO for apps + } // that need it return clone.iterator(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java index d2211c0..a22e515 100755 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java @@ -398,12 +398,13 @@ public class MBoxMailRepository implements MailRepository, Configurable { if (foundMessage == null) { LOGGER.debug("select - message not found {}", mboxFile); } - if (ins != null) + if (ins != null) { try { ins.close(); } catch (IOException e) { LOGGER.error("Unable to close file (General I/O problem) {}", mboxFile, e); } + } } return foundMessage; } @@ -446,12 +447,13 @@ public class MBoxMailRepository implements MailRepository, Configurable { } catch (IOException e) { LOGGER.error("Unable to write file (General I/O problem) {}", mboxFile, e); } finally { - if (ins != null) + if (ins != null) { try { ins.close(); } catch (IOException e) { LOGGER.error("Unable to close file (General I/O problem) {}", mboxFile, e); } + } } } @@ -508,8 +510,9 @@ public class MBoxMailRepository implements MailRepository, Configurable { } LOGGER.debug("{} keys to be iterated over.", keys.size()); - if (fifo) + if (fifo) { Collections.sort(keys); // Keys is a HashSet; impose FIFO for apps + } // that need it return keys.iterator(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java index a06475f..e1e784e 100644 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java @@ -93,8 +93,9 @@ public class MimeMessageStreamRepositorySource extends MimeMessageSource { if (size == -1) { if (sr instanceof org.apache.james.repository.file.FilePersistentStreamRepository) { size = ((org.apache.james.repository.file.FilePersistentStreamRepository) sr).getSize(key); - } else + } else { size = super.getMessageSize(); + } } return size; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java index d4d88c9..d2aca34 100644 --- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java @@ -236,8 +236,9 @@ public class UsersFileRepository extends AbstractJamesUsersRepository { User user; try { user = getUserByName(name); - if (user == null) + if (user == null) { return false; + } } catch (Exception e) { throw new RuntimeException("Exception retrieving User" + e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java index fab0714..18cf64d 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java @@ -179,8 +179,9 @@ public class MimeMessageJDBCSource extends MimeMessageSource { * @see org.apache.james.server.core.MimeMessageSource#getMessageSize() */ public synchronized long getMessageSize() throws IOException { - if (size != -1) + if (size != -1) { return size; + } if (retrieveMessageBodySizeSQL == null) { // There was no SQL statement for this repository... figure it out // the hard way http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java index e9f017e..0335a99 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java @@ -279,8 +279,9 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable { String map = mappingRS.getString(3); mapping.put(user + "@" + domain, MappingsImpl.fromRawString(map)); } - if (mapping.size() > 0) + if (mapping.size() > 0) { return mapping; + } } finally { theJDBCUtil.closeJDBCResultSet(mappingRS); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 6fefb08..8fc86c4 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 @@ -354,8 +354,9 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo // the table to use, and the (optional) repository Key. String destUrl = configuration.getString("[@destinationURL]", null); // throw an exception if the attribute is missing - if (destUrl == null) + if (destUrl == null) { throw new ConfigurationException("destinationURL attribute is missing from Configuration"); + } // normalise the destination, to simplify processing. if (!destUrl.endsWith("/")) { http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java index b806df9..b65c72a 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/vacation/Vacation.java @@ -163,8 +163,12 @@ public class Vacation { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Vacation vacation = (Vacation) o; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java index 16e5ee2..2b48563 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java @@ -154,8 +154,9 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable { for (JPARecipientRewrite virtualUser : virtualUsers) { mapping.put(virtualUser.getUser() + "@" + virtualUser.getDomain(), MappingsImpl.fromRawString(virtualUser.getTargetAddress())); } - if (mapping.size() > 0) + if (mapping.size() > 0) { return mapping; + } } catch (PersistenceException e) { LOGGER.debug("Failed to get all mappings", e); if (transaction.isActive()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java index 640f9ab..2634bc3 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/model/JPAUser.java @@ -122,7 +122,9 @@ public class JPAUser implements User { final boolean result; if (pass == null) { result = password == null; - } else result = password != null && password.equals(hashPassword(name, pass, alg)); + } else { + result = password != null && password.equals(hashPassword(name, pass, alg)); + } return result; } @@ -136,18 +138,23 @@ public class JPAUser implements User { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } final JPAUser other = (JPAUser) obj; if (name == null) { - if (other.name != null) + if (other.name != null) { return false; - } else if (!name.equals(other.name)) + } + } else if (!name.equals(other.name)) { return false; + } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java index 1c30138..4548e7e 100644 --- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java +++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java @@ -139,8 +139,9 @@ public class ReadOnlyLDAPGroupRestriction { Attribute members = groupAttributes.get(memberAttribute); NamingEnumeration<?> memberDNs = members.getAll(); - while (memberDNs.hasMore()) + while (memberDNs.hasMore()) { result.add(memberDNs.next().toString()); + } return result; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java index 5b3328e..5a2ffad 100644 --- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java +++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java @@ -593,15 +593,17 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl NamingEnumeration<SearchResult> sr = ldapContext.search(userBase, sanitizedFilter, sc); - if (!sr.hasMore()) + if (!sr.hasMore()) { return null; + } SearchResult r = sr.next(); Attribute userName = r.getAttributes().get(userIdAttribute); if (!restriction.isActivated() - || userInGroupsMembershipList(r.getNameInNamespace(), restriction.getGroupMembershipLists(ldapContext))) + || userInGroupsMembershipList(r.getNameInNamespace(), restriction.getGroupMembershipLists(ldapContext))) { return new ReadOnlyLDAPUser(userName.get().toString(), r.getNameInNamespace(), ldapContext); + } return null; } @@ -738,8 +740,9 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl String userDN; while (userDNIterator.hasNext()) { userDN = userDNIterator.next(); - if (userInGroupsMembershipList(userDN, groupMembershipList)) + if (userInGroupsMembershipList(userDN, groupMembershipList)) { validUserDNs.add(userDN); + } } } else { validUserDNs = userDNs; http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java index 9a0ab33..8f0c709 100644 --- a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java +++ b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java @@ -71,7 +71,9 @@ public class Lock { if (null == theLock) { locks.put(key, getCallerId()); return true; - } else return getCallerId() == theLock; + } else { + return getCallerId() == theLock; + } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 0e718c0..15aeecf 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 @@ -268,8 +268,9 @@ public abstract class AbstractFileRepository implements Repository, Configurable public synchronized boolean containsKey(String key) { try { final File file = getFile(key); - if (DEBUG) + if (DEBUG) { LOGGER.debug("checking key {}", key); + } return file.exists(); } catch (Exception e) { throw new RuntimeException("Exception caught while searching " + "an object: " + e); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java index 8525752..5af987c 100644 --- a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java +++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java @@ -51,8 +51,9 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple try { final InputStream inputStream = getInputStream(key); - if (inputStream == null) + if (inputStream == null) { throw new NullPointerException("Null input stream returned for key: " + key); + } try { final ObjectInputStream stream = new ObjectInputStream(inputStream); @@ -109,8 +110,9 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple try (OutputStream outputStream = getOutputStream(key)) { final ObjectOutputStream stream = new ObjectOutputStream(outputStream); stream.writeObject(value); - if (DEBUG) + if (DEBUG) { LOGGER.debug("storing object {} for key {}", value, key); + } } catch (Exception e) { throw new RuntimeException("Exception caught while storing an object: " + e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java index 6b27452..8cfef05 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java @@ -94,8 +94,9 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT * get thrown if mappingLimit smaller then 1 is used */ public void setMappingLimit(int mappingLimit) throws IllegalArgumentException { - if (mappingLimit < 1) + if (mappingLimit < 1) { throw new IllegalArgumentException("The minimum mappingLimit is 1"); + } this.mappingLimit = mappingLimit; } @@ -111,8 +112,9 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT // We have to much mappings throw ErrorMappingException to avoid // infinity loop - if (mappingLimit == 0) + if (mappingLimit == 0) { throw new ErrorMappingException("554 Too many mappings to process"); + } Mappings targetMappings = mapAddress(user, domain); @@ -134,8 +136,9 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT target = user + "@" + target.substring(RecipientRewriteTable.ALIASDOMAIN_PREFIX.length()); } - if (target == null) + if (target == null) { continue; + } String buf = "Valid virtual user mapping " + user + "@" + domain + " to " + target; LOGGER.debug(buf); @@ -280,8 +283,9 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT } else if (map.startsWith(RecipientRewriteTable.REGEX_PREFIX)) { addRegexMapping(user, domain, map.substring(RecipientRewriteTable.REGEX_PREFIX.length())); } else if (map.startsWith(RecipientRewriteTable.ALIASDOMAIN_PREFIX)) { - if (user != null) + if (user != null) { throw new RecipientRewriteTableException("User must be null for aliasDomain mappings"); + } addAliasDomainMapping(domain, map.substring(RecipientRewriteTable.ALIASDOMAIN_PREFIX.length())); } else { addAddressMapping(user, domain, map); @@ -302,8 +306,9 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT } else if (map.startsWith(RecipientRewriteTable.REGEX_PREFIX)) { removeRegexMapping(user, domain, map.substring(RecipientRewriteTable.REGEX_PREFIX.length())); } else if (map.startsWith(RecipientRewriteTable.ALIASDOMAIN_PREFIX)) { - if (user != null) + if (user != null) { throw new RecipientRewriteTableException("User must be null for aliasDomain mappings"); + } removeAliasDomainMapping(domain, map.substring(RecipientRewriteTable.ALIASDOMAIN_PREFIX.length())); } else { removeAddressMapping(user, domain, map); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java index dfc19d8..6349a52 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java @@ -61,8 +61,9 @@ public class RecipientRewriteTableUtil { int msgPos = targetString.indexOf(':', identifierLength + 1); // Throw exception on invalid format - if (msgPos < identifierLength + 1) + if (msgPos < identifierLength + 1) { throw new PatternSyntaxException("Regex should be formatted as regex:<regular-expression>:<parameterized-string>", targetString, 0); + } Pattern pattern = Pattern.compile(targetString.substring(identifierLength, msgPos)); Matcher match = pattern.matcher(address.toString()); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java index d9131cc..96243b4 100644 --- a/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java +++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java @@ -51,10 +51,12 @@ public class UsersRepositoryManagement extends StandardMBean implements UsersRep private JamesUser getJamesUser(String userName) throws UsersRepositoryException { User baseuser = usersRepository.getUserByName(userName); - if (baseuser == null) + if (baseuser == null) { throw new IllegalArgumentException("user not found: " + userName); - if (!(baseuser instanceof JamesUser)) + } + if (!(baseuser instanceof JamesUser)) { throw new IllegalArgumentException("user is not of type JamesUser: " + userName); + } return (JamesUser) baseuser; } @@ -113,8 +115,9 @@ public class UsersRepositoryManagement extends StandardMBean implements UsersRep public void setPassword(String userName, String password) throws Exception { try { User user = usersRepository.getUserByName(userName); - if (user == null) + if (user == null) { throw new UsersRepositoryException("user not found: " + userName); + } if (!user.setPassword(password)) { throw new UsersRepositoryException("Unable to update password for user " + user); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 f079ce0..2b5dd04 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 @@ -448,8 +448,9 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, Configurable if (records != null && records.length >= 1) { ARecord a = (ARecord) records[0]; return InetAddress.getByAddress(name, a.getAddress().getAddress()); - } else + } else { throw e; + } } finally { timeMetric.stopAndPublish(); } @@ -477,8 +478,9 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, Configurable addrs[i] = InetAddress.getByAddress(name, a.getAddress().getAddress()); } return ImmutableList.copyOf(addrs); - } else + } else { throw e; + } } finally { timeMetric.stopAndPublish(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java index e3ad217..66d2101 100644 --- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java +++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java @@ -184,8 +184,9 @@ public class InetNetworkBuilder { int octets = 0; for (int i = 1; i < netspec.length(); i++) { - if (srcb[i] == '.') + if (srcb[i] == '.') { octets++; + } } return (octets == 0) ? masks[0] : netspec.substring(0, netspec.length() - 1).concat(masks[octets]); http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 960201e..4b4e94a 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 @@ -99,10 +99,12 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con */ public void configure(HierarchicalConfiguration config) throws ConfigurationException { this.state = config.getString("[@state]", null); - if (state == null) + if (state == null) { throw new ConfigurationException("Processor state attribute must be configured"); - if (state.equals(Mail.GHOST)) + } + if (state.equals(Mail.GHOST)) { throw new ConfigurationException("Processor state of " + Mail.GHOST + " is reserved for internal use, choose a different one"); + } this.enableJmx = config.getBoolean("[@enableJmx]", true); this.config = config; @@ -279,14 +281,16 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con } matcher = new MatcherInverter(m); } - if (matcher == null) + if (matcher == null) { throw new ConfigurationException("Unable to load matcher instance"); + } matchers.add(matcher); if (compName != null) { // check if there is already a composite Matcher with the name // registered in the processor - if (compMap.containsKey(compName)) + if (compMap.containsKey(compName)) { throw new ConfigurationException("CompositeMatcher with name " + compName + " is already defined in processor " + state); + } compMap.put(compName, matcher); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java index 9a8488c..87adc34 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessorTest.java @@ -47,8 +47,9 @@ public class CamelMailetProcessorTest extends AbstractStateMailetProcessorTest { processor.init(); return processor; } finally { - if (processor != null) + if (processor != null) { processor.destroy(); + } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java index 7c9ce32..7c9f27e 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java @@ -119,8 +119,9 @@ public abstract class AbstractRecipientRewriteTable extends GenericMailet { } catch (PatternSyntaxException e) { LOGGER.error("Exception during regexMap processing: ", e); } - if (targetAddress == null) + if (targetAddress == null) { continue; + } } try { http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java index 3f43a0f..c4869ef 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java @@ -111,8 +111,9 @@ public class FromRepository extends GenericMailet { mail.setAttribute("FromRepository", Boolean.TRUE); mail.setState(processor); getMailetContext().sendMail(mail); - if (delete) + if (delete) { processed.add(key); + } LifecycleUtil.dispose(mail); } } catch (MessagingException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java index ab47aa1..f761c16 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java @@ -158,8 +158,9 @@ public class RemoteDelivery extends GenericMailet { configuration = new RemoteDeliveryConfiguration(getMailetConfig(), domainList); queue = queueFactory.getQueue(configuration.getOutGoingQueueName()); try { - if (configuration.isBindUsed()) + if (configuration.isBindUsed()) { RemoteDeliverySocketFactory.setBindAdress(configuration.getBindAddress()); + } } catch (UnknownHostException e) { LOGGER.error("Invalid bind setting ({}): ", configuration.getBindAddress(), e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java index 99cfa9f..15fced5 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java @@ -46,10 +46,11 @@ public class ActionUtils { if (aMail.getRecipients() == null) { throw new MessagingException("Invalid number of recipients - 0" + ". Exactly 1 recipient is expected."); - } else if (1 != aMail.getRecipients().size()) + } else if (1 != aMail.getRecipients().size()) { throw new MessagingException("Invalid number of recipients - " - + Integer.toString(aMail.getRecipients().size()) - + ". Exactly 1 recipient is expected."); + + Integer.toString(aMail.getRecipients().size()) + + ". Exactly 1 recipient is expected."); + } return aMail.getRecipients().iterator().next(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index 9bb63ce..2740d2e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -270,10 +270,12 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC protected Map<String, String> getEnvelopes() { Map<String, String> envelopes = new HashMap<>(2); - if (null != getEnvelopeFrom()) + if (null != getEnvelopeFrom()) { envelopes.put("From", getEnvelopeFrom()); - if (null != getEnvelopeTo()) + } + if (null != getEnvelopeTo()) { envelopes.put("To", getEnvelopeTo()); + } return envelopes; } /** @@ -283,8 +285,9 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC { List<String> values = new ArrayList<>(1); String value = getEnvelopes().get(name); - if (null != value) + if (null != value) { values.add(value); + } return values; } @@ -303,8 +306,9 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC { final List<String> matchedEnvelopeValues = new ArrayList<>(32); for (String envelopeName: getEnvelopeNames()) { - if (envelopeName.trim().equalsIgnoreCase(name)) + if (envelopeName.trim().equalsIgnoreCase(name)) { matchedEnvelopeValues.addAll(getEnvelope(envelopeName)); + } } return matchedEnvelopeValues; } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java index 142f349..12d8b79 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java @@ -142,9 +142,9 @@ public class ProcessRedirectNotify { } protected void updateHeaders() throws MessagingException { - if (getMessageID() == null) + if (getMessageID() == null) { super.updateHeaders(); - else { + } else { modified = false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/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 4a1e11f..8f335f4 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 @@ -224,8 +224,9 @@ public class MailDelivrer { final Address[] validUnsentAddresses = sfe.getValidUnsentAddresses(); if (validUnsentAddresses != null && validUnsentAddresses.length > 0) { - if (configuration.isDebug()) + if (configuration.isDebug()) { LOGGER.debug("Send failed, {} valid addresses remain, continuing with any other servers", (Object) validUnsentAddresses); + } return sfe; } else { // There are no valid addresses left to send, so rethrow http://git-wip-us.apache.org/repos/asf/james-project/blob/4c18f12f/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java index a4f41e9..29f03cc 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java @@ -52,15 +52,16 @@ public class MessageComposer { SendFailedException exception = (SendFailedException) e; // No error - if (exception.getInvalidAddresses().length == 0 && exception.getValidUnsentAddresses().length == 0) + if (exception.getInvalidAddresses().length == 0 && exception.getValidUnsentAddresses().length == 0) { return null; + } Exception ex; StringBuilder sb = new StringBuilder(); boolean smtpExFound = false; sb.append("RemoteHost said:"); - if (e instanceof MessagingException) + if (e instanceof MessagingException) { while ((ex = ((MessagingException) e).getNextException()) != null && ex instanceof MessagingException) { e = ex; if (ex.getClass().getName().endsWith(".SMTPAddressFailedException")) { @@ -76,6 +77,7 @@ public class MessageComposer { } } } + } if (!smtpExFound) { boolean invalidAddr = false; sb.append(" ( "); @@ -85,8 +87,9 @@ public class MessageComposer { invalidAddr = true; } if (exception.getValidUnsentAddresses().length > 0) { - if (invalidAddr) + if (invalidAddr) { sb.append(" "); + } sb.append(Arrays.toString(exception.getValidUnsentAddresses())); } sb.append(" - ["); @@ -104,8 +107,9 @@ public class MessageComposer { out.print(permanentAsString(executionResult.isPermanent()) + " exception delivering mail (" + mail.getName() + ")" + retrieveExceptionLog(executionResult.getException().orElse(null)) + ": "); if (configuration.isDebug()) { - if (executionResult.getException().isPresent()) + if (executionResult.getException().isPresent()) { executionResult.getException().get().printStackTrace(out); + } } return sout.toString(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
