Author: ieugen
Date: Wed Dec 19 00:52:24 2012
New Revision: 1423727
URL: http://svn.apache.org/viewvc?rev=1423727&view=rev
Log:
MAILET-45 Fixed issues reported by code-analisys
Modified:
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/SqlResources.java
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/Tokenizer.java
james/mailet/trunk/api/src/main/java/org/apache/mailet/MailAddress.java
james/mailet/trunk/base/src/main/java/org/apache/mailet/base/StringUtils.java
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/MailUtil.java
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/InitJCE.java
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/mailet/AbstractSign.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/NullTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java
Modified:
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
(original)
+++
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java
Wed Dec 19 00:52:24 2012
@@ -132,7 +132,6 @@ public class BayesianAnalysis extends Ge
private JDBCBayesianAnalyzer analyzer = new JDBCBayesianAnalyzer(this);
DataSource datasource;
- private String repositoryPath;
private static final String MAIL_ATTRIBUTE_NAME =
"org.apache.james.spam.probability";
private static final String HEADER_NAME = "X-MessageIsSpamProbability";
@@ -218,7 +217,7 @@ public class BayesianAnalysis extends Ge
* if a problem arises
*/
public void init() throws MessagingException {
- repositoryPath = getInitParameter("repositoryPath");
+ String repositoryPath = getInitParameter("repositoryPath");
if (repositoryPath == null) {
throw new MessagingException("repositoryPath is null");
Modified:
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
(original)
+++
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java
Wed Dec 19 00:52:24 2012
@@ -136,7 +136,6 @@ public class BayesianAnalysisFeeder exte
private JDBCBayesianAnalyzer analyzer = new JDBCBayesianAnalyzer(this);
private DataSource datasource;
- private String repositoryPath;
private String feedType;
@@ -194,7 +193,7 @@ public class BayesianAnalysisFeeder exte
* if a problem arises
*/
public void init() throws MessagingException {
- repositoryPath = getInitParameter("repositoryPath");
+ String repositoryPath = getInitParameter("repositoryPath");
if (repositoryPath == null) {
throw new MessagingException("repositoryPath is null");
Modified:
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/SqlResources.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/SqlResources.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/SqlResources.java
(original)
+++
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/SqlResources.java
Wed Dec 19 00:52:24 2012
@@ -165,7 +165,11 @@ class SqlResources {
}
if (!found) {
- StringBuilder exceptionBuffer = new
StringBuilder(64).append("Error loading sql definition file. ").append("The
element named \'").append(sqlDefsSection).append("\' does not exist.");
+ StringBuilder exceptionBuffer = new StringBuilder(64)
+ .append("Error loading sql definition file. ")
+ .append("The element named \'")
+ .append(sqlDefsSection)
+ .append("\' does not exist.");
throw new RuntimeException(exceptionBuffer.toString());
}
@@ -369,7 +373,10 @@ class SqlResources {
String sql = getSqlString(name);
if (sql == null && required) {
- StringBuilder exceptionBuffer = new
StringBuilder(64).append("Required SQL resource: '").append(name).append("' was
not found.");
+ StringBuilder exceptionBuffer = new StringBuilder(64)
+ .append("Required SQL resource: '")
+ .append(name)
+ .append("' was not found.");
throw new RuntimeException(exceptionBuffer.toString());
}
return sql;
Modified:
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/Tokenizer.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/Tokenizer.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/Tokenizer.java
(original)
+++
james/mailet/trunk/ai/classic/src/main/java/org/apache/james/ai/classic/Tokenizer.java
Wed Dec 19 00:52:24 2012
@@ -27,7 +27,6 @@ import java.io.Reader;
*/
public abstract class Tokenizer {
- private String token;
private String header = "";
/**
@@ -37,6 +36,7 @@ public abstract class Tokenizer {
*/
protected void doTokenize(Reader stream) throws IOException {
+ String token;
while ((token = nextToken(stream)) != null) {
boolean endingLine = false;
if (token.length() > 0 && token.charAt(token.length() - 1) ==
'\n') {
Modified:
james/mailet/trunk/api/src/main/java/org/apache/mailet/MailAddress.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/api/src/main/java/org/apache/mailet/MailAddress.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
--- james/mailet/trunk/api/src/main/java/org/apache/mailet/MailAddress.java
(original)
+++ james/mailet/trunk/api/src/main/java/org/apache/mailet/MailAddress.java Wed
Dec 19 00:52:24 2012
@@ -253,12 +253,7 @@ public class MailAddress implements java
@Override
public String toString() {
- StringBuilder addressBuffer =
- new StringBuilder(128)
- .append(localPart)
- .append("@")
- .append(domain);
- return addressBuffer.toString();
+ return localPart + "@" + domain;
}
/**
Modified:
james/mailet/trunk/base/src/main/java/org/apache/mailet/base/StringUtils.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/base/src/main/java/org/apache/mailet/base/StringUtils.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/base/src/main/java/org/apache/mailet/base/StringUtils.java
(original)
+++
james/mailet/trunk/base/src/main/java/org/apache/mailet/base/StringUtils.java
Wed Dec 19 00:52:24 2012
@@ -58,7 +58,7 @@ public final class StringUtils {
list.add(prev.substring(0, prev.length() - 1) + pattern +
array[i]);
}
}
- return list.toArray(new String[0]);
+ return list.toArray(new String[list.size()]);
}
/**
Modified:
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
(original)
+++
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
Wed Dec 19 00:52:24 2012
@@ -97,7 +97,7 @@ public class FakeMimeMessage extends Mim
String recipient = (String) aRecipientsList;
recipientAddresses.add(new InternetAddress(recipient));
}
- return recipientAddresses.toArray(new Address[]{});
+ return recipientAddresses.toArray(new
Address[recipientAddresses.size()]);
}
private List<Serializable> getRecipientsList(Message.RecipientType
recipientType) {
Modified:
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/MailUtil.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/MailUtil.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/MailUtil.java
(original)
+++
james/mailet/trunk/base/src/test/java/org/apache/mailet/base/test/MailUtil.java
Wed Dec 19 00:52:24 2012
@@ -44,9 +44,8 @@ public class MailUtil {
FakeMail mockedMail = new FakeMail();
mockedMail.setName(newId());
mockedMail.setMessage(m);
- mockedMail.setRecipients(Arrays.asList(new MailAddress[] {
- new MailAddress("[email protected]"),
- new MailAddress("[email protected]") }));
+ mockedMail.setRecipients(Arrays.asList(new
MailAddress("[email protected]"),
+ new MailAddress("[email protected]")));
return mockedMail;
}
Modified:
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/InitJCE.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/InitJCE.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/InitJCE.java
(original)
+++
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/InitJCE.java
Wed Dec 19 00:52:24 2012
@@ -40,7 +40,6 @@ import javax.activation.MailcapCommandMa
*
*/
public class InitJCE {
- private static String bouncyCastleProviderClassName =
"org.bouncycastle.jce.provider.BouncyCastleProvider";
private static boolean initialized = false;
/**
@@ -52,6 +51,7 @@ public class InitJCE {
*/
public static void init() throws InstantiationException,
IllegalAccessException, ClassNotFoundException {
if (!initialized) {
+ String bouncyCastleProviderClassName =
"org.bouncycastle.jce.provider.BouncyCastleProvider";
Security.addProvider((Provider)Class.forName(bouncyCastleProviderClassName).newInstance());
MailcapCommandMap mailcap = (MailcapCommandMap)
CommandMap.getDefaultCommandMap();
@@ -65,6 +65,7 @@ public class InitJCE {
CommandMap.setDefaultCommandMap(mailcap);
initialized = true;
- } else return;
+ } else {
+ }
}
}
Modified:
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/mailet/AbstractSign.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/mailet/AbstractSign.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/mailet/AbstractSign.java
(original)
+++
james/mailet/trunk/crypto/src/main/java/org/apache/james/mailet/crypto/mailet/AbstractSign.java
Wed Dec 19 00:52:24 2012
@@ -592,12 +592,9 @@ public abstract class AbstractSign exten
// if already signed return false
MimeMessage mimeMessage = mail.getMessage();
- if (mimeMessage.isMimeType("multipart/signed")
- || mimeMessage.isMimeType("application/pkcs7-mime")) {
- return false;
- }
-
- return true;
+ return !(mimeMessage.isMimeType("multipart/signed")
+ || mimeMessage.isMimeType("application/pkcs7-mime"));
+
}
/**
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java
Wed Dec 19 00:52:24 2012
@@ -529,7 +529,6 @@ public class ClamAVScan extends GenericM
+ address + " on port " + getPort() + ": " +
ioe.getMessage());
address = getNextAddress();
// retry
- continue;
}
}
}
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java
Wed Dec 19 00:52:24 2012
@@ -106,7 +106,7 @@ public class HeadersToHTTP extends Gener
HashSet<NameValuePair> pairs =
getNameValuePairs(message);
log(mail.getName() + "HeadersToHTTP: " + pairs.size() +
" named value pairs found");
String result = httpPost(pairs);
- if (passThrough == true) {
+ if (passThrough) {
addHeader(mail, true, result);
} else {
mail.setState(Mail.GHOST);
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java
Wed Dec 19 00:52:24 2012
@@ -178,7 +178,7 @@ public class OnlyText extends GenericMai
return res.toString();
}
- private final void initEntityTable() {
+ private void initEntityTable() {
for (int index = 11; index < 32; index++) charMap.put("#0" + index,
String.valueOf((char) index));
for (int index = 32; index < 128; index++) charMap.put("#" + index,
String.valueOf((char) index));
for (int index = 128; index < 256; index++) charMap.put("#" + index,
String.valueOf((char) index));
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java
Wed Dec 19 00:52:24 2012
@@ -275,12 +275,12 @@ public class ReplaceContent extends Gene
}
ReplaceConfig rConfig = new ReplaceConfig();
- rConfig.subjectPatterns = subjectPatternsList.toArray(new
Pattern[0]);
- rConfig.subjectSubstitutions =
subjectSubstitutionsList.toArray(new String[0]);
- rConfig.subjectFlags = subjectFlagsList.toArray(new Integer[0]);
- rConfig.bodyPatterns = bodyPatternsList.toArray(new Pattern[0]);
- rConfig.bodySubstitutions = bodySubstitutionsList.toArray(new
String[0]);
- rConfig.bodyFlags = bodyFlagsList.toArray(new Integer[0]);
+ rConfig.subjectPatterns = subjectPatternsList.toArray(new
Pattern[subjectPatternsList.size()]);
+ rConfig.subjectSubstitutions =
subjectSubstitutionsList.toArray(new String[subjectSubstitutionsList.size()]);
+ rConfig.subjectFlags = subjectFlagsList.toArray(new
Integer[subjectFlagsList.size()]);
+ rConfig.bodyPatterns = bodyPatternsList.toArray(new
Pattern[bodyPatternsList.size()]);
+ rConfig.bodySubstitutions = bodySubstitutionsList.toArray(new
String[bodySubstitutionsList.size()]);
+ rConfig.bodyFlags = bodyFlagsList.toArray(new
Integer[bodyFlagsList.size()]);
return rConfig;
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java
Wed Dec 19 00:52:24 2012
@@ -116,7 +116,7 @@ public class SerialiseToHTTP extends Gen
String serialisedMessage =
getSerialisedMessage(message);
NameValuePair[] nameValuePairs =
getNameValuePairs(serialisedMessage);
String result = httpPost(nameValuePairs);
- if (passThrough == true) {
+ if (passThrough) {
addHeader(mail, (result == null ||
result.length() == 0), result);
} else {
mail.setState(Mail.GHOST);
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ServerTime.java
Wed Dec 19 00:52:24 2012
@@ -46,12 +46,8 @@ public class ServerTime extends GenericM
public void service(Mail mail) throws javax.mail.MessagingException {
MimeMessage response = (MimeMessage)mail.getMessage().reply(false);
response.setSubject("The time is now...");
- StringBuilder textBuffer =
- new StringBuilder(128)
- .append("This mail server thinks it's ")
- .append((new java.util.Date()).toString())
- .append(".");
- response.setText(textBuffer.toString());
+ String textBuffer = "This mail server thinks it's " + (new
java.util.Date()).toString() + ".";
+ response.setText(textBuffer);
// Someone manually checking the server time by hand may send
// an formatted message, lacking From and To headers. If the
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
Wed Dec 19 00:52:24 2012
@@ -26,10 +26,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Pattern;
import javax.mail.Message;
@@ -93,10 +90,6 @@ public class StripAttachment extends Gen
public static final String SAVED_ATTACHMENTS_ATTRIBUTE_KEY =
"org.apache.james.transport.mailets.StripAttachment.saved";
- private String patternString = null;
-
- private String notpatternString = null;
-
private String removeAttachments = null;
private String directoryName = null;
@@ -128,8 +121,8 @@ public class StripAttachment extends Gen
* @throws MailetException
*/
public void init() throws MailetException {
- patternString = getInitParameter(PATTERN_PARAMETER_NAME);
- notpatternString = getInitParameter(NOTPATTERN_PARAMETER_NAME);
+ String patternString = getInitParameter(PATTERN_PARAMETER_NAME);
+ String notpatternString = getInitParameter(NOTPATTERN_PARAMETER_NAME);
if (patternString == null && notpatternString == null) {
throw new MailetException("No value for " + PATTERN_PARAMETER_NAME
+ " parameter was provided.");
@@ -183,19 +176,21 @@ public class StripAttachment extends Gen
if (getInitParameter(REPLACE_FILENAME_PATTERN_PARAMETER_NAME) != null)
{
PatternList pl = ReplaceContent
.getPatternsFromString(getInitParameter(REPLACE_FILENAME_PATTERN_PARAMETER_NAME));
- replaceFilenamePatterns = pl.getPatterns().toArray(new Pattern[0]);
- replaceFilenameSubstitutions = pl.getSubstitutions().toArray(new
String[0]);
- replaceFilenameFlags = pl.getFlags().toArray(new Integer[0]);
+ List<Pattern> patterns = pl.getPatterns();
+ replaceFilenamePatterns = patterns.toArray(new
Pattern[patterns.size()]);
+ List<String> substitutions = pl.getSubstitutions();
+ replaceFilenameSubstitutions = substitutions.toArray(new
String[substitutions.size()]);
+ List<Integer> flags = pl.getFlags();
+ replaceFilenameFlags = flags.toArray(new Integer[flags.size()]);
}
- String toLog = "StripAttachment is initialised with regex pattern ["
- + patternString + " / " + notpatternString + "]";
+ String toLog = String.format("StripAttachment is initialised with
regex pattern [%s / %s]",
+ patternString, notpatternString);
if (directoryName != null) {
- toLog += " and will save to directory [" + directoryName + "]";
+ toLog += String.format(" and will save to directory [%s]",
directoryName);
}
if (attributeName != null) {
- toLog += " and will store attachments to attribute ["
- + attributeName + "]";
+ toLog += String.format(" and will store attachments to attribute
[%s]", attributeName);
}
log(toLog);
}
@@ -224,8 +219,7 @@ public class StripAttachment extends Gen
analyseMultipartPartMessage(message, mail);
}
} catch (MessagingException e) {
- throw new MailetException(
- "Could not retrieve contenttype of message.", e);
+ throw new MailetException("Could not retrieve contenttype of
message.", e);
} catch (Exception e) {
throw new MailetException("Could not analyse message.", e);
}
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java
Wed Dec 19 00:52:24 2012
@@ -80,25 +80,14 @@ public class ToProcessor extends Generic
*/
public void service(Mail mail) throws MessagingException {
if (isDebug) {
- StringBuilder logBuffer =
- new StringBuilder(128)
- .append("Sending mail ")
- .append(mail)
- .append(" to ")
- .append(processor);
- log(logBuffer.toString());
+ log(String.format("Sending mail %s to %s", mail, processor));
}
mail.setState(processor);
if (noticeText != null) {
if (mail.getErrorMessage() == null) {
mail.setErrorMessage(noticeText);
} else {
- StringBuilder errorMessageBuffer =
- new StringBuilder(256)
- .append(mail.getErrorMessage())
- .append("\r\n")
- .append(noticeText);
- mail.setErrorMessage(errorMessageBuffer.toString());
+ mail.setErrorMessage(String.format("%s\r\n%s",
mail.getErrorMessage(), noticeText));
}
}
}
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java
Wed Dec 19 00:52:24 2012
@@ -121,7 +121,7 @@ public class AttachmentFileNameIs extend
mask.matchString = cleanFileName(mask.matchString);
theMasks.add(mask);
}
- masks = theMasks.toArray(new Mask[0]);
+ masks = theMasks.toArray(new Mask[theMasks.size()]);
}
/**
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java
Wed Dec 19 00:52:24 2012
@@ -95,7 +95,7 @@ public class HasHeader extends GenericMa
// headername and value found but the value does not
match the condition
match = false;
// if one condition fails the matcher returns false
- break header;
+ break;
}
} else {
// just the headername is specified
@@ -105,7 +105,7 @@ public class HasHeader extends GenericMa
// no headername is found
match = false;
// if one condition fails the matcher returns false
- break header;
+ break;
}
}
Modified:
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
(original)
+++
james/mailet/trunk/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java
Wed Dec 19 00:52:24 2012
@@ -64,10 +64,6 @@ public class RecipientIsRegex extends Ge
public boolean matchRecipient(MailAddress recipient) {
String myRecipient = recipient.toString();
- if (pattern.matcher(myRecipient).matches()){
- return true;
- } else {
- return false;
- }
+ return pattern.matcher(myRecipient).matches();
}
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
Wed Dec 19 00:52:24 2012
@@ -304,8 +304,7 @@ public class AddFooterTest extends TestC
mail.getMessage().writeTo(
rawMessage,
new String[] { "Bcc", "Content-Length", "Message-ID" });
- String res = rawMessage.toString();
- return res;
+ return rawMessage.toString();
}
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
Wed Dec 19 00:52:24 2012
@@ -51,8 +51,6 @@ public class MailAttributesToMimeHeaders
private String config1 = MAIL_ATTRIBUTE_NAME1 + "; " + HEADER_NAME1;
- private String config2 = MAIL_ATTRIBUTE_NAME2 + "; " + HEADER_NAME2;
-
public MailAttributesToMimeHeadersTest(String arg0)
throws UnsupportedEncodingException {
super(arg0);
@@ -71,6 +69,7 @@ public class MailAttributesToMimeHeaders
FakeMailetConfig mci = new FakeMailetConfig("Test",
new FakeMailContext());
mci.setProperty("simplemapping", getConfig1());
+ String config2 = MAIL_ATTRIBUTE_NAME2 + "; " + HEADER_NAME2;
mci.setProperty("simplemapping", config2);
mailet.init(mci);
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/NullTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/NullTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/NullTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/NullTest.java
Wed Dec 19 00:52:24 2012
@@ -42,8 +42,6 @@ public class NullTest extends TestCase {
private Mailet mailet;
- private final String PROCESSOR = "ghost";
-
public NullTest(String arg0) throws UnsupportedEncodingException {
super(arg0);
}
@@ -67,6 +65,7 @@ public class NullTest extends TestCase {
mailet.service(mockedMail);
+ String PROCESSOR = "ghost";
assertEquals(PROCESSOR, mockedMail.getState());
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
Wed Dec 19 00:52:24 2012
@@ -32,8 +32,6 @@ import java.io.UnsupportedEncodingExcept
public class SetMailAttributeTest extends TestCase {
- private Mail mockedMail;
-
private Mailet mailet;
private final String ATTRIBUTE_NAME1 = "org.apache.james.junit1";
@@ -57,7 +55,7 @@ public class SetMailAttributeTest extend
// test if the Header was add
public void testMailAttributeAdded() throws MessagingException {
- mockedMail = MailUtil.createMockMail2Recipients(null);
+ Mail mockedMail = MailUtil.createMockMail2Recipients(null);
setupMailet();
assertNull(mockedMail.getAttribute(ATTRIBUTE_NAME1));
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/AllTest.java
Wed Dec 19 00:52:24 2012
@@ -20,25 +20,20 @@
package org.apache.james.transport.matchers;
+import junit.framework.TestCase;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.Matcher;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.base.test.MailUtil;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.Matcher;
-
import javax.mail.MessagingException;
-
import java.io.UnsupportedEncodingException;
import java.util.Collection;
-import junit.framework.TestCase;
-
public class AllTest extends TestCase {
- private FakeMail mockedMail;
-
private Matcher matcher;
public AllTest(String arg0) throws UnsupportedEncodingException {
@@ -54,7 +49,7 @@ public class AllTest extends TestCase {
// test if all recipients was returned
public void testAllRecipientsReturned() throws MessagingException {
- mockedMail = MailUtil.createMockMail2Recipients(null);
+ FakeMail mockedMail = MailUtil.createMockMail2Recipients(null);
setupMatcher();
Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
Wed Dec 19 00:52:24 2012
@@ -43,8 +43,6 @@ public class HasHeaderTest extends TestC
private final String HEADER_NAME = "JUNIT";
- private final String HEADER_VALUE = "test-value";
-
private String headerName = "defaultHeaderName";
private String headerValue = "defaultHeaderValue";
@@ -76,6 +74,7 @@ public class HasHeaderTest extends TestC
// test if the Header was matched
public void testHeaderIsMatched() throws MessagingException {
setHeaderName(HEADER_NAME);
+ String HEADER_VALUE = "test-value";
setHeaderValue(HEADER_VALUE);
setupMockedMimeMessage();
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
Wed Dec 19 00:52:24 2012
@@ -41,8 +41,6 @@ public class HostIsTest extends TestCase
private Matcher matcher;
- private final String HOST_NAME = "james.apache.org";
-
private MailAddress[] recipients;
public HostIsTest(String arg0) throws UnsupportedEncodingException {
@@ -61,6 +59,7 @@ public class HostIsTest extends TestCase
private void setupMatcher() throws MessagingException {
matcher = new HostIs();
+ String HOST_NAME = "james.apache.org";
FakeMatcherConfig mci = new FakeMatcherConfig("HostIs=" + HOST_NAME,
new FakeMailContext());
matcher.init(mci);
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsTest.java
Wed Dec 19 00:52:24 2012
@@ -30,13 +30,12 @@ import org.apache.mailet.Matcher;
public class RecipientIsTest extends AbstractRecipientIsTest {
- private final String RECIPIENT_NAME = "[email protected]";
-
public RecipientIsTest(String arg0) throws UnsupportedEncodingException {
super(arg0);
}
protected String getRecipientName() {
+ String RECIPIENT_NAME = "[email protected]";
return RECIPIENT_NAME;
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java
Wed Dec 19 00:52:24 2012
@@ -23,8 +23,6 @@ package org.apache.james.transport.match
import org.apache.mailet.base.GenericMatcher;
public class SMTPAuthSuccessfulTest extends AbstractHasMailAttributeTest {
-
- private final String SMTP_AUTH_USER_ATTRIBUTE_NAME =
"org.apache.james.SMTPAuthUser";
protected String getHasMailAttribute() {
return "";
@@ -40,6 +38,7 @@ public class SMTPAuthSuccessfulTest exte
protected void init() {
super.init();
+ String SMTP_AUTH_USER_ATTRIBUTE_NAME = "org.apache.james.SMTPAuthUser";
setMailAttributeName(SMTP_AUTH_USER_ATTRIBUTE_NAME);
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java
Wed Dec 19 00:52:24 2012
@@ -28,8 +28,6 @@ import org.apache.mailet.MailAddress;
import org.apache.mailet.base.GenericMatcher;
public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest {
-
- private final String SMTP_AUTH_USER_ATTRIBUTE_NAME =
"org.apache.james.SMTPAuthUser";
protected String getHasMailAttribute() {
return "[email protected]";
@@ -45,6 +43,7 @@ public class SMTPAuthUserIsTest extends
protected void init() {
super.init();
+ String SMTP_AUTH_USER_ATTRIBUTE_NAME = "org.apache.james.SMTPAuthUser";
setMailAttributeName(SMTP_AUTH_USER_ATTRIBUTE_NAME);
setMailAttributeValue("[email protected]");
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
Wed Dec 19 00:52:24 2012
@@ -43,8 +43,6 @@ public class SMTPIsAuthNetworkTest exten
private boolean isAuthorized = false;
- private final String MAIL_ATTRIBUTE_NAME =
"org.apache.james.SMTPIsAuthNetwork";
-
public SMTPIsAuthNetworkTest(String arg0)
throws UnsupportedEncodingException {
super(arg0);
@@ -57,6 +55,7 @@ public class SMTPIsAuthNetworkTest exten
private void setupMockedMail() throws ParseException {
mockedMail = MailUtil.createMockMail2Recipients(null);
if (isAuthorized) {
+ String MAIL_ATTRIBUTE_NAME = "org.apache.james.SMTPIsAuthNetwork";
mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME, "true");
}
}
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
Wed Dec 19 00:52:24 2012
@@ -30,8 +30,6 @@ import org.apache.mailet.Matcher;
public class SenderIsRegexTest extends AbstractSenderIsTest {
- private final String SENDER_NAME = "[email protected]";
-
private String regex = ".*";
public SenderIsRegexTest(String arg0) throws UnsupportedEncodingException {
@@ -45,6 +43,7 @@ public class SenderIsRegexTest extends A
// test if matched
public void testSenderIsRegexMatchedAllRecipients()
throws MessagingException {
+ String SENDER_NAME = "[email protected]";
setSender(new MailAddress(SENDER_NAME));
setRegex(".*@.*");
setupMockedMail();
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java
Wed Dec 19 00:52:24 2012
@@ -30,8 +30,6 @@ import org.apache.mailet.Matcher;
public class SubjectStartsWithTest extends AbstractSubjectIsTest {
- private final String SUBJECT_NAME = "testSubject";
-
public SubjectStartsWithTest(String arg0)
throws UnsupportedEncodingException {
super(arg0);
@@ -39,6 +37,7 @@ public class SubjectStartsWithTest exten
// test if the recipients get returned as matched
public void testHostIsMatchedAllRecipients() throws MessagingException {
+ String SUBJECT_NAME = "testSubject";
setSubject(SUBJECT_NAME);
setupAll();
Modified:
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java?rev=1423727&r1=1423726&r2=1423727&view=diff
==============================================================================
---
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java
(original)
+++
james/mailet/trunk/standard/src/test/java/org/apache/james/transport/matchers/UserIsTest.java
Wed Dec 19 00:52:24 2012
@@ -30,13 +30,12 @@ import org.apache.mailet.Matcher;
public class UserIsTest extends AbstractRecipientIsTest {
- private final String USER = "test";
-
public UserIsTest(String arg0) throws UnsupportedEncodingException {
super(arg0);
}
protected String getRecipientName() {
+ String USER = "test";
return USER;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
