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 rd...@apache.org on 2008/05/11 19:29:28 UTC
svn commit: r655344 - in /james/server/trunk:
core-library/src/main/java/org/apache/james/mailboxmanager/util/
phoenix-deployment/src/test/org/apache/james/mailboxmanager/util/
torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanage...
Author: rdonkin
Date: Sun May 11 10:29:28 2008
New Revision: 655344
URL: http://svn.apache.org/viewvc?rev=655344&view=rev
Log:
UidToKeyConvertor is no longer needed
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToKeyConverter.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/UidToKeyConverterImpl.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/mailboxmanager/util/UidToKeyConverterTest.java
Modified:
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Modified: james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
URL: http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java?rev=655344&r1=655343&r2=655344&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java (original)
+++ james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java Sun May 11 10:29:28 2008
@@ -42,7 +42,6 @@
import org.apache.james.mailboxmanager.torque.om.MessageBody;
import org.apache.james.mailboxmanager.torque.om.MessageHeader;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.james.mailboxmanager.util.UidToKeyConverter;
import org.apache.james.mime4j.MimeException;
import org.apache.torque.TorqueException;
@@ -112,8 +111,7 @@
return results;
}
- public static MessageResult loadMessageResult(final MessageRow messageRow, final FetchGroup fetchGroup,
- final UidToKeyConverter uidToKeyConverter)
+ public static MessageResult loadMessageResult(final MessageRow messageRow, final FetchGroup fetchGroup)
throws TorqueException, MailboxManagerException {
MessageResultImpl messageResult = new MessageResultImpl();
Modified: james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=655344&r1=655343&r2=655344&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Sun May 11 10:29:28 2008
@@ -59,8 +59,6 @@
import org.apache.james.mailboxmanager.tracking.UidChangeTracker;
import org.apache.james.mailboxmanager.tracking.UidRange;
import org.apache.james.mailboxmanager.util.AbstractLogFactoryAware;
-import org.apache.james.mailboxmanager.util.UidToKeyConverter;
-import org.apache.james.mailboxmanager.util.UidToKeyConverterImpl;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
@@ -79,8 +77,6 @@
private UidChangeTracker tracker;
- private UidToKeyConverter uidToKeyConverter;
-
private final ReadWriteLock lock;
private final MessageSearches searches;
@@ -91,7 +87,6 @@
this.mailboxRow = mailboxRow;
this.tracker = new UidChangeTracker(mailboxRow.getLastUid());
this.lock = lock;
- getUidToKeyConverter().setUidValidity(mailboxRow.getUidValidity());
}
public synchronized String getName() {
@@ -294,7 +289,7 @@
private TorqueResultIterator getResults(FetchGroup result, List rows) throws TorqueException {
Collections.sort(rows, MessageRowUtils.getUidComparator());
- final TorqueResultIterator results = new TorqueResultIterator(rows, result, getUidToKeyConverter());
+ final TorqueResultIterator results = new TorqueResultIterator(rows, result);
return results;
}
@@ -313,7 +308,7 @@
public MessageResult fillMessageResult(MessageRow messageRow, FetchGroup result)
throws TorqueException, MessagingException, MailboxManagerException {
- return MessageRowUtils.loadMessageResult(messageRow, result, getUidToKeyConverter());
+ return MessageRowUtils.loadMessageResult(messageRow, result);
}
public synchronized Flags getPermanentFlags() {
@@ -456,7 +451,7 @@
final List messageRows = getMailboxRow().getMessageRows(c);
final long[] uids = uids(messageRows);
final OrFetchGroup orFetchGroup = new OrFetchGroup(fetchGroup, FetchGroup.FLAGS);
- final TorqueResultIterator resultIterator = new TorqueResultIterator(messageRows, orFetchGroup, getUidToKeyConverter());
+ final TorqueResultIterator resultIterator = new TorqueResultIterator(messageRows, orFetchGroup);
// ensure all results are loaded before deletion
Collection messageResults = IteratorUtils.toList(resultIterator);
@@ -529,7 +524,7 @@
}
final OrFetchGroup orFetchGroup = new OrFetchGroup(fetchGroup, FetchGroup.FLAGS);
final TorqueResultIterator resultIterator = new TorqueResultIterator(messageRows,
- orFetchGroup, getUidToKeyConverter());
+ orFetchGroup);
final org.apache.james.mailboxmanager.impl.MessageFlags[] messageFlags = resultIterator.getMessageFlags();
tracker.flagsUpdated(messageFlags, mailboxSession.getSessionId());
tracker.found(uidRange, messageFlags);
@@ -686,13 +681,6 @@
}
}
- protected UidToKeyConverter getUidToKeyConverter() {
- if (uidToKeyConverter == null) {
- uidToKeyConverter = new UidToKeyConverterImpl();
- }
- return uidToKeyConverter;
- }
-
public void remove(GeneralMessageSet set, MailboxSession mailboxSession) throws MailboxManagerException {
try {
lock.writeLock().acquire();
Modified: james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=655344&r1=655343&r2=655344&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java (original)
+++ james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java Sun May 11 10:29:28 2008
@@ -36,17 +36,14 @@
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.impl.MessageFlags;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.james.mailboxmanager.util.UidToKeyConverter;
import org.apache.torque.TorqueException;
public class TorqueResultIterator implements Iterator {
private final Buffer messageRows;
private final FetchGroup fetchGroup;
- private final UidToKeyConverter uidToKeyConverter;
- public TorqueResultIterator(final Collection messageRows, final FetchGroup fetchGroup,
- final UidToKeyConverter uidToKeyConverter) {
+ public TorqueResultIterator(final Collection messageRows, final FetchGroup fetchGroup) {
super();
if (messageRows == null || messageRows.isEmpty()) {
this.messageRows = BufferUtils.EMPTY_BUFFER;
@@ -54,7 +51,6 @@
this.messageRows = new BoundedFifoBuffer(messageRows);
}
this.fetchGroup = fetchGroup;
- this.uidToKeyConverter = uidToKeyConverter;
}
public MessageFlags[] getMessageFlags() throws TorqueException {
@@ -83,7 +79,7 @@
try {
result = MessageRowUtils.loadMessageResult(messageRow,
- this.fetchGroup, uidToKeyConverter);
+ this.fetchGroup);
} catch (TorqueException e) {
result = new UnloadedMessageResult(messageRow, new MailboxManagerException(e));
} catch (MailboxManagerException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org