Author: rdonkin
Date: Sun Jan 18 12:49:47 2009
New Revision: 735538
URL: http://svn.apache.org/viewvc?rev=735538&view=rev
Log:
Improved names
Added:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ContentUtils.java
- copied, changed from r735524,
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageUtils.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
- copied, changed from r735524,
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageRowUtils.java
Removed:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageRowUtils.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageUtils.java
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsCountUnnormalLinesTest.java
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsNormalisedWriteToTest.java
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
Sun Jan 18 12:49:47 2009
@@ -36,7 +36,7 @@
public ByteContent(final byte[] contents) {
this.contents = contents;
- size = contents.length + MessageUtils.countUnnormalLines(contents);
+ size = contents.length + ContentUtils.countUnnormalLines(contents);
}
public long size() {
@@ -44,7 +44,7 @@
}
public void writeTo(StringBuffer buffer) {
- MessageUtils.normalisedWriteTo(contents, buffer);
+ ContentUtils.normalisedWriteTo(contents, buffer);
}
public void writeTo(WritableByteChannel channel) throws IOException {
Copied:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ContentUtils.java
(from r735524,
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageUtils.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ContentUtils.java?p2=james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ContentUtils.java&p1=james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageUtils.java&r1=735524&r2=735538&rev=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageUtils.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ContentUtils.java
Sun Jan 18 12:49:47 2009
@@ -27,7 +27,7 @@
* Utility methods for messages.
*
*/
-public class MessageUtils {
+public class ContentUtils {
private static final int BYTE_STREAM_CAPACITY = 8182;
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
Sun Jan 18 12:49:47 2009
@@ -45,7 +45,7 @@
private long caculateSize() {
long result = contents.length
- + MessageUtils.countUnnormalLines(contents);
+ + ContentUtils.countUnnormalLines(contents);
result += 2;
for (final Iterator it = headers.iterator(); it.hasNext();) {
final MessageResult.Header header = (MessageResult.Header) it
@@ -70,7 +70,7 @@
}
buffer.append('\r');
buffer.append('\n');
- MessageUtils.normalisedWriteTo(contents, buffer);
+ ContentUtils.normalisedWriteTo(contents, buffer);
}
public long size() {
@@ -78,7 +78,7 @@
}
public void writeTo(WritableByteChannel channel) throws IOException {
- ByteBuffer newLine = ByteBuffer.wrap(MessageRowUtils.BYTES_NEW_LINE);
+ ByteBuffer newLine = ByteBuffer.wrap(ResultUtils.BYTES_NEW_LINE);
for (final Iterator it = headers.iterator(); it.hasNext();) {
final MessageResult.Header header = (MessageResult.Header) it
.next();
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
Sun Jan 18 12:49:47 2009
@@ -151,7 +151,7 @@
private boolean bodyContains(String value, MailboxMembership message)
throws IOException, MimeException {
- final InputStream input = MessageRowUtils.toInput(message);
+ final InputStream input = ResultUtils.toInput(message);
final boolean result = isInMessage(value, input, false);
return result;
}
@@ -169,7 +169,7 @@
private boolean messageContains(String value, MailboxMembership message)
throws IOException, MimeException {
- final InputStream input = MessageRowUtils.toInput(message);
+ final InputStream input = ResultUtils.toInput(message);
final boolean result = isInMessage(value, input, true);
return result;
}
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
Sun Jan 18 12:49:47 2009
@@ -150,7 +150,7 @@
}
}
if (valid) {
- content =
MessageUtils.toByteArray(parser.getInputStream());
+ content =
ContentUtils.toByteArray(parser.getInputStream());
} else {
content = EMPTY;
}
@@ -182,7 +182,7 @@
}
}
if (valid) {
- content = MessageUtils.toByteArray(parser.getInputStream());
+ content = ContentUtils.toByteArray(parser.getInputStream());
} else {
content = EMPTY;
}
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
Sun Jan 18 12:49:47 2009
@@ -79,11 +79,11 @@
}
public void writeTo(WritableByteChannel channel) throws IOException {
- writeAll(channel, MessageRowUtils.US_ASCII.encode(name));
+ writeAll(channel, ResultUtils.US_ASCII.encode(name));
ByteBuffer buffer = ByteBuffer
- .wrap(MessageRowUtils.BYTES_HEADER_FIELD_VALUE_SEP);
+ .wrap(ResultUtils.BYTES_HEADER_FIELD_VALUE_SEP);
writeAll(channel, buffer);
- writeAll(channel, MessageRowUtils.US_ASCII.encode(value));
+ writeAll(channel, ResultUtils.US_ASCII.encode(value));
}
private void writeAll(WritableByteChannel channel, ByteBuffer buffer)
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
Sun Jan 18 12:49:47 2009
@@ -54,7 +54,7 @@
}
public MessageFlags[] getMessageFlags() {
- final MessageFlags[] results =
MessageRowUtils.toMessageFlags(messages);
+ final MessageFlags[] results = ResultUtils.toMessageFlags(messages);
return results;
}
@@ -80,7 +80,7 @@
MessageResult result;
try {
- result = MessageRowUtils.loadMessageResult(message,
this.fetchGroup);
+ result = ResultUtils.loadMessageResult(message, this.fetchGroup);
} catch (MailboxException e) {
result = new UnloadedMessageResult(message, e);
}
Copied:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
(from r735524,
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageRowUtils.java)
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?p2=james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java&p1=james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageRowUtils.java&r1=735524&r2=735538&rev=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageRowUtils.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
Sun Jan 18 12:49:47 2009
@@ -43,7 +43,7 @@
import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.mime4j.MimeException;
-public class MessageRowUtils {
+public class ResultUtils {
public static final byte[] BYTES_NEW_LINE = { 0x0D, 0x0A };
Modified:
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
(original)
+++
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
Sun Jan 18 12:49:47 2009
@@ -136,7 +136,7 @@
private byte[] body(MimeMessage message) throws IOException,
MessagingException {
InputStream is = message.getInputStream();
- final byte[] bytes = MessageUtils.toByteArray(is);
+ final byte[] bytes = ContentUtils.toByteArray(is);
return bytes;
}
@@ -177,7 +177,7 @@
}
private ResultIterator getResults(FetchGroup result,
List<MailboxMembership> messages) {
- Collections.sort(messages, MessageRowUtils.getUidComparator());
+ Collections.sort(messages, ResultUtils.getUidComparator());
final ResultIterator results = new ResultIterator(messages,result);
return results;
}
@@ -196,7 +196,7 @@
public MessageResult fillMessageResult(MailboxMembership message,
FetchGroup result) throws MessagingException,
MailboxException {
- return MessageRowUtils.loadMessageResult(message, result);
+ return ResultUtils.loadMessageResult(message, result);
}
public synchronized Flags getPermanentFlags() {
@@ -304,7 +304,7 @@
final List<MailboxMembership> members = mapper.findInMailbox(set,
mailboxId);
UidRange uidRange = uidRangeForMessageSet(set);
getUidChangeTracker().found(uidRange,
- MessageRowUtils.toMessageFlags(members));
+ ResultUtils.toMessageFlags(members));
for (final MailboxMembership member:members) {
if (replace) {
member.setFlags(flags);
Modified:
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
(original)
+++
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
Sun Jan 18 12:49:47 2009
@@ -37,7 +37,7 @@
throws Exception {
MailboxMembership one = buildMessage(100);
MailboxMembership two = buildMessage(99);
- assertTrue(MessageRowUtils.getUidComparator().compare(one, two) > 0);
+ assertTrue(ResultUtils.getUidComparator().compare(one, two) > 0);
}
private MailboxMembership buildMessage(int uid) {
@@ -50,12 +50,12 @@
throws Exception {
MailboxMembership one = buildMessage(98);
MailboxMembership two = buildMessage(99);
- assertTrue(MessageRowUtils.getUidComparator().compare(one, two) < 0);
+ assertTrue(ResultUtils.getUidComparator().compare(one, two) < 0);
}
public void testShouldReturnZeroWhenFirstEqualsSecond() throws Exception {
MailboxMembership one = buildMessage(90);
MailboxMembership two = buildMessage(90);
- assertEquals(0, MessageRowUtils.getUidComparator().compare(one, two));
+ assertEquals(0, ResultUtils.getUidComparator().compare(one, two));
}
}
Modified:
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsCountUnnormalLinesTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsCountUnnormalLinesTest.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsCountUnnormalLinesTest.java
(original)
+++
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsCountUnnormalLinesTest.java
Sun Jan 18 12:49:47 2009
@@ -19,7 +19,7 @@
package org.apache.james.imap.store;
-import org.apache.james.imap.store.MessageUtils;
+import org.apache.james.imap.store.ContentUtils;
import junit.framework.TestCase;
@@ -32,35 +32,35 @@
}
public void testEmpty() throws Exception {
- assertEquals("Check processing of empty array", 0, MessageUtils
+ assertEquals("Check processing of empty array", 0, ContentUtils
.countUnnormalLines("".getBytes()));
}
public void testNormal() throws Exception {
- assertEquals("Check processing of normal data", 0, MessageUtils
+ assertEquals("Check processing of normal data", 0, ContentUtils
.countUnnormalLines("One\r\nTwo\r\nThree\r\n".getBytes()));
}
public void testMissing() throws Exception {
assertEquals("Check processing simple data containing unnormal lines",
- 2, MessageUtils.countUnnormalLines("One\rTwo\nThree\r\n"
+ 2, ContentUtils.countUnnormalLines("One\rTwo\nThree\r\n"
.getBytes()));
}
public void testBoundaries() throws Exception {
- assertEquals("CR at end", 1, MessageUtils
+ assertEquals("CR at end", 1, ContentUtils
.countUnnormalLines("One\r\nTwo\r\nThree\r".getBytes()));
- assertEquals("LF at end", 1, MessageUtils
+ assertEquals("LF at end", 1, ContentUtils
.countUnnormalLines("One\r\nTwo\r\nThree\n".getBytes()));
- assertEquals("CR at start", 1, MessageUtils
+ assertEquals("CR at start", 1, ContentUtils
.countUnnormalLines("\rOne\r\nTwo\r\nThree".getBytes()));
- assertEquals("LF at start", 1, MessageUtils
+ assertEquals("LF at start", 1, ContentUtils
.countUnnormalLines("\nOne\r\nTwo\r\nThree".getBytes()));
}
public void testSwitchOrder() throws Exception {
assertEquals("Check processing simple data containing unnormal lines",
- 8, MessageUtils
+ 8, ContentUtils
.countUnnormalLines("\n\rOne\n\rTwo\n\rThree\n\r"
.getBytes()));
}
Modified:
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsNormalisedWriteToTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsNormalisedWriteToTest.java?rev=735538&r1=735537&r2=735538&view=diff
==============================================================================
---
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsNormalisedWriteToTest.java
(original)
+++
james/protocols/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageUtilsNormalisedWriteToTest.java
Sun Jan 18 12:49:47 2009
@@ -19,7 +19,7 @@
package org.apache.james.imap.store;
-import org.apache.james.imap.store.MessageUtils;
+import org.apache.james.imap.store.ContentUtils;
import junit.framework.TestCase;
@@ -37,52 +37,52 @@
}
public void testEmpty() throws Exception {
- MessageUtils.normalisedWriteTo("".getBytes(), buffer);
+ ContentUtils.normalisedWriteTo("".getBytes(), buffer);
assertEquals("Check processing of empty array", "", buffer.toString());
}
public void testNormal() throws Exception {
- MessageUtils.normalisedWriteTo("One\r\nTwo\r\nThree\r\n".getBytes(),
+ ContentUtils.normalisedWriteTo("One\r\nTwo\r\nThree\r\n".getBytes(),
buffer);
assertEquals("Check processing of normal data",
"One\r\nTwo\r\nThree\r\n", buffer.toString());
}
public void testMissing() throws Exception {
- MessageUtils
+ ContentUtils
.normalisedWriteTo("One\rTwo\nThree\r\n".getBytes(), buffer);
assertEquals("Check processing simple data containing unnormal lines",
"One\r\nTwo\r\nThree\r\n", buffer.toString());
}
public void testCRAtEnd() throws Exception {
- MessageUtils.normalisedWriteTo("One\r\nTwo\r\nThree\r".getBytes(),
+ ContentUtils.normalisedWriteTo("One\r\nTwo\r\nThree\r".getBytes(),
buffer);
assertEquals("CR at end", "One\r\nTwo\r\nThree\r\n",
buffer.toString());
}
public void testLFAtEnd() throws Exception {
- MessageUtils.normalisedWriteTo("One\r\nTwo\r\nThree\n".getBytes(),
+ ContentUtils.normalisedWriteTo("One\r\nTwo\r\nThree\n".getBytes(),
buffer);
assertEquals("LF at end", "One\r\nTwo\r\nThree\r\n",
buffer.toString());
}
public void testCRAtStart() throws Exception {
- MessageUtils.normalisedWriteTo("\rOne\r\nTwo\r\nThree\r".getBytes(),
+ ContentUtils.normalisedWriteTo("\rOne\r\nTwo\r\nThree\r".getBytes(),
buffer);
assertEquals("CR at start", "\r\nOne\r\nTwo\r\nThree\r\n", buffer
.toString());
}
public void testLFAtStart() throws Exception {
- MessageUtils.normalisedWriteTo("\nOne\r\nTwo\r\nThree".getBytes(),
+ ContentUtils.normalisedWriteTo("\nOne\r\nTwo\r\nThree".getBytes(),
buffer);
assertEquals("CR at start", "\r\nOne\r\nTwo\r\nThree", buffer
.toString());
}
public void testSwitchOrder() throws Exception {
- MessageUtils.normalisedWriteTo(
+ ContentUtils.normalisedWriteTo(
"\n\rOne\n\rTwo\n\rThree\n\r".getBytes(), buffer);
assertEquals("Check processing simple data containing unnormal lines",
"\r\n\r\nOne\r\n\r\nTwo\r\n\r\nThree\r\n\r\n", buffer
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
