http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java index 388faf6..b5230ac 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java @@ -61,7 +61,7 @@ import org.bouncycastle.operator.OperatorCreationException; * @version CVS $Revision$ $Date$ * @since 3.0 */ -public class SMIMEKeyHolder implements KeyHolder{ +public class SMIMEKeyHolder implements KeyHolder { private final JcaCertStore jcaCertStore; @@ -131,7 +131,7 @@ public class SMIMEKeyHolder implements KeyHolder{ Enumeration<String> aliases = keyStore.aliases(); if (keyAlias == null) { - if(aliases.hasMoreElements()) { + if (aliases.hasMoreElements()) { keyAlias = aliases.nextElement(); } else { throw new KeyStoreException("No alias was found in keystore.");
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java index 70b9743..f11b012 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java @@ -672,7 +672,7 @@ public abstract class AbstractSign extends GenericMailet { @SuppressWarnings("unchecked") Enumeration<String> heads = message.getAllHeaderLines(); StringBuilder headBuffer = new StringBuilder(1024); - while(heads.hasMoreElements()) { + while (heads.hasMoreElements()) { headBuffer.append(heads.nextElement().toString()).append("\r\n"); } return headBuffer.toString(); @@ -719,7 +719,7 @@ public abstract class AbstractSign extends GenericMailet { sb.append(actual); fromIndex = index + pattern.length(); } - if (fromIndex < template.length()){ + if (fromIndex < template.length()) { sb.append(template.substring(fromIndex)); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 226004d..fbde9fe 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 @@ -163,7 +163,7 @@ public class SMIMECheckSignature extends GenericMailet { // strippedMessage will contain the signed content of the message MimeBodyPart strippedMessage =null; - List<SMIMESignerInfo> signers=null; + List<SMIMESignerInfo> signers = null; try { Object obj = message.getContent(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java index db368d0..e5f372d 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java @@ -95,7 +95,7 @@ public class SMIMEDecrypt extends GenericMailet { String privateStorePass = config.getInitParameter("keyStorePassword"); - String keyAlias= config.getInitParameter("keyAlias"); + String keyAlias = config.getInitParameter("keyAlias"); String keyPass = config.getInitParameter("keyAliasPassword"); String mailAttributeConf = config.getInitParameter("mailAttribute"); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java index cb5c393..8ccef7a 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java @@ -54,13 +54,13 @@ public class IsX509CertificateSubject extends GenericMatcher { public void init() throws MessagingException { String condition = getCondition(); - if(condition == null || !condition.contains(";")) { + if (condition == null || !condition.contains(";")) { throw new MessagingException("Invalid matcher configuration: " + condition); } int pos = condition.indexOf(";"); sourceAttribute = condition.substring(0,pos).trim(); - check = condition.substring(pos+1, condition.length()); + check = condition.substring(pos + 1, condition.length()); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java index d4c8b0e..13c4f47 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java @@ -253,7 +253,7 @@ public class ICALToJsonAttributeTest { assertThat(jsons).hasSize(1); assertThatJson(new String(jsons.values().iterator().next(), StandardCharsets.UTF_8)) .isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + SENDER.asString() + "\"," + "\"recipient\": \"" + recipient.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + @@ -290,7 +290,7 @@ public class ICALToJsonAttributeTest { List<String> actual = toSortedValueList(jsons); assertThatJson(actual.get(0)).isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + SENDER.asString() + "\"," + "\"recipient\": \"" + MailAddressFixture.ANY_AT_JAMES2.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + @@ -300,7 +300,7 @@ public class ICALToJsonAttributeTest { "\"recurrence-id\": null" + "}"); assertThatJson(actual.get(1)).isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + SENDER.asString() + "\"," + "\"recipient\": \"" + MailAddressFixture.OTHER_AT_JAMES.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + @@ -336,7 +336,7 @@ public class ICALToJsonAttributeTest { List<String> actual = toSortedValueList(jsons); assertThatJson(actual.get(0)).isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics2) +"\"," + + "\"ical\": \"" + toJsonValue(ics2) + "\"," + "\"sender\": \"" + SENDER.asString() + "\"," + "\"recipient\": \"" + recipient.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d64072ac247c17656ceafde3b4b3eba961c8c5184cdc6ee047feb2aab16e43439a608f28671ab7c10e754c301b1e32001ad51dd20eac2fc7af20abf4093bbe\"," + @@ -346,7 +346,7 @@ public class ICALToJsonAttributeTest { "\"recurrence-id\": null" + "}"); assertThatJson(actual.get(1)).isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + SENDER.asString() + "\"," + "\"recipient\": \"" + recipient.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + @@ -454,7 +454,7 @@ public class ICALToJsonAttributeTest { assertThat(jsons).hasSize(1); assertThatJson(new String(jsons.values().iterator().next(), StandardCharsets.UTF_8)) .isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + from + "\"," + "\"recipient\": \"" + recipient.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + @@ -488,7 +488,7 @@ public class ICALToJsonAttributeTest { assertThat(jsons).hasSize(1); assertThatJson(new String(jsons.values().iterator().next(), StandardCharsets.UTF_8)) .isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + SENDER.asString() + "\"," + "\"recipient\": \"" + recipient.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + @@ -523,7 +523,7 @@ public class ICALToJsonAttributeTest { assertThat(jsons).hasSize(1); assertThatJson(new String(jsons.values().iterator().next(), StandardCharsets.UTF_8)) .isEqualTo("{" + - "\"ical\": \"" + toJsonValue(ics) +"\"," + + "\"ical\": \"" + toJsonValue(ics) + "\"," + "\"sender\": \"" + from + "\"," + "\"recipient\": \"" + recipient.asString() + "\"," + "\"uid\": \"f1514f44bf39311568d640727cff54e819573448d09d2e5677987ff29caa01a9e047feb2aab16e43439a608f28671ab7c10e754ce92be513f8e04ae9ff15e65a9819cf285a6962bc\"," + http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java index 6efa549..789bc92 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java @@ -98,8 +98,7 @@ public class ContentReplacer { if (charset.isPresent()) { mail.getMessage().setSubject(subject, charset.get().name()); return true; - } - else { + } else { String previousCharset = previousCharset(mail); mail.getMessage().setSubject(subject, previousCharset); return true; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java index b2a7b33..bbd1a67 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java @@ -97,7 +97,7 @@ public class HeadersToHTTP extends GenericMailet { LOGGER.debug("I will attempt to deliver serialised messages to " + targetUrl + ". " - + ( ((parameterKey==null) || (parameterKey.length()<1)) ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") + + (((parameterKey == null) || (parameterKey.length() < 1)) ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") + (passThrough ? "Messages will pass through." : "Messages will be ghosted.")); } } @@ -131,7 +131,7 @@ public class HeadersToHTTP extends GenericMailet { try { MimeMessage message = mail.getMessage(); message.setHeader("X-headerToHTTP", (success ? "Succeeded" : "Failed")); - if (!success && errorMessage!=null && errorMessage.length()>0) { + if (!success && errorMessage != null && errorMessage.length() > 0) { message.setHeader("X-headerToHTTPFailure", errorMessage); } message.saveChanges(); @@ -166,17 +166,17 @@ public class HeadersToHTTP extends GenericMailet { HashSet<NameValuePair> pairs = new HashSet<>(); - if (message!=null) { - if (message.getSender()!=null) { + if (message != null) { + if (message.getSender() != null) { pairs.add(new BasicNameValuePair("from", message.getSender().toString())); } - if (message.getReplyTo()!=null) { + if (message.getReplyTo() != null) { pairs.add(new BasicNameValuePair("reply_to", Arrays.toString(message.getReplyTo()))); } - if (message.getMessageID()!=null) { + if (message.getMessageID() != null) { pairs.add(new BasicNameValuePair("message_id", message.getMessageID())); } - if (message.getSubject()!=null) { + if (message.getSubject() != null) { pairs.add(new BasicNameValuePair("subject", message.getSubject())); } pairs.add(new BasicNameValuePair("size", Integer.toString(message.getSize()))); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java index 090a9f6..ef37cd7 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java @@ -108,7 +108,7 @@ public class PatternExtractor { } public List<ReplacingPattern> getPatternsFromFileList(String filepar) throws MailetException, IOException { - ImmutableList.Builder<ReplacingPattern> patternList= ImmutableList.builder(); + ImmutableList.Builder<ReplacingPattern> patternList = ImmutableList.builder(); for (String file : Splitter.on(",").split(filepar)) { FileNameWithCharset fileNameWithCharset = FileNameWithCharset.from(file); Optional<? extends InputStream> inputStream = retrieveInputStream(fileNameWithCharset.getFileName()); @@ -160,7 +160,7 @@ public class PatternExtractor { } private List<ReplacingPattern> getPatternsFromStream(InputStream stream, Charset charset) throws MailetException, IOException { - ImmutableList.Builder<ReplacingPattern> patternList= ImmutableList.builder(); + ImmutableList.Builder<ReplacingPattern> patternList = ImmutableList.builder(); for (String line: IOUtils.readLines(stream, charset)) { line = line.trim(); if (!isComment(line)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java index 56e8646..57968be 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java @@ -35,7 +35,7 @@ import com.google.common.base.Throwables; * * */ -public class RecipientToLowerCase extends GenericMailet{ +public class RecipientToLowerCase extends GenericMailet { @Override public void service(Mail mail) throws MessagingException { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefix.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefix.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefix.java index 0d9acf1..6a3f464 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefix.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RemoveMimeHeaderByPrefix.java @@ -66,7 +66,7 @@ public class RemoveMimeHeaderByPrefix extends GenericMailet { @Override public void service(Mail mail) throws MessagingException { List<String> headerNamesToRemove = headerNamesStartingByPrefix(mail); - for(String headerName: headerNamesToRemove) { + for (String headerName: headerNamesToRemove) { mail.getMessage().removeHeader(headerName); } if (!headerNamesToRemove.isEmpty()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java index 50e138f..7f812fa 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java @@ -105,7 +105,7 @@ public class SerialiseToHTTP extends GenericMailet { + " as " + messageKeyName + ". " - + (parameterKey==null || parameterKey.length()<2 ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") + + (parameterKey == null || parameterKey.length() < 2 ? "I will not add any fields to the post. " : "I will prepend: " + parameterKey + "=" + parameterValue + ". ") + (passThrough ? "Messages will pass through." : "Messages will be ghosted.")); } @@ -139,7 +139,7 @@ public class SerialiseToHTTP extends GenericMailet { try { MimeMessage message = mail.getMessage(); message.setHeader("X-toHTTP", (success ? "Succeeded" : "Failed")); - if (!success && errorMessage!=null && errorMessage.length()>0) { + if (!success && errorMessage != null && errorMessage.length() > 0) { message.setHeader("X-toHTTPFailure", errorMessage); } message.saveChanges(); @@ -159,7 +159,7 @@ public class SerialiseToHTTP extends GenericMailet { RequestBuilder requestBuilder = RequestBuilder.post(url); - if (data.length>1 && data[1]!=null) { + if (data.length > 1 && data[1] != null) { requestBuilder.addParameter(data[1].getName(),data[1].getValue()); LOGGER.debug("{}::{}", data[1].getName(), data[1].getValue()); } @@ -189,14 +189,14 @@ public class SerialiseToHTTP extends GenericMailet { private NameValuePair[] getNameValuePairs(String message) throws UnsupportedEncodingException { int l = 1; - if (parameterKey!=null && parameterKey.length()>0) { + if (parameterKey != null && parameterKey.length() > 0) { l = 2; } NameValuePair[] data = new BasicNameValuePair[l]; - data[0] = new BasicNameValuePair( messageKeyName, message); - if (l==2) { - data[1] = new BasicNameValuePair( parameterKey, parameterValue); + data[0] = new BasicNameValuePair(messageKeyName, message); + if (l == 2) { + data[1] = new BasicNameValuePair(parameterKey, parameterValue); } return data; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java index 2dcc6cc..7d3b3ec 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UnwrapText.java @@ -128,8 +128,7 @@ public class UnwrapText extends GenericMailet { if (result.charAt(result.length() - 1) != ' ') { result.append(" "); } - } - else { + } else { result.append("\r\n"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java index f120f3f..2ae2263 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java @@ -150,8 +150,7 @@ public abstract class AbstractQuotaMatcher extends GenericMatcher { quota = Long.parseLong(amount); } return quota; - } - catch (Exception e) { + } catch (Exception e) { throw new MessagingException("Exception parsing quota", e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java index 91c9530..fd46feb 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java @@ -205,7 +205,7 @@ public class AttachmentFileNameIs extends GenericMatcher { } return true; } - if (unzipIsRequested && fileName.endsWith(ZIP_SUFFIX) && matchFoundInZip(part)){ + if (unzipIsRequested && fileName.endsWith(ZIP_SUFFIX) && matchFoundInZip(part)) { return true; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java index a836f6b..5dc8e6e 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java @@ -74,8 +74,7 @@ public class CompareNumericHeaderValue extends GenericMatcher { StringTokenizer st = new StringTokenizer(getCondition(), " \t", false); if (st.hasMoreTokens()) { headerName = st.nextToken().trim(); - } - else { + } else { throw new MessagingException("Missing headerName"); } if (st.hasMoreTokens()) { @@ -83,44 +82,36 @@ public class CompareNumericHeaderValue extends GenericMatcher { if (comparisonOperatorString.equals("<") || comparisonOperatorString.equals("LT")) { comparisonOperator = LT; - } - else if (comparisonOperatorString.equals("<=") + } else if (comparisonOperatorString.equals("<=") || comparisonOperatorString.equals("=<") || comparisonOperatorString.equals("LE")) { comparisonOperator = LE; - } - else if (comparisonOperatorString.equals("==") + } else if (comparisonOperatorString.equals("==") || comparisonOperatorString.equals("=") || comparisonOperatorString.equals("EQ")) { comparisonOperator = EQ; - } - else if (comparisonOperatorString.equals(">=") + } else if (comparisonOperatorString.equals(">=") || comparisonOperatorString.equals("=>") || comparisonOperatorString.equals("GE")) { comparisonOperator = GE; - } - else if (comparisonOperatorString.equals(">") + } else if (comparisonOperatorString.equals(">") || comparisonOperatorString.equals("GT")) { comparisonOperator = GT; - } - else { + } else { throw new MessagingException("Bad comparisonOperator: \"" + comparisonOperatorString + "\""); } - } - else { + } else { throw new MessagingException("Missing comparisonOperator"); } if (st.hasMoreTokens()) { String headerValueString = st.nextToken().trim(); try { headerValue = Double.valueOf(headerValueString); - } - catch (NumberFormatException nfe) { + } catch (NumberFormatException nfe) { throw new MessagingException("Bad header comparison value: \"" + headerValueString + "\"", nfe); } - } - else { + } else { throw new MessagingException("Missing headerValue threshold"); } } @@ -172,8 +163,7 @@ public class CompareNumericHeaderValue extends GenericMatcher { // should never get here throw new IllegalStateException("Unknown comparisonOperator" + comparisonOperator); } - } - catch (NumberFormatException nfe) { + } catch (NumberFormatException nfe) { throw new MessagingException("Bad header value found in message: \"" + headerArray[0] + "\"", nfe); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java index 1751900..47f6c4d 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FileRegexMatcher.java @@ -43,7 +43,7 @@ public class FileRegexMatcher extends GenericRegexMatcher { try { patternSource = new java.io.RandomAccessFile(getCondition(), "r"); int lines = 0; - while(patternSource.readLine() != null) { + while (patternSource.readLine() != null) { lines++; } patterns = new Object[lines][2]; @@ -51,18 +51,15 @@ public class FileRegexMatcher extends GenericRegexMatcher { for (int i = 0; i < lines; i++) { String line = patternSource.readLine(); patterns[i][0] = line.substring(0, line.indexOf(':')); - patterns[i][1] = line.substring(line.indexOf(':')+1); + patterns[i][1] = line.substring(line.indexOf(':') + 1); } compile(patterns); - } - catch (java.io.FileNotFoundException fnfe) { + } catch (java.io.FileNotFoundException fnfe) { throw new MessagingException("Could not locate patterns.", fnfe); - } - catch (java.io.IOException ioe) { + } catch (java.io.IOException ioe) { throw new MessagingException("Could not read patterns.", ioe); - } - catch(PatternSyntaxException mp) { + } catch (PatternSyntaxException mp) { throw new MessagingException("Could not initialize regex patterns", mp); } finally { if (patternSource != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java index 10c29f6..7f32d41 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java @@ -41,8 +41,7 @@ import org.apache.mailet.base.GenericMatcher; * @version CVS $Revision$ $Date$ * @since 2.2.0 **/ -public class HasMailAttribute extends GenericMatcher -{ +public class HasMailAttribute extends GenericMatcher { private String attributeName; @@ -55,12 +54,7 @@ public class HasMailAttribute extends GenericMatcher return "Has Mail Attribute Matcher"; } - /* - * (non-Javadoc) - * @see org.apache.mailet.base.GenericMatcher#init() - */ - public void init() throws MessagingException - { + public void init() throws MessagingException { attributeName = getCondition(); } @@ -70,8 +64,7 @@ public class HasMailAttribute extends GenericMatcher * set on the mail * **/ - public Collection<MailAddress> match(Mail mail) throws MessagingException - { + public Collection<MailAddress> match(Mail mail) throws MessagingException { if (mail.getAttribute(attributeName) != null) { return mail.getRecipients(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java index 3e82edb..65a833c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java @@ -65,8 +65,7 @@ import org.apache.mailet.base.GenericMatcher; * @version CVS $Revision$ $Date$ * @since 2.2.0 **/ -public class HasMailAttributeWithValue extends GenericMatcher -{ +public class HasMailAttributeWithValue extends GenericMatcher { /** * The name of the attribute to match @@ -85,8 +84,7 @@ public class HasMailAttributeWithValue extends GenericMatcher * * @param mail */ - public Collection<MailAddress> match(Mail mail) throws MessagingException - { + public Collection<MailAddress> match(Mail mail) throws MessagingException { Object attributeValue = mail.getAttribute(getAttributeName()); if (attributeValue != null @@ -100,8 +98,7 @@ public class HasMailAttributeWithValue extends GenericMatcher * Returns the attributeName. * @return String */ - protected String getAttributeName() - { + protected String getAttributeName() { return fieldAttributeName; } @@ -109,8 +106,7 @@ public class HasMailAttributeWithValue extends GenericMatcher * Returns the attributeValue. * @return String */ - protected String getAttributeValue() - { + protected String getAttributeValue() { return fieldAttributeValue; } @@ -118,8 +114,7 @@ public class HasMailAttributeWithValue extends GenericMatcher * Sets the attributeName. * @param attributeName The attributeName to set */ - protected void setAttributeName(String attributeName) - { + protected void setAttributeName(String attributeName) { fieldAttributeName = attributeName; } @@ -127,8 +122,7 @@ public class HasMailAttributeWithValue extends GenericMatcher * Sets the attributeValue. * @param attributeValue The attributeValue to set */ - protected void setAttributeValue(String attributeValue) - { + protected void setAttributeValue(String attributeValue) { fieldAttributeValue = attributeValue; } @@ -136,8 +130,7 @@ public class HasMailAttributeWithValue extends GenericMatcher * (non-Javadoc) * @see org.apache.mailet.base.GenericMatcher#init() */ - public void init() throws MessagingException - { + public void init() throws MessagingException { String condition = getCondition().trim(); int commaPosition = condition.indexOf(','); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java index e72c3c5..2ca0e8a 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java @@ -47,8 +47,7 @@ import java.io.Serializable; * @version CVS $Revision$ $Date$ * @since 2.2.0 **/ -public class HasMailAttributeWithValueRegex extends GenericMatcher -{ +public class HasMailAttributeWithValueRegex extends GenericMatcher { private String attributeName; private Pattern pattern = null; @@ -62,16 +61,15 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher return "Has Mail Attribute Value Matcher"; } - public void init(MatcherConfig conf) throws MessagingException - { + public void init(MatcherConfig conf) throws MessagingException { String condition = conf.getCondition(); int idx = condition.indexOf(','); if (idx != -1) { attributeName = condition.substring(0,idx).trim(); - String pattern_string = condition.substring(idx+1, condition.length()).trim(); + String pattern_string = condition.substring(idx + 1, condition.length()).trim(); try { pattern = Pattern.compile(pattern_string); - } catch(PatternSyntaxException mpe) { + } catch (PatternSyntaxException mpe) { throw new MessagingException("Malformed pattern: " + pattern_string, mpe); } } else { @@ -86,11 +84,10 @@ public class HasMailAttributeWithValueRegex extends GenericMatcher * interpreted as a regular expression matches the toString value of the * corresponding attributes value. **/ - public Collection<MailAddress> match(Mail mail) throws MessagingException - { + public Collection<MailAddress> match(Mail mail) throws MessagingException { Serializable obj = mail.getAttribute(attributeName); //to be a little more generic the toString of the value is what is matched against - if ( obj != null && pattern.matcher(obj.toString()).matches()) { + if (obj != null && pattern.matcher(obj.toString()).matches()) { return mail.getRecipients(); } return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java index 0657af6..090610c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/NESSpamCheck.java @@ -36,68 +36,68 @@ import org.apache.mailet.base.RFC2822Headers; @Experimental public class NESSpamCheck extends GenericRegexMatcher { protected Object[][] NESPatterns = {{RFC2822Headers.RECEIVED, "GAA.*-0600.*EST"}, - {RFC2822Headers.RECEIVED, "XAA.*-0700.*EDT"}, - {RFC2822Headers.RECEIVED, "xxxxxxxxxxxxxxxxxxxxx"}, - {RFC2822Headers.RECEIVED, "untrace?able"}, - {RFC2822Headers.RECEIVED, "from (baby|bewellnet|kllklk) "}, - {RFC2822Headers.TO, "Friend@public\\.com"}, - {RFC2822Headers.TO, "user@the[-_]internet"}, - {RFC2822Headers.DATE, "/[0-9]+/.+[AP]M.+Time"}, - {RFC2822Headers.SUBJECT, "^\\(?ADV?[:;)]"}, - {RFC2822Headers.MESSAGE_ID, "<>"}, - {RFC2822Headers.MESSAGE_ID_VARIATION, "<>"}, - {RFC2822Headers.MESSAGE_ID_VARIATION, "<(419\\.43|989\\.28)"}, - {"X-MimeOLE", "MimeOLE V[^0-9]"}, - //Added 20-Jun-1999. Appears to be broken spamware. - {"MIME-Version", "1.0From"}, - //Added 28-July-1999. Check X-Mailer for spamware. - {"X-Mailer", "DiffondiCool"}, - {"X-Mailer", "Emailer Platinum"}, - {"X-Mailer", "eMerge"}, - {"X-Mailer", "Crescent Internet Tool"}, - //Added 4-Apr-2000. Check X-Mailer for Cybercreek Avalanche - {"X-Mailer", "Avalanche"}, - //Added 21-Oct-1999. Subject contains 20 or more consecutive spaces - {"Subject", " "}, - //Added 31-Mar-2000. Invalid headers from MyGuestBook.exe CGI spamware - {"MessageID", "<.+>"}, - {"X-References", "0[A-Z0-9]+, 0[A-Z0-9]+$"}, - {"X-Other-References", "0[A-Z0-9]+$"}, - {"X-See-Also", "0[A-Z0-9]+$"}, - //Updated 28-Apr-1999. Check for "Sender", "Resent-From", or "Resent-By" - // before "X-UIDL". If found, then exit. - {RFC2822Headers.SENDER, ".+"}, - {RFC2822Headers.RESENT_FROM, ".+"}, - {"Resent-By", ".+"}, - //Updated 19-May-1999. Check for "X-Mozilla-Status" before "X-UIDL". - {"X-Mozilla-Status", ".+"}, - //Updated 20-Jul-1999. Check for "X-Mailer: Internet Mail Service" - // before "X-UIDL". - {"X-Mailer", "Internet Mail Service"}, - //Updated 25-Oct-1999. Check for "X-ID" before "X-UIDL". - {"X-ID", ".+"}, - //X-UIDL is a POP3 header that should normally not be seen - {"X-UIDL", ".*"}, - //Some headers are valid only for the Pegasus Mail client. So first check - //for Pegasus header and exit if found. If not found, check for - //invalid headers: "Comments: Authenticated sender", "X-PMFLAGS" and "X-pmrqc". - {"X-mailer", "Pegasus"}, - //Added 27-Aug-1999. Pegasus now uses X-Mailer instead of X-mailer. - {"X-Mailer", "Pegasus"}, - //Added 25-Oct-1999. Check for X-Confirm-Reading-To. - {"X-Confirm-Reading-To", ".+"}, - //Check for invalid Pegasus headers - {RFC2822Headers.COMMENTS, "Authenticated sender"}, - {"X-PMFLAGS", ".*"}, - {"X-Pmflags", ".*"}, - {"X-pmrqc", ".*"}, - {"Host-From:envonly", ".*"}}; + {RFC2822Headers.RECEIVED, "XAA.*-0700.*EDT"}, + {RFC2822Headers.RECEIVED, "xxxxxxxxxxxxxxxxxxxxx"}, + {RFC2822Headers.RECEIVED, "untrace?able"}, + {RFC2822Headers.RECEIVED, "from (baby|bewellnet|kllklk) "}, + {RFC2822Headers.TO, "Friend@public\\.com"}, + {RFC2822Headers.TO, "user@the[-_]internet"}, + {RFC2822Headers.DATE, "/[0-9]+/.+[AP]M.+Time"}, + {RFC2822Headers.SUBJECT, "^\\(?ADV?[:;)]"}, + {RFC2822Headers.MESSAGE_ID, "<>"}, + {RFC2822Headers.MESSAGE_ID_VARIATION, "<>"}, + {RFC2822Headers.MESSAGE_ID_VARIATION, "<(419\\.43|989\\.28)"}, + {"X-MimeOLE", "MimeOLE V[^0-9]"}, + //Added 20-Jun-1999. Appears to be broken spamware. + {"MIME-Version", "1.0From"}, + //Added 28-July-1999. Check X-Mailer for spamware. + {"X-Mailer", "DiffondiCool"}, + {"X-Mailer", "Emailer Platinum"}, + {"X-Mailer", "eMerge"}, + {"X-Mailer", "Crescent Internet Tool"}, + //Added 4-Apr-2000. Check X-Mailer for Cybercreek Avalanche + {"X-Mailer", "Avalanche"}, + //Added 21-Oct-1999. Subject contains 20 or more consecutive spaces + {"Subject", " "}, + //Added 31-Mar-2000. Invalid headers from MyGuestBook.exe CGI spamware + {"MessageID", "<.+>"}, + {"X-References", "0[A-Z0-9]+, 0[A-Z0-9]+$"}, + {"X-Other-References", "0[A-Z0-9]+$"}, + {"X-See-Also", "0[A-Z0-9]+$"}, + //Updated 28-Apr-1999. Check for "Sender", "Resent-From", or "Resent-By" + // before "X-UIDL". If found, then exit. + {RFC2822Headers.SENDER, ".+"}, + {RFC2822Headers.RESENT_FROM, ".+"}, + {"Resent-By", ".+"}, + //Updated 19-May-1999. Check for "X-Mozilla-Status" before "X-UIDL". + {"X-Mozilla-Status", ".+"}, + //Updated 20-Jul-1999. Check for "X-Mailer: Internet Mail Service" + // before "X-UIDL". + {"X-Mailer", "Internet Mail Service"}, + //Updated 25-Oct-1999. Check for "X-ID" before "X-UIDL". + {"X-ID", ".+"}, + //X-UIDL is a POP3 header that should normally not be seen + {"X-UIDL", ".*"}, + //Some headers are valid only for the Pegasus Mail client. So first check + //for Pegasus header and exit if found. If not found, check for + //invalid headers: "Comments: Authenticated sender", "X-PMFLAGS" and "X-pmrqc". + {"X-mailer", "Pegasus"}, + //Added 27-Aug-1999. Pegasus now uses X-Mailer instead of X-mailer. + {"X-Mailer", "Pegasus"}, + //Added 25-Oct-1999. Check for X-Confirm-Reading-To. + {"X-Confirm-Reading-To", ".+"}, + //Check for invalid Pegasus headers + {RFC2822Headers.COMMENTS, "Authenticated sender"}, + {"X-PMFLAGS", ".*"}, + {"X-Pmflags", ".*"}, + {"X-pmrqc", ".*"}, + {"Host-From:envonly", ".*"}}; public void init() throws MessagingException { //No condition passed... just compile a bunch of regular expressions try { compile(NESPatterns); - } catch(PatternSyntaxException mp) { + } catch (PatternSyntaxException mp) { throw new MessagingException("Could not initialize NES patterns", mp); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java index 67b0c49..3444081 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java @@ -57,7 +57,7 @@ public class RecipientIsRegex extends GenericRecipientMatcher { patternString = patternString.trim(); try { pattern = Pattern.compile(patternString); - } catch(PatternSyntaxException mpe) { + } catch (PatternSyntaxException mpe) { throw new MessagingException("Malformed pattern: " + patternString, mpe); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java index 3988356..63aa634 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java @@ -66,7 +66,7 @@ public class SenderIsRegex extends GenericMatcher { patternString = patternString.trim(); try { pattern = Pattern.compile(patternString); - } catch(PatternSyntaxException mpe) { + } catch (PatternSyntaxException mpe) { throw new MessagingException("Malformed pattern: " + patternString, mpe); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index 541427c..c60e4a1 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -57,7 +57,7 @@ public class StripAttachmentTest { private static final String EXPECTED_ATTACHMENT_CONTENT = "\u0023\u00A4\u00E3\u00E0\u00E9"; private static final Optional<String> ABSENT_MIME_TYPE = Optional.empty(); - private static final String CONTENT_TRANSFER_ENCODING_VALUE ="8bit"; + private static final String CONTENT_TRANSFER_ENCODING_VALUE = "8bit"; public static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding"; public static final String CONTENT_TYPE = "Content-Type"; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java index 47f60fe..566627e 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java @@ -98,7 +98,7 @@ public class HasMailAttributeWithValueRegexTest extends } catch (AssertionFailedError e) { // NOTE the expected exception changes when the project is built/run // against non java 1.4 jvm. - assertEquals(exception+" (org.apache.oro.text.regex.MalformedPatternException: Unmatched parentheses.)", regexException); + assertEquals(exception + " (org.apache.oro.text.regex.MalformedPatternException: Unmatched parentheses.)", regexException); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java index 6582094..1c0b7aa 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java @@ -65,7 +65,7 @@ public class HostIsLocalTest { .recipients(ANY_AT_JAMES, OTHER_AT_JAMES) .build(); - assertThat( matcher.match(mail)).containsExactly(ANY_AT_JAMES, OTHER_AT_JAMES); + assertThat(matcher.match(mail)).containsExactly(ANY_AT_JAMES, OTHER_AT_JAMES); } @Test @@ -74,7 +74,7 @@ public class HostIsLocalTest { .recipients(ANY_AT_JAMES, ANY_AT_JAMES2) .build(); - assertThat( matcher.match(mail)).containsExactly(ANY_AT_JAMES); + assertThat(matcher.match(mail)).containsExactly(ANY_AT_JAMES); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java index a400370..6ffe14c 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RelayLimitTest.java @@ -81,6 +81,7 @@ public class RelayLimitTest { .condition("-1") .build()); } + @Test public void shouldNotMatchWhenNoReceivedHeader() throws Exception { testee.init(FakeMatcherConfig.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java index 4c1374e..4162fcb 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java @@ -45,7 +45,7 @@ public class SMTPAuthSuccessfulTest { } @Test - public void matchShouldReturnRecipientsWhenAuthUserAttributeIsPresent() throws Exception{ + public void matchShouldReturnRecipientsWhenAuthUserAttributeIsPresent() throws Exception { MailAddress recipient = MailAddressFixture.OTHER_AT_JAMES; FakeMail fakeMail = FakeMail.builder() .recipient(recipient) @@ -58,7 +58,7 @@ public class SMTPAuthSuccessfulTest { } @Test - public void matchShouldNotReturnRecipientsWhenAuthUserAttributeIsAbsent() throws Exception{ + public void matchShouldNotReturnRecipientsWhenAuthUserAttributeIsAbsent() throws Exception { FakeMail fakeMail = FakeMail.builder() .recipients(MailAddressFixture.OTHER_AT_JAMES) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java index 67e6285..29841bb 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java @@ -45,7 +45,7 @@ public class SentByMailetTest { } @Test - public void matchShouldReturnRecipientsWhenAuthUserAttributeIsPresent() throws Exception{ + public void matchShouldReturnRecipientsWhenAuthUserAttributeIsPresent() throws Exception { MailAddress recipient = MailAddressFixture.ANY_AT_JAMES; FakeMail fakeMail = FakeMail.builder() .recipient(recipient) @@ -58,7 +58,7 @@ public class SentByMailetTest { } @Test - public void matchShouldReturnEmptyCollectionWhenAuthUserAttributeIsAbsent() throws Exception{ + public void matchShouldReturnEmptyCollectionWhenAuthUserAttributeIsAbsent() throws Exception { FakeMail fakeMail = FakeMail.builder() .recipients(MailAddressFixture.ANY_AT_JAMES) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java index 766d0dd..4a6c726 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java @@ -57,7 +57,7 @@ public class TooManyRecipientsTest { } @Test - public void initShouldThrowOnInvalidCondition() throws Exception{ + public void initShouldThrowOnInvalidCondition() throws Exception { expectedException.expect(MessagingException.class); testee.init(FakeMatcherConfig.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mdn/src/main/java/org/apache/james/mdn/fields/ExtensionField.java ---------------------------------------------------------------------- diff --git a/mdn/src/main/java/org/apache/james/mdn/fields/ExtensionField.java b/mdn/src/main/java/org/apache/james/mdn/fields/ExtensionField.java index 893d1e6..a750f62 100644 --- a/mdn/src/main/java/org/apache/james/mdn/fields/ExtensionField.java +++ b/mdn/src/main/java/org/apache/james/mdn/fields/ExtensionField.java @@ -43,7 +43,7 @@ public class ExtensionField implements Field { @Override public String formattedValue() { - return fieldName + ": " +rawValue; + return fieldName + ": " + rawValue; } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java ---------------------------------------------------------------------- diff --git a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java index 673350a..5c01700 100644 --- a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java +++ b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java @@ -201,11 +201,11 @@ public class MailProtocolTestTask extends Task implements Monitor { throw new BuildException("Scripts can be specified either by the script attribute or as resource collections but not both."); } - for(AddUser user: users) { + for (AddUser user: users) { user.validate(); } - if(skip) { + if (skip) { log("Skipping excution"); } else if (errorProperty == null) { doExecute(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java ---------------------------------------------------------------------- diff --git a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java index d3ff9c0..c48af1e 100644 --- a/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java +++ b/mpt/antlib/src/test/java/org/apache/james/mpt/ant/TestRunScripts.java @@ -73,13 +73,13 @@ public class TestRunScripts extends TestCase { stubResourceCollection.add(unsupportedResource); subject.add(stubResourceCollection); subject.execute(); - assertEquals(SCRIPT +"\r\n", record.complete()); + assertEquals(SCRIPT + "\r\n", record.complete()); } public void testRunOneScriptFromCollection() throws Exception { subject.add(stubResourceCollection); subject.execute(); - assertEquals(SCRIPT +"\r\n", record.complete()); + assertEquals(SCRIPT + "\r\n", record.complete()); } public void testRunOneScriptFromAttribute() throws Exception { @@ -90,6 +90,6 @@ public class TestRunScripts extends TestCase { writer.close(); subject.setScript(file); subject.execute(); - assertEquals(SCRIPT +"\r\n", record.complete()); + assertEquals(SCRIPT + "\r\n", record.complete()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java index 98f443b..acb37f0 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java @@ -81,8 +81,7 @@ public class ExternalHostSystem extends ExternalSessionFactory implements ImapHo if (userAdder == null) { monitor.note("Please ensure user '" + user + "' with password '" + password + "' exists."); return false; - } - else { + } else { userAdder.addUser(user, password); } return true; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java index 6b3c678..90dda0d 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java @@ -77,8 +77,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { try { addProtocolLinesFromStream(is, session, fileName); - } - finally { + } finally { IOUtils.closeQuietly(is); } } @@ -105,30 +104,26 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { String location = fileName + ":" + lineNumber; if (SERVER_CONTINUATION_TAG.equals(next)) { session.CONT(sessionNumber); - } - else if (next.startsWith(CLIENT_TAG)) { + } else if (next.startsWith(CLIENT_TAG)) { String clientMsg = ""; if (next.length() > 3) { clientMsg = next.substring(3); } session.CL(sessionNumber, clientMsg); lastClientMsg = clientMsg; - } - else if (next.startsWith(SERVER_TAG)) { + } else if (next.startsWith(SERVER_TAG)) { String serverMsg = ""; if (next.length() > 3) { serverMsg = next.substring(3); } session.SL(sessionNumber, serverMsg, location, lastClientMsg); - } - else if (next.startsWith(WAIT)) { + } else if (next.startsWith(WAIT)) { if (next.length() > 5) { session.WAIT(sessionNumber, Long.valueOf(next.substring(5))); } else { throw new Exception("Invalid line length on WAIT instruction : " + next); } - } - else if (next.startsWith(LOG)) { + } else if (next.startsWith(LOG)) { String logInstruction = next.substring(4); if (logInstruction.startsWith(DEBUG)) { session.LOG(sessionNumber, ProtocolSession.LolLevel.Debug, logInstruction.substring(6)); @@ -141,11 +136,9 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { } else { throw new Exception("Unrecognized log level for " + next); } - } - else if (next.startsWith(REINIT)) { + } else if (next.startsWith(REINIT)) { session.REINIT(sessionNumber); - } - else if (next.startsWith(OPEN_UNORDERED_BLOCK_TAG)) { + } else if (next.startsWith(OPEN_UNORDERED_BLOCK_TAG)) { List<String> unorderedLines = new ArrayList<>(5); next = reader.readLine(); @@ -172,23 +165,19 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { } session.SUB(sessionNumber, unorderedLines, location, lastClientMsg); - } - else if (next.startsWith(COMMENT_TAG) || next.trim().length() == 0) { + } else if (next.startsWith(COMMENT_TAG) || next.trim().length() == 0) { // ignore these lines. - } - else if (next.startsWith(SESSION_TAG)) { + } else if (next.startsWith(SESSION_TAG)) { String number = next.substring(SESSION_TAG.length()).trim(); if (number.length() == 0) { throw new Exception("No session number specified"); } sessionNumber = Integer.parseInt(number); - } - else if (next.startsWith(TIMER)) { + } else if (next.startsWith(TIMER)) { TimerCommand timerCommand = TimerCommand.from(next.substring(TIMER_COMMAND_START, TIMER_COMMAND_END)); String timerName = next.substring(TIMER_COMMAND_END + 1); session.TIMER(timerCommand, timerName); - } - else { + } else { String prefix = next; if (next.length() > 3) { prefix = next.substring(0, 3); @@ -197,8 +186,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { } lineNumber++; } - } - finally { + } finally { IOUtils.closeQuietly(reader); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/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 3305ff8..0d3031f 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 @@ -131,12 +131,10 @@ public class ProtocolSession implements ProtocolInteractor { if (!elementsIterator.hasNext()) { nextTest = null; } - } - else { + } else { throw new RuntimeException("Unexpected continuation"); } - } - catch (Exception e) { + } catch (Exception e) { throw new RuntimeException(e); } } @@ -256,8 +254,7 @@ public class ProtocolSession implements ProtocolInteractor { for (Session session : sessions) { writeMessage(session); } - } - else { + } else { Session session = sessions[sessionNumber]; writeMessage(session); } @@ -337,8 +334,7 @@ public class ProtocolSession implements ProtocolInteractor { for (Session session : sessions) { checkResponse(session, continueAfterFailure); } - } - else { + } else { Session session = sessions[sessionNumber]; checkResponse(session, continueAfterFailure); } @@ -377,8 +373,7 @@ public class ProtocolSession implements ProtocolInteractor { protected String readLine(Session session) throws Exception { try { return session.readLine(); - } - catch (IOException e) { + } catch (IOException e) { String errMsg = "\nLocation: " + location + "\nExpected: " + expectedLine + "\nReason: Server Timeout."; throw new InvalidServerResponseException(errMsg); } @@ -555,7 +550,7 @@ public class ProtocolSession implements ProtocolInteractor { @Override public void testProtocol(Session[] sessions, boolean continueAfterFailure) throws Exception { - switch(timerCommand) { + switch (timerCommand) { case START: start(); break; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java index eb58a60..11766ca 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java @@ -255,7 +255,7 @@ public class ProtocolSessionBuilder { if (end < 0) { break; } - final String name = buffer.substring(start+2, end); + final String name = buffer.substring(start + 2, end); final String value = variables.getProperty(name); if (value != null) { buffer.replace(start, end + 1, value); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java index 07a4f12..feed478 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java @@ -173,8 +173,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SELF extend testElements.runSessions(sessions); continuation.session = postElements; postElements.runSessions(sessions); - } - finally { + } finally { for (Session session : sessions) { session.stop(); } @@ -204,8 +203,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SELF extend try { builder.addProtocolLinesFromStream(is, session, fileName); - } - finally { + } finally { IOUtils.closeQuietly(is); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java index 6d30902..1f39963 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java @@ -74,8 +74,7 @@ public final class ExternalSession implements Session { monitor.note("<-" + buffer.toString()); result = shabang; first = false; - } - else { + } else { result = buffer.toString(); monitor.note("<-" + result); } @@ -101,20 +100,17 @@ public final class ExternalSession implements Session { monitor.debug("[LF]"); // Reached end of the line result = false; - } - else if (next == '\r') { + } else if (next == '\r') { // CRLF line endings so drop monitor.debug("[CR]"); result = true; - } - else { + } else { // Load buffer monitor.debug(next); buffer.append(next); result = true; } - } - else { + } else { monitor.debug("[Reading into buffer]"); readBuffer.clear(); result = tryReadFromSocket(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java index 416a214..a731b01 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java @@ -142,7 +142,7 @@ public class DiscardProtocol { try { long lastConnection = System.currentTimeMillis(); - while(socket != null) { + while (socket != null) { final SocketChannel socketChannel = socket.accept(); if (socketChannel == null) { if (System.currentTimeMillis() - lastConnection > IDLE_TIMEOUT) { @@ -150,7 +150,7 @@ public class DiscardProtocol { } Thread.sleep(SOCKET_CONNECTION_WAIT_MILLIS); } else { - synchronized(queue) { + synchronized (queue) { Server nextServer = (Server) queue.poll(); if (nextServer == null) { nextServer = new Server(); @@ -224,12 +224,12 @@ public class DiscardProtocol { else { try { - while(!socketChannel.finishConnect()) { + while (!socketChannel.finishConnect()) { Thread.sleep(SOCKET_CONNECTION_WAIT_MILLIS); } int read = 0; - while(!aborted && socketChannel.isOpen() && read >= 0) { + while (!aborted && socketChannel.isOpen() && read >= 0) { read = socketChannel.read(buffer); if (!buffer.hasRemaining()) { decant(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java b/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java index 3800bdb..cf0e3d6 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/api/ImapFeaturesTest.java @@ -61,23 +61,23 @@ public class ImapFeaturesTest { assertThat(ImapFeatures.of().supports()).isTrue(); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void supportsShouldThrowOnNullFeature() { assertThat(ImapFeatures.of().supports((Feature)null)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void supportsShouldThrowOnNullFeatureArray() { assertThat(ImapFeatures.of().supports((Feature[])null)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void ofShouldThrowOnNullFeature() { ImapFeatures.of((Feature)null); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void ofShouldThrowOnNullFeatureArray() { ImapFeatures.of((Feature[])null); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java index eae4889..e1d1fbf 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ACLIntegration.java @@ -33,8 +33,8 @@ import org.junit.Test; public abstract class ACLIntegration implements ImapTestConstants { public static final String OTHER_USER_NAME = "Boby"; public static final String OTHER_USER_PASSWORD = "password"; - public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser( OTHER_USER_NAME, ""); - public static final MailboxPath MY_INBOX = MailboxPath.forUser( USER, ""); + public static final MailboxPath OTHER_USER_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, ""); + public static final MailboxPath MY_INBOX = MailboxPath.forUser(USER, ""); protected abstract ImapHostSystem createImapHostSystem(); protected abstract GrantRightsOnHost createGrantRightsOnHost(); @@ -103,7 +103,7 @@ public abstract class ACLIntegration implements ImapTestConstants { public void rightXOnOriginShouldBeSufficientToRenameAMailboxUS() throws Exception { scriptedTestProtocol .withMailbox(MailboxPath.forUser("Boby","test")) - .withGrantRights(MailboxPath.forUser( OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) + .withGrantRights(MailboxPath.forUser(OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) .run("aclIntegration/ACLIntegrationRightX"); } @@ -111,13 +111,13 @@ public abstract class ACLIntegration implements ImapTestConstants { public void rightXOnOriginShouldBeNeededToRenameAMailboxUS() throws Exception { scriptedTestProtocol .withMailbox(MailboxPath.forUser("Boby","test")) - .withGrantRights(MailboxPath.forUser( OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("rswipktela")) + .withGrantRights(MailboxPath.forUser(OTHER_USER_NAME, "test"), USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("rswipktela")) .run("aclIntegration/ACLIntegrationWithoutRightX"); } @Test public void rightKOnDestinationShouldBeSufficientToRenameAMailboxUS() throws Exception { - MailboxPath newMailbox = MailboxPath.forUser( USER, "test"); + MailboxPath newMailbox = MailboxPath.forUser(USER, "test"); scriptedTestProtocol .withMailbox(newMailbox) .withGrantRights(newMailbox, USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) @@ -127,7 +127,7 @@ public abstract class ACLIntegration implements ImapTestConstants { @Test public void rightKOnDestinationShouldBeNeededToRenameAMailboxUS() throws Exception { - MailboxPath newMailbox = MailboxPath.forUser( USER, "test"); + MailboxPath newMailbox = MailboxPath.forUser(USER, "test"); scriptedTestProtocol .withMailbox(newMailbox) .withGrantRights(newMailbox, USER, MailboxACL.Rfc4314Rights.fromSerializedRfc4314Rights("x")) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java index 64028dd..12f9f1d 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/ListingWithSharingTest.java @@ -33,8 +33,8 @@ import org.junit.Test; public abstract class ListingWithSharingTest implements ImapTestConstants { public static final String OTHER_USER_NAME = "Boby"; public static final String OTHER_USER_PASSWORD = "password"; - public static final MailboxPath OTHER_USER_SHARED_MAILBOX = MailboxPath.forUser( OTHER_USER_NAME, "sharedMailbox"); - public static final MailboxPath OTHER_USER_SHARED_MAILBOX_CHILD = MailboxPath.forUser( OTHER_USER_NAME, "sharedMailbox.child"); + public static final MailboxPath OTHER_USER_SHARED_MAILBOX = MailboxPath.forUser(OTHER_USER_NAME, "sharedMailbox"); + public static final MailboxPath OTHER_USER_SHARED_MAILBOX_CHILD = MailboxPath.forUser(OTHER_USER_NAME, "sharedMailbox.child"); protected abstract ImapHostSystem createImapHostSystem(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java index f1fb1b7..b0e3a2a 100644 --- a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java +++ b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java @@ -143,14 +143,14 @@ public class JCRHostSystem extends JamesImapHostSystem { shutdownRepository(); } - private void shutdownRepository() throws Exception{ + private void shutdownRepository() throws Exception { if (repository != null) { repository.shutdown(); repository = null; } } - private void delete(File home) throws Exception{ + private void delete(File home) throws Exception { if (home.exists()) { File[] files = home.listFiles(); if (files == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java ---------------------------------------------------------------------- diff --git a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java index 59c9417..f059bbc 100644 --- a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java +++ b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java @@ -37,7 +37,7 @@ import org.apache.james.mpt.user.ScriptedUserAdder; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -public class MailProtocolTest implements Monitor{ +public class MailProtocolTest implements Monitor { private static final ImapFeatures SUPPORTED_FEATURES = ImapFeatures.of(Feature.NAMESPACE_SUPPORT); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java ---------------------------------------------------------------------- diff --git a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java index d3a803e..a620b7d 100644 --- a/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java +++ b/mpt/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTestMojo.java @@ -27,7 +27,7 @@ import org.apache.maven.plugin.MojoFailureException; * Runs MPT scripts * @goal run */ -public class MailProtocolTestMojo extends AbstractMojo{ +public class MailProtocolTestMojo extends AbstractMojo { /** * The Mail Protocol Tests (MPT) to run http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java index 97ee6bd..e5723ff 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java @@ -35,7 +35,7 @@ import org.apache.james.protocols.api.future.FutureResponse; * * */ -public abstract class AbstractProtocolTransport implements ProtocolTransport{ +public abstract class AbstractProtocolTransport implements ProtocolTransport { private static final String CRLF = "\r\n"; @@ -52,7 +52,7 @@ public abstract class AbstractProtocolTransport implements ProtocolTransport{ // we do this synchronously because we may have a dequeuer thread working on // isAsync and responses. boolean enqueued = false; - synchronized(this) { + synchronized (this) { if (isAsync == true) { responses.offer(response); enqueued = true; @@ -88,7 +88,7 @@ public abstract class AbstractProtocolTransport implements ProtocolTransport{ // synchrnously we check responses and if it is empty we move back to non asynch // behaviour - synchronized(this) { + synchronized (this) { queuedResponse = responses.poll(); if (queuedResponse == null) { isAsync = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java index b3b354d..0878d79 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java @@ -27,7 +27,7 @@ import java.util.List; * * */ -public abstract class AbstractResponse implements Response{ +public abstract class AbstractResponse implements Response { private String retCode = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java index 8b53650..4d7d6f3 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java @@ -23,7 +23,7 @@ package org.apache.james.protocols.api; * Basic Request which contains a command and argument * */ -public class BaseRequest implements Request{ +public class BaseRequest implements Request { private final String command; private final String argument; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java index 5b2f127..156d865 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/CombinedInputStream.java @@ -31,7 +31,7 @@ import java.util.NoSuchElementException; * * */ -public class CombinedInputStream extends SequenceInputStream implements Iterable<InputStream>{ +public class CombinedInputStream extends SequenceInputStream implements Iterable<InputStream> { private final InputStream[] streams; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
