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 no...@apache.org on 2011/04/14 13:11:19 UTC
svn commit: r1092133 - in /james/mailbox/trunk:
api/src/main/java/org/apache/james/mailbox/MessageRange.java
api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java
store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Author: norman
Date: Thu Apr 14 11:11:18 2011
New Revision: 1092133
URL: http://svn.apache.org/viewvc?rev=1092133&view=rev
Log:
Allow to convert from uids to MessageRanges
Added:
james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java
Modified:
james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java
james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Modified: james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java?rev=1092133&r1=1092132&r2=1092133&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java (original)
+++ james/mailbox/trunk/api/src/main/java/org/apache/james/mailbox/MessageRange.java Thu Apr 14 11:11:18 2011
@@ -19,6 +19,10 @@
package org.apache.james.mailbox;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* Used to define a range of messages by uid.<br>
* The type of the set should be defined by using an appropriate constructor.
@@ -209,4 +213,42 @@ public class MessageRange {
else
return new MessageRange(type, uidFrom, uidTo, UNLIMITED_BATCH);
}
+
+ /**
+ * Converts the given {@link List} of uids to a {@link List} of {@link MessageRange} instances
+ *
+ * @param uids
+ * @return ranges
+ */
+ public static List<MessageRange> toRanges(List<Long> uids) {
+ List<MessageRange> ranges = new ArrayList<MessageRange>();
+
+ Collections.sort(uids);
+
+ long firstUid = 0;
+ int a = 0;
+ for (int i = 0; i < uids.size(); i++) {
+ long u = uids.get(i);
+ if (i == 0) {
+ firstUid = u;
+ if (uids.size() == 1) {
+ ranges.add(MessageRange.one(firstUid));
+ }
+ } else {
+ if ((firstUid + a +1) != u) {
+ ranges.add(MessageRange.range(firstUid, firstUid + a));
+
+ // set the next first uid and reset the counter
+ firstUid = u;
+ a = 0;
+ if (uids.size() <= i +1) {
+ ranges.add(MessageRange.one(firstUid));
+ }
+ } else {
+ a++;
+ }
+ }
+ }
+ return ranges;
+ }
}
Added: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java?rev=1092133&view=auto
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java (added)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java Thu Apr 14 11:11:18 2011
@@ -0,0 +1,50 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.mailbox;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class MessageRangeTest {
+
+ @Test
+ public void testToRanges() {
+ List<MessageRange> ranges = MessageRange.toRanges(Arrays.asList(1L,2L,3L,5L,6L,9L));
+ assertEquals(3, ranges.size());
+ checkRange(1, 3, ranges.get(0));
+ checkRange(5, 6, ranges.get(1));
+ checkRange(9, 9, ranges.get(2));
+
+ }
+
+ @Test
+ public void testOneUidToRange() {
+ List<MessageRange> ranges = MessageRange.toRanges(Arrays.asList(1L));
+ assertEquals(1, ranges.size());
+ checkRange(1, 1, ranges.get(0));
+ }
+
+ private void checkRange(long from, long to, MessageRange range) {
+ assertEquals(from, range.getUidFrom());
+ assertEquals(to, range.getUidTo());
+ }
+}
Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1092133&r1=1092132&r2=1092133&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java (original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java Thu Apr 14 11:11:18 2011
@@ -439,17 +439,15 @@ public abstract class StoreMessageManage
*/
public List<MessageRange> copyTo(MessageRange set, StoreMessageManager<Id> toMailbox, MailboxSession session) throws MailboxException {
try {
- List<MessageRange> result=new ArrayList<MessageRange>();
Iterator<Long> copiedUids = copy(set, toMailbox, session);
List<Long> uids = new ArrayList<Long>();
while(copiedUids.hasNext()) {
long uid = copiedUids.next();
- result.add(MessageRange.one(uid));
uids.add(uid);
}
dispatcher.added(session, uids, new StoreMailboxPath<Id>(toMailbox.getMailboxEntity()));
- return result;
+ return MessageRange.toRanges(uids);
} catch (MailboxException e) {
throw new MailboxException("Unable to parse message", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org