You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2013/03/01 00:31:42 UTC
svn commit: r1451435 [2/9] - in /james/server/trunk: ./ app/
app/src/assemble/ app/src/reporting-site/
cli/src/main/java/org/apache/james/cli/
cli/src/main/java/org/apache/james/cli/probe/impl/
core/src/main/java/org/apache/james/core/ data/data-api/sr...
Modified: james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java (original)
+++ james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java Thu Feb 28 23:31:36 2013
@@ -104,30 +104,16 @@ public class MimeMessageCopyOnWriteProxy
protected MessageReferenceTracker refCount;
- /**
- * @param original
- * MimeMessageWrapper
- * @throws MessagingException
- */
public MimeMessageCopyOnWriteProxy(MimeMessage original) {
this(original, false);
}
- /**
- * @param original
- * MimeMessageSource
- * @throws MessagingException
- */
public MimeMessageCopyOnWriteProxy(MimeMessageSource original) throws MessagingException {
this(new MimeMessageWrapper(original), true);
}
/**
* Private constructor providing an external reference counter.
- *
- * @param original
- * @param writeable
- * @throws MessagingException
*/
private MimeMessageCopyOnWriteProxy(MimeMessage original, boolean writeable) {
super(Session.getDefaultInstance(System.getProperties(), null));
@@ -167,9 +153,7 @@ public class MimeMessageCopyOnWriteProxy
return refCount.getWrapped();
}
- /**
- * @see org.apache.james.lifecycle.api.Disposable#dispose()
- */
+ @Override
public synchronized void dispose() {
if (refCount != null) {
refCount.decrementReferenceCount();
@@ -177,9 +161,7 @@ public class MimeMessageCopyOnWriteProxy
}
}
- /**
- * Rewritten for optimization purposes
- */
+ @Override
public void writeTo(OutputStream os) throws IOException, MessagingException {
getWrappedMessage().writeTo(os);
}
@@ -187,6 +169,7 @@ public class MimeMessageCopyOnWriteProxy
/**
* Rewritten for optimization purposes
*/
+ @Override
public void writeTo(OutputStream os, String[] ignoreList) throws IOException, MessagingException {
getWrappedMessage().writeTo(os, ignoreList);
}
@@ -195,511 +178,350 @@ public class MimeMessageCopyOnWriteProxy
* Various reader methods
*/
- /**
- * @see javax.mail.Message#getFrom()
- */
+ @Override
public Address[] getFrom() throws MessagingException {
return getWrappedMessage().getFrom();
}
- /**
- * @see javax.mail.Message#getRecipients(javax.mail.Message.RecipientType)
- */
+ @Override
public Address[] getRecipients(Message.RecipientType type) throws MessagingException {
return getWrappedMessage().getRecipients(type);
}
- /**
- * @see javax.mail.Message#getAllRecipients()
- */
+ @Override
public Address[] getAllRecipients() throws MessagingException {
return getWrappedMessage().getAllRecipients();
}
- /**
- * @see javax.mail.Message#getReplyTo()
- */
+ @Override
public Address[] getReplyTo() throws MessagingException {
return getWrappedMessage().getReplyTo();
}
- /**
- * @see javax.mail.Message#getSubject()
- */
+ @Override
public String getSubject() throws MessagingException {
return getWrappedMessage().getSubject();
}
- /**
- * @see javax.mail.Message#getSentDate()
- */
+ @Override
public Date getSentDate() throws MessagingException {
return getWrappedMessage().getSentDate();
}
- /**
- * @see javax.mail.Message#getReceivedDate()
- */
+ @Override
public Date getReceivedDate() throws MessagingException {
return getWrappedMessage().getReceivedDate();
}
- /**
- * @see javax.mail.Part#getSize()
- */
+ @Override
public int getSize() throws MessagingException {
return getWrappedMessage().getSize();
}
- /**
- * @see javax.mail.Part#getLineCount()
- */
+ @Override
public int getLineCount() throws MessagingException {
return getWrappedMessage().getLineCount();
}
- /**
- * @see javax.mail.Part#getContentType()
- */
+ @Override
public String getContentType() throws MessagingException {
return getWrappedMessage().getContentType();
}
- /**
- * @see javax.mail.Part#isMimeType(java.lang.String)
- */
+ @Override
public boolean isMimeType(String mimeType) throws MessagingException {
return getWrappedMessage().isMimeType(mimeType);
}
- /**
- * @see javax.mail.Part#getDisposition()
- */
+ @Override
public String getDisposition() throws MessagingException {
return getWrappedMessage().getDisposition();
}
- /**
- * @see javax.mail.internet.MimePart#getEncoding()
- */
+ @Override
public String getEncoding() throws MessagingException {
return getWrappedMessage().getEncoding();
}
- /**
- * @see javax.mail.internet.MimePart#getContentID()
- */
+ @Override
public String getContentID() throws MessagingException {
return getWrappedMessage().getContentID();
}
- /**
- * @see javax.mail.internet.MimePart#getContentMD5()
- */
+ @Override
public String getContentMD5() throws MessagingException {
return getWrappedMessage().getContentMD5();
}
- /**
- * @see javax.mail.Part#getDescription()
- */
+ @Override
public String getDescription() throws MessagingException {
return getWrappedMessage().getDescription();
}
- /**
- * @see javax.mail.internet.MimePart#getContentLanguage()
- */
+ @Override
public String[] getContentLanguage() throws MessagingException {
return getWrappedMessage().getContentLanguage();
}
- /**
- * @see javax.mail.internet.MimeMessage#getMessageID()
- */
+ @Override
public String getMessageID() throws MessagingException {
return getWrappedMessage().getMessageID();
}
- /**
- * @see javax.mail.Part#getFileName()
- */
+ @Override
public String getFileName() throws MessagingException {
return getWrappedMessage().getFileName();
}
- /**
- * @see javax.mail.Part#getInputStream()
- */
+ @Override
public InputStream getInputStream() throws IOException, MessagingException {
return getWrappedMessage().getInputStream();
}
- /**
- * @see javax.mail.Part#getDataHandler()
- */
+ @Override
public DataHandler getDataHandler() throws MessagingException {
return getWrappedMessage().getDataHandler();
}
- /**
- * @see javax.mail.Part#getContent()
- */
+ @Override
public Object getContent() throws IOException, MessagingException {
return getWrappedMessage().getContent();
}
- /**
- * @see javax.mail.Part#getHeader(java.lang.String)
- */
+ @Override
public String[] getHeader(String name) throws MessagingException {
return getWrappedMessage().getHeader(name);
}
- /**
- * @see javax.mail.internet.MimePart#getHeader(java.lang.String,
- * java.lang.String)
- */
+ @Override
public String getHeader(String name, String delimiter) throws MessagingException {
return getWrappedMessage().getHeader(name, delimiter);
}
- /**
- * @see javax.mail.Part#getAllHeaders()
- */
+ @Override
public Enumeration getAllHeaders() throws MessagingException {
return getWrappedMessage().getAllHeaders();
}
- /**
- * @see javax.mail.Part#getMatchingHeaders(java.lang.String[])
- */
+ @Override
public Enumeration getMatchingHeaders(String[] names) throws MessagingException {
return getWrappedMessage().getMatchingHeaders(names);
}
- /**
- * @see javax.mail.Part#getNonMatchingHeaders(java.lang.String[])
- */
+ @Override
public Enumeration getNonMatchingHeaders(String[] names) throws MessagingException {
return getWrappedMessage().getNonMatchingHeaders(names);
}
- /**
- * @see javax.mail.internet.MimePart#getAllHeaderLines()
- */
+ @Override
public Enumeration getAllHeaderLines() throws MessagingException {
return getWrappedMessage().getAllHeaderLines();
}
- /**
- * @see javax.mail.internet.MimePart#getMatchingHeaderLines(java.lang.String[])
- */
+ @Override
public Enumeration getMatchingHeaderLines(String[] names) throws MessagingException {
return getWrappedMessage().getMatchingHeaderLines(names);
}
- /**
- * @see javax.mail.internet.MimePart#getNonMatchingHeaderLines(java.lang.String[])
- */
+ @Override
public Enumeration getNonMatchingHeaderLines(String[] names) throws MessagingException {
return getWrappedMessage().getNonMatchingHeaderLines(names);
}
- /**
- * @see javax.mail.Message#getFlags()
- */
+ @Override
public Flags getFlags() throws MessagingException {
return getWrappedMessage().getFlags();
}
- /**
- * @see javax.mail.Message#isSet(javax.mail.Flags.Flag)
- */
+ @Override
public boolean isSet(Flags.Flag flag) throws MessagingException {
return getWrappedMessage().isSet(flag);
}
- /**
- * @see javax.mail.internet.MimeMessage#getSender()
- */
+ @Override
public Address getSender() throws MessagingException {
return getWrappedMessage().getSender();
}
- /**
- * @see javax.mail.Message#match(javax.mail.search.SearchTerm)
- */
+ @Override
public boolean match(SearchTerm arg0) throws MessagingException {
return getWrappedMessage().match(arg0);
}
- /**
- * @see javax.mail.internet.MimeMessage#getRawInputStream()
- */
+ @Override
public InputStream getRawInputStream() throws MessagingException {
return getWrappedMessage().getRawInputStream();
}
- /**
- * @see javax.mail.Message#getFolder()
- */
+ @Override
public Folder getFolder() {
return getWrappedMessage().getFolder();
}
- /**
- * @see javax.mail.Message#getMessageNumber()
- */
+ @Override
public int getMessageNumber() {
return getWrappedMessage().getMessageNumber();
}
- /**
- * @see javax.mail.Message#isExpunged()
- */
+ @Override
public boolean isExpunged() {
return getWrappedMessage().isExpunged();
}
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object arg0) {
return getWrappedMessage().equals(arg0);
}
- /**
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
return getWrappedMessage().hashCode();
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
return getWrappedMessage().toString();
}
- /*
- * Various writer methods
- */
-
- /**
- * @see javax.mail.Message#setFrom(javax.mail.Address)
- */
@Override
public void setFrom(Address address) throws MessagingException {
getWrappedMessageForWriting().setFrom(address);
}
- /**
- * @see javax.mail.Message#setFrom()
- */
@Override
public void setFrom() throws MessagingException {
getWrappedMessageForWriting().setFrom();
}
- /**
- * @see javax.mail.Message#addFrom(javax.mail.Address[])
- */
@Override
public void addFrom(Address[] addresses) throws MessagingException {
getWrappedMessageForWriting().addFrom(addresses);
}
- /**
- * @see javax.mail.Message#setRecipients(javax.mail.Message.RecipientType,
- * javax.mail.Address[])
- */
@Override
public void setRecipients(Message.RecipientType type, Address[] addresses) throws MessagingException {
getWrappedMessageForWriting().setRecipients(type, addresses);
}
- /**
- * @see javax.mail.Message#addRecipients(javax.mail.Message.RecipientType,
- * javax.mail.Address[])
- */
@Override
public void addRecipients(Message.RecipientType type, Address[] addresses) throws MessagingException {
getWrappedMessageForWriting().addRecipients(type, addresses);
}
- /**
- * @see javax.mail.Message#setReplyTo(javax.mail.Address[])
- */
@Override
public void setReplyTo(Address[] addresses) throws MessagingException {
getWrappedMessageForWriting().setReplyTo(addresses);
}
- /**
- * @see javax.mail.Message#setSubject(java.lang.String)
- */
@Override
public void setSubject(String subject) throws MessagingException {
getWrappedMessageForWriting().setSubject(subject);
}
- /**
- * @see javax.mail.internet.MimeMessage#setSubject(java.lang.String,
- * java.lang.String)
- */
@Override
public void setSubject(String subject, String charset) throws MessagingException {
getWrappedMessageForWriting().setSubject(subject, charset);
}
- /**
- * @see javax.mail.Message#setSentDate(java.util.Date)
- */
@Override
public void setSentDate(Date d) throws MessagingException {
getWrappedMessageForWriting().setSentDate(d);
}
- /**
- * @see javax.mail.Part#setDisposition(java.lang.String)
- */
@Override
public void setDisposition(String disposition) throws MessagingException {
getWrappedMessageForWriting().setDisposition(disposition);
}
- /**
- * @see javax.mail.internet.MimeMessage#setContentID(java.lang.String)
- */
@Override
public void setContentID(String cid) throws MessagingException {
getWrappedMessageForWriting().setContentID(cid);
}
- /**
- * @see javax.mail.internet.MimePart#setContentMD5(java.lang.String)
- */
+ @Override
public void setContentMD5(String md5) throws MessagingException {
getWrappedMessageForWriting().setContentMD5(md5);
}
- /**
- * @see javax.mail.Part#setDescription(java.lang.String)
- */
+ @Override
public void setDescription(String description) throws MessagingException {
getWrappedMessageForWriting().setDescription(description);
}
- /**
- * @see javax.mail.internet.MimeMessage#setDescription(java.lang.String,
- * java.lang.String)
- */
+ @Override
public void setDescription(String description, String charset) throws MessagingException {
getWrappedMessageForWriting().setDescription(description, charset);
}
- /**
- * @see javax.mail.internet.MimePart#setContentLanguage(java.lang.String[])
- */
+ @Override
public void setContentLanguage(String[] languages) throws MessagingException {
getWrappedMessageForWriting().setContentLanguage(languages);
}
- /**
- * @see javax.mail.Part#setFileName(java.lang.String)
- */
+ @Override
public void setFileName(String filename) throws MessagingException {
getWrappedMessageForWriting().setFileName(filename);
}
- /**
- * @see javax.mail.Part#setDataHandler(javax.activation.DataHandler)
- */
+ @Override
public void setDataHandler(DataHandler dh) throws MessagingException {
getWrappedMessageForWriting().setDataHandler(dh);
}
- /**
- * @see javax.mail.Part#setContent(java.lang.Object, java.lang.String)
- */
+ @Override
public void setContent(Object o, String type) throws MessagingException {
getWrappedMessageForWriting().setContent(o, type);
}
- /**
- * @see javax.mail.Part#setText(java.lang.String)
- */
+ @Override
public void setText(String text) throws MessagingException {
getWrappedMessageForWriting().setText(text);
}
- /**
- * @see javax.mail.internet.MimePart#setText(java.lang.String,
- * java.lang.String)
- */
+ @Override
public void setText(String text, String charset) throws MessagingException {
getWrappedMessageForWriting().setText(text, charset);
}
- /**
- * @see javax.mail.Part#setContent(javax.mail.Multipart)
- */
+ @Override
public void setContent(Multipart mp) throws MessagingException {
getWrappedMessageForWriting().setContent(mp);
}
/**
* This does not need a writable message
- *
- * @see javax.mail.Message#reply(boolean)
*/
+ @Override
public Message reply(boolean replyToAll) throws MessagingException {
return getWrappedMessage().reply(replyToAll);
}
- /**
- * @see javax.mail.Part#setHeader(java.lang.String, java.lang.String)
- */
+ @Override
public void setHeader(String name, String value) throws MessagingException {
getWrappedMessageForWriting().setHeader(name, value);
}
- /**
- * @see javax.mail.Part#addHeader(java.lang.String, java.lang.String)
- */
+ @Override
public void addHeader(String name, String value) throws MessagingException {
getWrappedMessageForWriting().addHeader(name, value);
}
- /**
- * @see javax.mail.Part#removeHeader(java.lang.String)
- */
+ @Override
public void removeHeader(String name) throws MessagingException {
getWrappedMessageForWriting().removeHeader(name);
}
- /**
- * @see javax.mail.internet.MimePart#addHeaderLine(java.lang.String)
- */
+ @Override
public void addHeaderLine(String line) throws MessagingException {
getWrappedMessageForWriting().addHeaderLine(line);
}
- /**
- * @see javax.mail.Message#setFlags(javax.mail.Flags, boolean)
- */
+ @Override
public void setFlags(Flags flag, boolean set) throws MessagingException {
getWrappedMessageForWriting().setFlags(flag, set);
}
- /**
- * @see javax.mail.Message#saveChanges()
- */
+ @Override
public void saveChanges() throws MessagingException {
getWrappedMessageForWriting().saveChanges();
}
@@ -708,48 +530,30 @@ public class MimeMessageCopyOnWriteProxy
* Since JavaMail 1.2
*/
- /**
- * @see javax.mail.internet.MimeMessage#addRecipients(javax.mail.Message.RecipientType,
- * java.lang.String)
- */
+ @Override
public void addRecipients(Message.RecipientType type, String addresses) throws MessagingException {
getWrappedMessageForWriting().addRecipients(type, addresses);
}
- /**
- * @see javax.mail.internet.MimeMessage#setRecipients(javax.mail.Message.RecipientType,
- * java.lang.String)
- */
+ @Override
public void setRecipients(Message.RecipientType type, String addresses) throws MessagingException {
getWrappedMessageForWriting().setRecipients(type, addresses);
}
- /**
- * @see javax.mail.internet.MimeMessage#setSender(javax.mail.Address)
- */
+ @Override
public void setSender(Address arg0) throws MessagingException {
getWrappedMessageForWriting().setSender(arg0);
}
- /**
- * @see javax.mail.Message#addRecipient(javax.mail.Message.RecipientType,
- * javax.mail.Address)
- */
public void addRecipient(RecipientType arg0, Address arg1) throws MessagingException {
getWrappedMessageForWriting().addRecipient(arg0, arg1);
}
- /**
- * @see javax.mail.Message#setFlag(javax.mail.Flags.Flag, boolean)
- */
+ @Override
public void setFlag(Flag arg0, boolean arg1) throws MessagingException {
getWrappedMessageForWriting().setFlag(arg0, arg1);
}
- /**
- * @return the message size
- * @throws MessagingException
- */
public long getMessageSize() throws MessagingException {
return MimeMessageUtil.getMessageSize(getWrappedMessage());
}
Modified: james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java (original)
+++ james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java Thu Feb 28 23:31:36 2013
@@ -112,7 +112,7 @@ public class MimeMessageWrapper extends
* @throws MessagingException
* @throws MessagingException
*/
- public MimeMessageWrapper(MimeMessageSource source) throws MessagingException {
+ public MimeMessageWrapper(MimeMessageSource source) {
this(Session.getDefaultInstance(System.getProperties()), source);
}
Modified: james/server/trunk/data/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java (original)
+++ james/server/trunk/data/data-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java Thu Feb 28 23:31:36 2013
@@ -29,7 +29,7 @@ import org.apache.james.domainlist.api.D
*/
public class SimpleDomainList implements DomainList {
- private List<String> domains = new LinkedList<String>();
+ private final List<String> domains = new LinkedList<String>();
@Override
public boolean containsDomain(String domain) throws DomainListException {
@@ -51,7 +51,7 @@ public class SimpleDomainList implements
@Override
public void removeDomain(String domain) throws DomainListException {
- if (domains.remove(domain) == false) {
+ if (!domains.remove(domain)) {
throw new DomainListException("Domain " + domain + " does not exist");
}
}
Modified: james/server/trunk/data/data-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/pom.xml (original)
+++ james/server/trunk/data/data-file/pom.xml Thu Feb 28 23:31:36 2013
@@ -104,6 +104,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java Thu Feb 28 23:31:36 2013
@@ -70,7 +70,7 @@ public class XMLDomainList extends Abstr
throw new DomainListException("Read-Only DomainList implementation");
String newDomain = domain.toLowerCase(Locale.US);
- if (containsDomain(newDomain) == false) {
+ if (!containsDomain(newDomain)) {
domainNames.add(newDomain);
}
}
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java Thu Feb 28 23:31:36 2013
@@ -19,21 +19,6 @@
package org.apache.james.mailrepository.file;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
@@ -44,19 +29,33 @@ import org.apache.james.repository.file.
import org.apache.james.repository.file.FilePersistentStreamRepository;
import org.apache.mailet.Mail;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
/**
* <p>
* Implementation of a MailRepository on a FileSystem.
* </p>
* <p>
* Requires a configuration element in the .conf.xml file of the form:
- *
+ * <p/>
* <pre>
* <repository destinationURL="file://path-to-root-dir-for-repository"
* type="MAIL"
* model="SYNCHRONOUS"/>
* </pre>
- *
+ * <p/>
* Requires a logger called MailRepository.
* </p>
*/
@@ -66,9 +65,10 @@ public class FileMailRepository extends
private FilePersistentObjectRepository objectRepository;
private String destination;
private Set keys;
+ private final Object lock = new Object();
private boolean fifo;
private boolean cacheKeys; // experimental: for use with write mostly
- // repositories such as spam and error
+ // repositories such as spam and error
private FileSystem fileSystem;
@Inject
@@ -111,25 +111,25 @@ public class FileMailRepository extends
// Finds non-matching pairs and deletes the extra files
HashSet streamKeys = new HashSet();
- for (Iterator i = streamRepository.list(); i.hasNext();) {
+ for (Iterator i = streamRepository.list(); i.hasNext(); ) {
streamKeys.add(i.next());
}
HashSet objectKeys = new HashSet();
- for (Iterator i = objectRepository.list(); i.hasNext();) {
+ for (Iterator i = objectRepository.list(); i.hasNext(); ) {
objectKeys.add(i.next());
}
Collection strandedStreams = (Collection) streamKeys.clone();
strandedStreams.removeAll(objectKeys);
- for (Iterator i = strandedStreams.iterator(); i.hasNext();) {
- String key = (String) i.next();
+ for (Object strandedStream : strandedStreams) {
+ String key = (String) strandedStream;
remove(key);
}
Collection strandedObjects = (Collection) objectKeys.clone();
strandedObjects.removeAll(streamKeys);
- for (Iterator i = strandedObjects.iterator(); i.hasNext();) {
- String key = (String) i.next();
+ for (Object strandedObject : strandedObjects) {
+ String key = (String) strandedObject;
remove(key);
}
@@ -137,13 +137,13 @@ public class FileMailRepository extends
// Next get a list from the object repository
// and use that for the list of keys
keys.clear();
- for (Iterator i = objectRepository.list(); i.hasNext();) {
+ for (Iterator i = objectRepository.list(); i.hasNext(); ) {
keys.add(i.next());
}
}
if (getLogger().isDebugEnabled()) {
- StringBuffer logBuffer = new StringBuffer(128).append(getClass().getName()).append(" created in ").append(destination);
- getLogger().debug(logBuffer.toString());
+ String logBuffer = getClass().getName() + " created in " + destination;
+ getLogger().debug(logBuffer);
}
} catch (Exception e) {
final String message = "Failed to retrieve Store component:" + e.getMessage();
@@ -152,9 +152,7 @@ public class FileMailRepository extends
}
}
- /**
- * @see org.apache.james.mailrepository.lib.AbstractMailRepository#internalStore(Mail)
- */
+ @Override
protected void internalStore(Mail mc) throws MessagingException, IOException {
String key = mc.getName();
if (keys != null && !keys.contains(key)) {
@@ -174,12 +172,12 @@ public class FileMailRepository extends
MimeMessageWrapper wrapper = (MimeMessageWrapper) message;
if (DEEP_DEBUG) {
System.out.println("Retrieving from: " + wrapper.getSourceId());
- StringBuffer debugBuffer = new StringBuffer(64).append("Saving to: ").append(destination).append("/").append(mc.getName());
- System.out.println(debugBuffer.toString());
+ String debugBuffer = "Saving to: " + destination + "/" + mc.getName();
+ System.out.println(debugBuffer);
System.out.println("Modified: " + wrapper.isModified());
}
- StringBuffer destinationBuffer = new StringBuffer(128).append(destination).append("/").append(mc.getName());
- if (destinationBuffer.toString().equals(wrapper.getSourceId())) {
+ String destinationBuffer = destination + "/" + mc.getName();
+ if (destinationBuffer.equals(wrapper.getSourceId())) {
if (!wrapper.isModified()) {
// We're trying to save to the same place, and it's not
// modified... we shouldn't save.
@@ -219,19 +217,14 @@ public class FileMailRepository extends
objectRepository.put(key, mc);
}
- /**
- * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String)
- */
+ @Override
public Mail retrieve(String key) throws MessagingException {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- getLogger().debug("Retrieving mail: " + key);
- }
try {
- Mail mc = null;
+ Mail mc;
try {
mc = (Mail) objectRepository.get(key);
} catch (RuntimeException re) {
- StringBuffer exceptionBuffer = new StringBuffer(128);
+ StringBuilder exceptionBuffer = new StringBuilder(128);
if (re.getCause() instanceof Error) {
exceptionBuffer.append("Error when retrieving mail, not deleting: ").append(re.toString());
} else {
@@ -253,9 +246,7 @@ public class FileMailRepository extends
}
}
- /**
- * @see org.apache.james.mailrepository.lib.AbstractMailRepository#internalRemove(String)
- */
+ @Override
protected void internalRemove(String key) throws MessagingException {
if (keys != null)
keys.remove(key);
@@ -263,26 +254,24 @@ public class FileMailRepository extends
objectRepository.remove(key);
}
- /**
- * @see org.apache.james.mailrepository.api.MailRepository#list()
- */
+ @Override
public Iterator list() {
// Fix ConcurrentModificationException by cloning
// the keyset before getting an iterator
final ArrayList clone;
if (keys != null)
- synchronized (keys) {
+ synchronized (lock) {
clone = new ArrayList(keys);
}
else {
clone = new ArrayList();
- for (Iterator i = objectRepository.list(); i.hasNext();) {
+ for (Iterator i = objectRepository.list(); i.hasNext(); ) {
clone.add(i.next());
}
}
if (fifo)
Collections.sort(clone); // Keys is a HashSet; impose FIFO for apps
- // that need it
+ // that need it
return clone.iterator();
}
}
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java Thu Feb 28 23:31:36 2013
@@ -160,11 +160,6 @@ public class MBoxMailRepository implemen
MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart);
}
- /**
- * The repository configuration
- */
- private HierarchicalConfiguration configuration;
-
private Logger logger;
public void setLog(Logger logger) {
@@ -172,7 +167,10 @@ public class MBoxMailRepository implemen
}
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
- this.configuration = configuration;
+ /*
+ The repository configuration
+ */
+ HierarchicalConfiguration configuration1 = configuration;
String destination;
this.mList = null;
BUFFERING = configuration.getBoolean("[@BUFFERING]", true);
@@ -242,8 +240,8 @@ public class MBoxMailRepository implemen
}
if (mimeMessage == null && getLogger().isDebugEnabled()) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Mime message is null");
- getLogger().debug(logBuffer.toString());
+ String logBuffer = this.getClass().getName() + " Mime message is null";
+ getLogger().debug(logBuffer);
}
/*
@@ -275,9 +273,9 @@ public class MBoxMailRepository implemen
private String generateKeyValue(String emailBody) throws NoSuchAlgorithmException {
// MD5 the email body for a reilable (ha ha) key
byte[] digArray = MessageDigest.getInstance("MD5").digest(emailBody.getBytes());
- StringBuffer digest = new StringBuffer();
- for (int i = 0; i < digArray.length; i++) {
- digest.append(Integer.toString(digArray[i], Character.MAX_RADIX).toUpperCase(Locale.US));
+ StringBuilder digest = new StringBuilder();
+ for (byte aDigArray : digArray) {
+ digest.append(Integer.toString(aDigArray, Character.MAX_RADIX).toUpperCase(Locale.US));
}
return digest.toString();
}
@@ -292,10 +290,10 @@ public class MBoxMailRepository implemen
* The action to take when a message is found
*/
private MimeMessage parseMboxFile(RandomAccessFile ins, MessageAction messAct) {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Start parsing ").append(mboxFile);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Start parsing " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
try {
@@ -305,11 +303,11 @@ public class MBoxMailRepository implemen
boolean inMessage = false;
StringBuffer messageBuffer = new StringBuffer();
String previousMessageSeparator = null;
- boolean foundSep = false;
+ boolean foundSep;
long prevMessageStart = ins.getFilePointer();
if (BUFFERING) {
- String line = null;
+ String line;
while ((line = ins.readLine()) != null) {
foundSep = sepMatchPattern.matcher(line).matches();
@@ -331,7 +329,7 @@ public class MBoxMailRepository implemen
}
// Only done at the start (first header)
if (foundSep && !inMessage) {
- previousMessageSeparator = line.toString();
+ previousMessageSeparator = line;
inMessage = true;
}
if (!foundSep && inMessage) {
@@ -361,7 +359,7 @@ public class MBoxMailRepository implemen
inMessage = true;
}
// Only done at the start (first header)
- if (foundSep && inMessage == false) {
+ if (foundSep && !inMessage) {
previousMessageSeparator = line.toString();
inMessage = true;
}
@@ -384,10 +382,10 @@ public class MBoxMailRepository implemen
} catch (PatternSyntaxException e) {
getLogger().error("Bad regex passed " + mboxFile, e);
} finally {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Finished parsing ").append(mboxFile);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Finished parsing " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
}
return null;
@@ -403,7 +401,7 @@ public class MBoxMailRepository implemen
* The key of the message to find
*/
private MimeMessage findMessage(String key) {
- MimeMessage foundMessage = null;
+ MimeMessage foundMessage;
// See if we can get the message by using the cache position first
foundMessage = selectMessage(key);
@@ -430,18 +428,18 @@ public class MBoxMailRepository implemen
// Can we find the key first
if (mList == null || !mList.containsKey(key)) {
// Not initiailised so no point looking
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" mList - key not found ").append(mboxFile);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " mList - key not found " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
return foundMessage;
}
- long messageStart = ((Long) mList.get(key)).longValue();
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Load message starting at offset ").append(messageStart).append(" from file ").append(mboxFile);
+ long messageStart = mList.get(key);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Load message starting at offset " + messageStart + " from file " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
// Now try and find the position in the file
RandomAccessFile ins = null;
@@ -474,10 +472,10 @@ public class MBoxMailRepository implemen
getLogger().error("Unable to write file (General I/O problem) " + mboxFile, e);
} finally {
if (foundMessage == null) {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" select - message not found ").append(mboxFile);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " select - message not found " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
}
if (ins != null)
@@ -516,8 +514,8 @@ public class MBoxMailRepository implemen
public MimeMessage messageAction(String messageSeparator, String bodyText, long messageStart) {
try {
String key = generateKeyValue(bodyText);
- mList.put(key, Long.valueOf(messageStart));
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ mList.put(key, messageStart);
+ if ((getLogger().isDebugEnabled())) {
getLogger().debug(this.getClass().getName() + " Key " + key + " at " + messageStart);
}
@@ -548,10 +546,10 @@ public class MBoxMailRepository implemen
*/
public void store(Mail mc) {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Will store message to file ").append(mboxFile);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Will store message to file " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
this.mList = null;
// Now make up the from header
@@ -572,7 +570,7 @@ public class MBoxMailRepository implemen
getLogger().error("Unable to parse mime message for " + mboxFile, e);
}
// And save only the new stuff to disk
- RandomAccessFile saveFile = null;
+ RandomAccessFile saveFile;
try {
saveFile = new RandomAccessFile(mboxFile, "rw");
saveFile.seek(saveFile.length()); // Move to the end
@@ -594,16 +592,16 @@ public class MBoxMailRepository implemen
loadKeys();
ArrayList<String> keys = new ArrayList<String>(mList.keySet());
- if (keys.isEmpty() == false) {
+ if (!keys.isEmpty()) {
// find the first message. This is a trick to make sure that if
// the file is changed out from under us, we will detect it and
// correct for it BEFORE we return the iterator.
- findMessage((String) keys.iterator().next());
+ findMessage(keys.iterator().next());
}
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" ").append(keys.size()).append(" keys to be iterated over.");
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " " + keys.size() + " keys to be iterated over.";
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
if (fifo)
Collections.sort(keys); // Keys is a HashSet; impose FIFO for apps
@@ -617,7 +615,7 @@ public class MBoxMailRepository implemen
public Mail retrieve(String key) {
loadKeys();
- MailImpl res = null;
+ MailImpl res;
MimeMessage foundMessage = findMessage(key);
if (foundMessage == null) {
@@ -627,10 +625,10 @@ public class MBoxMailRepository implemen
res = new MailImpl();
res.setMessage(foundMessage);
res.setName(key);
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Retrieving entry for key ").append(key);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Retrieving entry for key " + key;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
return res;
}
@@ -659,10 +657,10 @@ public class MBoxMailRepository implemen
// So wait for a file
while (!mBoxLock.createNewFile() && sleepCount < MAXSLEEPTIMES) {
try {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Waiting for lock on file ").append(mboxFile);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Waiting for lock on file " + mboxFile;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
Thread.sleep(LOCKSLEEPDELAY);
@@ -686,8 +684,8 @@ public class MBoxMailRepository implemen
String lockFileName = mboxFile + LOCKEXT;
File mBoxLock = new File(lockFileName);
if (!mBoxLock.delete()) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Failed to delete lock file ").append(lockFileName);
- getLogger().error(logBuffer.toString());
+ String logBuffer = this.getClass().getName() + " Failed to delete lock file " + lockFileName;
+ getLogger().error(logBuffer);
}
}
@@ -695,10 +693,10 @@ public class MBoxMailRepository implemen
* @see org.apache.james.mailrepository.api.MailRepository#remove(Collection)
*/
public void remove(final Collection<Mail> mails) {
- if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
- StringBuffer logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(" Removing entry for key ").append(mails);
+ if ((getLogger().isDebugEnabled())) {
+ String logBuffer = this.getClass().getName() + " Removing entry for key " + mails;
- getLogger().debug(logBuffer.toString());
+ getLogger().debug(logBuffer);
}
// The plan is as follows:
// Attempt to locate the message in the file
@@ -731,7 +729,7 @@ public class MBoxMailRepository implemen
break;
}
}
- if (foundKey == false) {
+ if (!foundKey) {
// We didn't find the key in the array so we will
// keep it
outputFile.writeBytes(messageSeparator + "\n");
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java Thu Feb 28 23:31:36 2013
@@ -74,8 +74,8 @@ public class MimeMessageStreamRepository
* @return the String ID
*/
public String getSourceId() {
- StringBuffer sourceIdBuffer = new StringBuffer(128).append(repositoryName).append("/").append(key);
- return sourceIdBuffer.toString();
+ String sourceIdBuffer = repositoryName + "/" + key;
+ return sourceIdBuffer;
}
/**
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java Thu Feb 28 23:31:36 2013
@@ -80,10 +80,8 @@ public class XMLRecipientRewriteTable ex
protected Map<String, Collection<String>> getAllMappingsInternal() throws RecipientRewriteTableException {
if (mappings != null && mappings.size() > 0) {
Map<String, Collection<String>> mappingsNew = new HashMap<String, Collection<String>>();
- Iterator<String> maps = mappings.keySet().iterator();
- while (maps.hasNext()) {
- String key = maps.next();
- mappingsNew.put(key, RecipientRewriteTableUtil.mappingToCollection(mappings.get(key).toString()));
+ for (String key : mappings.keySet()) {
+ mappingsNew.put(key, RecipientRewriteTableUtil.mappingToCollection(mappings.get(key)));
}
return mappingsNew;
} else {
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java Thu Feb 28 23:31:36 2013
@@ -60,7 +60,6 @@ public class UsersFileRepository extends
protected static boolean DEEP_DEBUG = false;
private FilePersistentObjectRepository objectRepository;
- private static String urlSeparator = "/";
/**
* The destination URL used to define the repository.
@@ -81,6 +80,7 @@ public class UsersFileRepository extends
super.doConfigure(configuration);
destination = configuration.getString("destination.[@URL]");
+ String urlSeparator = "/";
if (!destination.endsWith(urlSeparator)) {
destination += urlSeparator;
}
@@ -101,8 +101,8 @@ public class UsersFileRepository extends
objectRepository.configure(objectConfiguration);
objectRepository.init();
if (getLogger().isDebugEnabled()) {
- StringBuffer logBuffer = new StringBuffer(192).append(this.getClass().getName()).append(" created in ").append(destination);
- getLogger().debug(logBuffer.toString());
+ String logBuffer = this.getClass().getName() + " created in " + destination;
+ getLogger().debug(logBuffer);
}
} catch (Exception e) {
if (getLogger().isErrorEnabled()) {
@@ -163,7 +163,7 @@ public class UsersFileRepository extends
* @return The real name
* @throws UsersRepositoryException
*/
- private String getRealName(String name, boolean ignoreCase) throws UsersRepositoryException {
+ private String getRealName(String name, boolean ignoreCase) {
if (ignoreCase) {
Iterator<String> it = list();
while (it.hasNext()) {
@@ -223,10 +223,10 @@ public class UsersFileRepository extends
* This is not longer in the api (deprecated)
* @see org.apache.james.user.api.UsersRepository#containsCaseInsensitive(java.lang.String)
*/
- private boolean containsCaseInsensitive(String name) throws UsersRepositoryException {
+ private boolean containsCaseInsensitive(String name) {
Iterator<String> it = list();
while (it.hasNext()) {
- if (name.equalsIgnoreCase((String) it.next())) {
+ if (name.equalsIgnoreCase(it.next())) {
return true;
}
}
Modified: james/server/trunk/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java (original)
+++ james/server/trunk/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java Thu Feb 28 23:31:36 2013
@@ -37,8 +37,8 @@ public class XMLDomainListTest {
configuration.addProperty("autodetect", auto);
configuration.addProperty("autodetectIP", autoIP);
- for (int i = 0; i < names.size(); i++) {
- configuration.addProperty("domainnames.domainname", names.get(i).toString());
+ for (String name : names) {
+ configuration.addProperty("domainnames.domainname", name);
}
return configuration;
}
Modified: james/server/trunk/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/data/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java Thu Feb 28 23:31:36 2013
@@ -111,7 +111,7 @@ public class UsersFileRepositoryTest ext
if (this.usersRepository != null) {
Iterator<String> i = this.usersRepository.list();
while (i.hasNext()) {
- this.usersRepository.removeUser((String) i.next());
+ this.usersRepository.removeUser(i.next());
}
LifecycleUtil.dispose(this.usersRepository);
}
Modified: james/server/trunk/data/data-hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/pom.xml (original)
+++ james/server/trunk/data/data-hbase/pom.xml Thu Feb 28 23:31:36 2013
@@ -142,6 +142,11 @@
<artifactId>hadoop-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java (original)
+++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java Thu Feb 28 23:31:36 2013
@@ -45,7 +45,7 @@ public class HBaseDomainList extends Abs
/**
* The Logger.
*/
- private static Logger log = LoggerFactory.getLogger(HBaseDomainList.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(HBaseDomainList.class.getName());
/**
* @see org.apache.james.domainlist.api.DomainList#containsDomain(String)
@@ -141,7 +141,7 @@ public class HBaseDomainList extends Abs
scan.addFamily(HDomainList.COLUMN_FAMILY_NAME);
scan.setCaching(table.getScannerCaching() * 2);
resultScanner = table.getScanner(scan);
- Result result = null;
+ Result result;
while ((result = resultScanner.next()) != null) {
list.add(Bytes.toString(result.getRow()));
}
Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java (original)
+++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java Thu Feb 28 23:31:36 2013
@@ -50,7 +50,7 @@ public class HBaseRecipientRewriteTable
/**
* The Logger.
*/
- private static Logger log = LoggerFactory.getLogger(HBaseRecipientRewriteTable.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(HBaseRecipientRewriteTable.class.getName());
private static final String ROW_SEPARATOR = "@";
/**
@@ -121,7 +121,7 @@ public class HBaseRecipientRewriteTable
scan.addFamily(HRecipientRewriteTable.COLUMN_FAMILY_NAME);
scan.setCaching(table.getScannerCaching() * 2);
resultScanner = table.getScanner(scan);
- Result result = null;
+ Result result;
while ((result = resultScanner.next()) != null) {
List<KeyValue> keyValues = result.list();
if (keyValues != null) {
Modified: james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java (original)
+++ james/server/trunk/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java Thu Feb 28 23:31:36 2013
@@ -51,7 +51,7 @@ public class HBaseUsersRepository extend
/**
* The Logger.
*/
- private static Logger log = LoggerFactory.getLogger(HBaseUsersRepository.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(HBaseUsersRepository.class.getName());
/**
* Hashing algorithm for the password.
*/
@@ -195,7 +195,7 @@ public class HBaseUsersRepository extend
scan.addFamily(HUsersRepository.COLUMN_FAMILY_NAME);
scan.setCaching(table.getScannerCaching() * 2);
resultScanner = table.getScanner(scan);
- Result result = null;
+ Result result;
while ((result = resultScanner.next()) != null) {
list.add(Bytes.toString(result.getRow()));
}
Modified: james/server/trunk/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java (original)
+++ james/server/trunk/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java Thu Feb 28 23:31:36 2013
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
*/
public class HBaseDomainListTest extends AbstractDomainListTest {
- private static HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
+ private static final HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
@BeforeClass
public static void setMeUp() throws IOException {
Modified: james/server/trunk/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java (original)
+++ james/server/trunk/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java Thu Feb 28 23:31:36 2013
@@ -41,7 +41,7 @@ public class HBaseRecipientRewriteTableT
* The Logger.
*/
private static Logger logger = Logger.getLogger(HBaseRecipientRewriteTableTest.class);
- private static HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
+ private static final HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
@Before
public void setMeUp() throws IOException {
@@ -60,7 +60,6 @@ public class HBaseRecipientRewriteTableT
}
/**
- * @see org.apache.jÅames.rrt.lib.AbstractRecipientRewriteTableTest#addMapping(String, String, String, int)
*/
@Override
protected boolean addMapping(String user, String domain, String mapping, int type) throws
Modified: james/server/trunk/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java (original)
+++ james/server/trunk/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java Thu Feb 28 23:31:36 2013
@@ -31,7 +31,7 @@ import org.junit.Test;
*/
public class TablePoolTest {
- private static HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
+ private static final HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
@BeforeClass
public static void setMeUp() throws IOException {
Modified: james/server/trunk/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java (original)
+++ james/server/trunk/data/data-hbase/src/test/java/org/apache/james/user/hbase/HBaseUsersRepositoryTest.java Thu Feb 28 23:31:36 2013
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*/
public class HBaseUsersRepositoryTest extends AbstractUsersRepositoryTest {
- private static HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
+ private static final HBaseClusterSingleton cluster = HBaseClusterSingleton.build();
@BeforeClass
public static void setMeUp() throws IOException {
@@ -57,21 +57,12 @@ public class HBaseUsersRepositoryTest ex
}
/**
- * @see org.apache.james.user.lib.AbstractUsersRepositoryTest#tearDown()
- */
- @After
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
* Delete all users in the repository. Used between each tests.
*
* @throws UsersRepositoryException
* @throws Exception
*/
- private void deleteAll() throws UsersRepositoryException, Exception {
+ private void deleteAll() throws Exception {
Iterator<String> it = getUsersRepository().list();
while (it.hasNext()) {
getUsersRepository().removeUser(it.next());
Modified: james/server/trunk/data/data-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/pom.xml (original)
+++ james/server/trunk/data/data-jcr/pom.xml Thu Feb 28 23:31:36 2013
@@ -91,6 +91,11 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java (original)
+++ james/server/trunk/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java Thu Feb 28 23:31:36 2013
@@ -411,7 +411,7 @@ public class JCRMailRepository extends A
* @throws RepositoryException
* if a repository error occurs
*/
- private void setSender(Node node, MailAddress sender) throws MessagingException, RepositoryException {
+ private void setSender(Node node, MailAddress sender) throws RepositoryException {
node.setProperty("james:sender", sender.toString());
}
@@ -432,8 +432,8 @@ public class JCRMailRepository extends A
try {
Value[] values = node.getProperty("james:recipients").getValues();
Collection<MailAddress> recipients = new ArrayList<MailAddress>(values.length);
- for (int i = 0; i < values.length; i++) {
- recipients.add(new MailAddress(values[i].getString()));
+ for (Value value : values) {
+ recipients.add(new MailAddress(value.getString()));
}
return recipients;
} catch (PathNotFoundException e) {
@@ -454,7 +454,7 @@ public class JCRMailRepository extends A
* @throws RepositoryException
* if a repository error occurs
*/
- private void setRecipients(Node node, Collection<MailAddress> recipients) throws MessagingException, RepositoryException {
+ private void setRecipients(Node node, Collection<MailAddress> recipients) throws RepositoryException {
String[] values = new String[recipients.size()];
Iterator<MailAddress> iterator = recipients.iterator();
for (int i = 0; iterator.hasNext(); i++) {
@@ -508,7 +508,7 @@ public class JCRMailRepository extends A
* @throws IOException
* if an IO error occurs
*/
- private void setMessage(Node node, final MimeMessage message) throws MessagingException, RepositoryException, IOException {
+ private void setMessage(Node node, final MimeMessage message) throws RepositoryException, IOException {
try {
node = node.getNode("jcr:content");
} catch (PathNotFoundException e) {
@@ -581,7 +581,7 @@ public class JCRMailRepository extends A
private void setAttributes(Node node, Mail mail) throws RepositoryException, IOException {
Iterator<String> iterator = mail.getAttributeNames();
while (iterator.hasNext()) {
- String name = (String) iterator.next();
+ String name = iterator.next();
Object value = mail.getAttribute(name);
name = "jamesattr:" + Text.escapeIllegalJcrChars(name);
if (value instanceof String || value == null) {
Modified: james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java (original)
+++ james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java Thu Feb 28 23:31:36 2013
@@ -156,7 +156,6 @@ public class JCRUsersRepository extends
final String hashedSaltedPassword = jcrUser.getHashedSaltedPassword();
rootNode.getNode(path).setProperty(PASSWD_PROPERTY, hashedSaltedPassword);
session.save();
- return;
} catch (PathNotFoundException e) {
// user not found
getLogger().debug("User not found");
@@ -265,8 +264,8 @@ public class JCRUsersRepository extends
try {
final Node node = rootNode.getNode(path);
final String current = node.getProperty(PASSWD_PROPERTY).getString();
- if (current == null || current == "") {
- return password == null || password == "";
+ if (current == null || current.equals("")) {
+ return password == null || password.equals("");
}
final String hashPassword = JCRUser.hashPassword(username, password);
return current.equals(hashPassword);
Modified: james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java (original)
+++ james/server/trunk/data/data-jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java Thu Feb 28 23:31:36 2013
@@ -84,11 +84,7 @@ public class JCRUser implements User {
public boolean verifyPassword(String pass) {
final boolean result;
- if (pass == null) {
- result = false;
- } else {
- result = hashedSaltedPassword.equals(hashPassword(userName, pass));
- }
+ result = pass != null && hashedSaltedPassword.equals(hashPassword(userName, pass));
return result;
}
}
Modified: james/server/trunk/data/data-jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java (original)
+++ james/server/trunk/data/data-jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java Thu Feb 28 23:31:36 2013
@@ -62,8 +62,8 @@ public class JcrUserRepositoryTest exten
private void delete(File file) {
if (file.isDirectory()) {
File[] contents = file.listFiles();
- for (int i = 0; i < contents.length; i++) {
- delete(contents[i]);
+ for (File content : contents) {
+ delete(content);
}
}
file.delete();
Modified: james/server/trunk/data/data-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/pom.xml?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/pom.xml (original)
+++ james/server/trunk/data/data-jdbc/pom.xml Thu Feb 28 23:31:36 2013
@@ -93,11 +93,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
@@ -120,6 +115,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java (original)
+++ james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java Thu Feb 28 23:31:36 2013
@@ -187,14 +187,14 @@ public class JDBCMailRepository extends
// Build SqlParameters and get datasource name from URL parameters
if (urlParams.size() == 0) {
- StringBuffer exceptionBuffer = new StringBuffer(256).append("Malformed destinationURL - Must be of the format '").append("db://<data-source>[/<table>[/<repositoryName>]]'. Was passed ").append(configuration.getString("[@destinationURL]"));
- throw new ConfigurationException(exceptionBuffer.toString());
+ String exceptionBuffer = "Malformed destinationURL - Must be of the format '" + "db://<data-source>[/<table>[/<repositoryName>]]'. Was passed " + configuration.getString("[@destinationURL]");
+ throw new ConfigurationException(exceptionBuffer);
}
if (urlParams.size() >= 1) {
- datasourceName = (String) urlParams.get(0);
+ datasourceName = urlParams.get(0);
}
if (urlParams.size() >= 2) {
- tableName = (String) urlParams.get(1);
+ tableName = urlParams.get(1);
}
if (urlParams.size() >= 3) {
repositoryName = "";
@@ -202,13 +202,13 @@ public class JDBCMailRepository extends
if (i >= 3) {
repositoryName += '/';
}
- repositoryName += (String) urlParams.get(i);
+ repositoryName += urlParams.get(i);
}
}
if (getLogger().isDebugEnabled()) {
- StringBuffer logBuffer = new StringBuffer(128).append("Parsed URL: table = '").append(tableName).append("', repositoryName = '").append(repositoryName).append("'");
- getLogger().debug(logBuffer.toString());
+ String logBuffer = "Parsed URL: table = '" + tableName + "', repositoryName = '" + repositoryName + "'";
+ getLogger().debug(logBuffer);
}
inMemorySizeLimit = configuration.getInt("inMemorySizeLimit", 409600000);
@@ -233,7 +233,7 @@ public class JDBCMailRepository extends
*/
@PostConstruct
public void init() throws Exception {
- StringBuffer logBuffer = null;
+ StringBuffer logBuffer;
if (getLogger().isDebugEnabled()) {
getLogger().debug(this.getClass().getName() + ".initialize()");
}
@@ -258,8 +258,8 @@ public class JDBCMailRepository extends
}
if (getLogger().isDebugEnabled()) {
- StringBuffer logBuf = new StringBuffer(128).append(this.getClass().getName()).append(" created according to ").append(destination);
- getLogger().debug(logBuf.toString());
+ String logBuf = this.getClass().getName() + " created according to " + destination;
+ getLogger().debug(logBuf);
}
} catch (Exception e) {
final String message = "Failed to retrieve Store component:" + e.getMessage();
@@ -280,7 +280,7 @@ public class JDBCMailRepository extends
try {
// Initialise the sql strings.
- InputStream sqlFile = null;
+ InputStream sqlFile;
try {
sqlFile = fileSystem.getResource(sqlFileName);
} catch (Exception e) {
@@ -348,7 +348,7 @@ public class JDBCMailRepository extends
boolean hasMessageAttributesColumn = theJDBCUtil.columnExists(dbMetaData, tableName, attributesColumnName);
- StringBuffer logBuffer = new StringBuffer(64).append("JdbcMailRepository '" + repositoryName + ", table '" + tableName + "': ");
+ StringBuilder logBuffer = new StringBuilder(64).append("JdbcMailRepository '").append(repositoryName).append(", table '").append(tableName).append("': ");
// Determine whether attributes are used and available for storing
// Do we have updateMessageAttributesSQL?
@@ -365,17 +365,17 @@ public class JDBCMailRepository extends
}
if (hasUpdateMessageAttributesSQL && !hasRetrieveMessageAttributesSQL) {
- logBuffer.append("JDBC Mail Attributes support was activated for update but not for retrieval" + "(found 'updateMessageAttributesSQL' but not 'retrieveMessageAttributesSQL'" + "in table '" + tableName + "').");
+ logBuffer.append("JDBC Mail Attributes support was activated for update but not for retrieval" + "(found 'updateMessageAttributesSQL' but not 'retrieveMessageAttributesSQL'" + "in table '").append(tableName).append("').");
getLogger().error(logBuffer.toString());
throw new SQLException(logBuffer.toString());
}
if (!hasUpdateMessageAttributesSQL && hasRetrieveMessageAttributesSQL) {
- logBuffer.append("JDBC Mail Attributes support was activated for retrieval but not for update" + "(found 'retrieveMessageAttributesSQL' but not 'updateMessageAttributesSQL'" + "in table '" + tableName + "'.");
+ logBuffer.append("JDBC Mail Attributes support was activated for retrieval but not for update" + "(found 'retrieveMessageAttributesSQL' but not 'updateMessageAttributesSQL'" + "in table '").append(tableName).append("'.");
getLogger().error(logBuffer.toString());
throw new SQLException(logBuffer.toString());
}
if (!hasMessageAttributesColumn && (hasUpdateMessageAttributesSQL || hasRetrieveMessageAttributesSQL)) {
- logBuffer.append("JDBC Mail Attributes support was activated but column '" + attributesColumnName + "' is missing in table '" + tableName + "'.");
+ logBuffer.append("JDBC Mail Attributes support was activated but column '").append(attributesColumnName).append("' is missing in table '").append(tableName).append("'.");
getLogger().error(logBuffer.toString());
throw new SQLException(logBuffer.toString());
}
@@ -387,7 +387,7 @@ public class JDBCMailRepository extends
}
} else {
jdbcMailAttributesReady = false;
- logBuffer.append("JDBC Mail Attributes support not activated. " + "Missing both 'updateMessageAttributesSQL' " + "and 'retrieveMessageAttributesSQL' " + "statements for table '" + tableName + "' in sqlResources.xml. " + "Will not persist in the repository '" + repositoryName + "'.");
+ logBuffer.append("JDBC Mail Attributes support not activated. " + "Missing both 'updateMessageAttributesSQL' " + "and 'retrieveMessageAttributesSQL' " + "statements for table '").append(tableName).append("' in sqlResources.xml. ").append("Will not persist in the repository '").append(repositoryName).append("'.");
getLogger().warn(logBuffer.toString());
}
}
@@ -405,7 +405,7 @@ public class JDBCMailRepository extends
// Determine whether the message body has changed, and possibly
// avoid
// updating the database.
- boolean saveBody = false;
+ boolean saveBody;
MimeMessage messageBody = mc.getMessage();
// if the message is a CopyOnWrite proxy we check the modified
@@ -458,7 +458,7 @@ public class JDBCMailRepository extends
} else {
updateMessage.setString(3, mc.getSender().toString());
}
- StringBuffer recipients = new StringBuffer();
+ StringBuilder recipients = new StringBuilder();
for (Iterator<MailAddress> i = mc.getRecipients().iterator(); i.hasNext();) {
recipients.append(i.next().toString());
if (i.hasNext()) {
@@ -552,7 +552,7 @@ public class JDBCMailRepository extends
} else {
insertMessage.setString(5, mc.getSender().toString());
}
- StringBuffer recipients = new StringBuffer();
+ StringBuilder recipients = new StringBuilder();
for (Iterator<MailAddress> i = mc.getRecipients().iterator(); i.hasNext();) {
recipients.append(i.next().toString());
if (i.hasNext()) {
@@ -636,8 +636,8 @@ public class JDBCMailRepository extends
}
if (!rsMessage.next()) {
if (getLogger().isDebugEnabled()) {
- StringBuffer debugBuffer = new StringBuffer(64).append("Did not find a record ").append(key).append(" in ").append(repositoryName);
- getLogger().debug(debugBuffer.toString());
+ String debugBuffer = "Did not find a record " + key + " in " + repositoryName;
+ getLogger().debug(debugBuffer);
}
return null;
}
@@ -656,7 +656,7 @@ public class JDBCMailRepository extends
if (rsMessageAttr.next()) {
try {
- byte[] serialized_attr = null;
+ byte[] serialized_attr;
String getAttributesOption = sqlQueries.getDbOption("getAttributes");
if (getAttributesOption != null && (getAttributesOption.equalsIgnoreCase("useBlob") || getAttributesOption.equalsIgnoreCase("useBinaryStream"))) {
Blob b = rsMessageAttr.getBlob(1);
@@ -673,19 +673,19 @@ public class JDBCMailRepository extends
}
} catch (IOException ioe) {
if (getLogger().isDebugEnabled()) {
- StringBuffer debugBuffer = new StringBuffer(64).append("Exception reading attributes ").append(key).append(" in ").append(repositoryName);
- getLogger().debug(debugBuffer.toString(), ioe);
+ String debugBuffer = "Exception reading attributes " + key + " in " + repositoryName;
+ getLogger().debug(debugBuffer, ioe);
}
}
} else {
if (getLogger().isDebugEnabled()) {
- StringBuffer debugBuffer = new StringBuffer(64).append("Did not find a record (attributes) ").append(key).append(" in ").append(repositoryName);
- getLogger().debug(debugBuffer.toString());
+ String debugBuffer = "Did not find a record (attributes) " + key + " in " + repositoryName;
+ getLogger().debug(debugBuffer);
}
}
} catch (SQLException sqle) {
- StringBuffer errorBuffer = new StringBuffer(256).append("Error retrieving message").append(sqle.getMessage()).append(sqle.getErrorCode()).append(sqle.getSQLState()).append(sqle.getNextException());
- getLogger().error(errorBuffer.toString());
+ String errorBuffer = "Error retrieving message" + sqle.getMessage() + sqle.getErrorCode() + sqle.getSQLState() + sqle.getNextException();
+ getLogger().error(errorBuffer);
} finally {
theJDBCUtil.closeJDBCResultSet(rsMessageAttr);
theJDBCUtil.closeJDBCStatement(retrieveMessageAttr);
@@ -718,8 +718,8 @@ public class JDBCMailRepository extends
mc.setMessage(message);
return mc;
} catch (SQLException sqle) {
- StringBuffer errorBuffer = new StringBuffer(256).append("Error retrieving message").append(sqle.getMessage()).append(sqle.getErrorCode()).append(sqle.getSQLState()).append(sqle.getNextException());
- getLogger().error(errorBuffer.toString());
+ String errorBuffer = "Error retrieving message" + sqle.getMessage() + sqle.getErrorCode() + sqle.getSQLState() + sqle.getNextException();
+ getLogger().error(errorBuffer);
getLogger().debug("Failed to retrieve mail", sqle);
throw new MessagingException("Exception while retrieving mail: " + sqle.getMessage(), sqle);
} catch (Exception me) {
@@ -804,7 +804,7 @@ public class JDBCMailRepository extends
// TODO: Figure out whether other instance variables should be part of
// the equals equation
JDBCMailRepository repository = (JDBCMailRepository) obj;
- return ((repository.tableName == tableName) || ((repository.tableName != null) && repository.tableName.equals(tableName))) && ((repository.repositoryName == repositoryName) || ((repository.repositoryName != null) && repository.repositoryName.equals(repositoryName)));
+ return ((repository.tableName.equals(tableName)) || ((repository.tableName != null) && repository.tableName.equals(tableName))) && ((repository.repositoryName.equals(repositoryName)) || ((repository.repositoryName != null) && repository.repositoryName.equals(repositoryName)));
}
/**
@@ -836,8 +836,8 @@ public class JDBCMailRepository extends
// getParameterMetaData which could provide us with the parameterCount
char[] chars = sqlstring.toCharArray();
int count = 0;
- for (int i = 0; i < chars.length; i++) {
- count += chars[i] == '?' ? 1 : 0;
+ for (char aChar : chars) {
+ count += aChar == '?' ? 1 : 0;
}
return count;
}
Modified: james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java?rev=1451435&r1=1451434&r2=1451435&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java (original)
+++ james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java Thu Feb 28 23:31:36 2013
@@ -62,7 +62,7 @@ final class MessageInputStream extends I
/**
* Stream repository used for dbfiles (null otherwise)
*/
- private StreamRepository streamRep;
+ private final StreamRepository streamRep;
/**
* Main constructor. If srep is not null than we are using dbfiles and we
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org