Author: norman
Date: Wed May 11 15:56:07 2011
New Revision: 1101931

URL: http://svn.apache.org/viewvc?rev=1101931&view=rev
Log:
Add support for WITHIN extension. See RFC5032 and IMAP-300

Modified:
    
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
    
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
    
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
    
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java

Modified: 
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java?rev=1101931&r1=1101930&r2=1101931&view=diff
==============================================================================
--- 
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
 (original)
+++ 
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java
 Wed May 11 15:56:07 2011
@@ -113,41 +113,44 @@ public final class SearchKey {
     // AND
     public static final int TYPE_AND = 37;
 
-    private static final SearchKey UNSEEN = new SearchKey(TYPE_UNSEEN, null, 
null, 0, null, null, null);
+    public static final int TYPE_YOUNGER = 38;
+    public static final int TYPE_OLDER = 39;
 
-    private static final SearchKey UNFLAGGED = new SearchKey(TYPE_UNFLAGGED, 
null, null, 0, null, null, null);
+    private static final SearchKey UNSEEN = new SearchKey(TYPE_UNSEEN, null, 
null, 0, null, null, null, -1);
 
-    private static final SearchKey UNDRAFT = new SearchKey(TYPE_UNDRAFT, null, 
null, 0, null, null, null);
+    private static final SearchKey UNFLAGGED = new SearchKey(TYPE_UNFLAGGED, 
null, null, 0, null, null, null, -1);
 
-    private static final SearchKey UNDELETED = new SearchKey(TYPE_UNDELETED, 
null, null, 0, null, null, null);
+    private static final SearchKey UNDRAFT = new SearchKey(TYPE_UNDRAFT, null, 
null, 0, null, null, null, -1);
 
-    private static final SearchKey UNANSWERED = new SearchKey(TYPE_UNANSWERED, 
null, null, 0, null, null, null);
+    private static final SearchKey UNDELETED = new SearchKey(TYPE_UNDELETED, 
null, null, 0, null, null, null, -1);
 
-    private static final SearchKey SEEN = new SearchKey(TYPE_SEEN, null, null, 
0, null, null, null);
+    private static final SearchKey UNANSWERED = new SearchKey(TYPE_UNANSWERED, 
null, null, 0, null, null, null, -1);
 
-    private static final SearchKey RECENT = new SearchKey(TYPE_RECENT, null, 
null, 0, null, null, null);
+    private static final SearchKey SEEN = new SearchKey(TYPE_SEEN, null, null, 
0, null, null, null, -1);
 
-    private static final SearchKey OLD = new SearchKey(TYPE_OLD, null, null, 
0, null, null, null);
+    private static final SearchKey RECENT = new SearchKey(TYPE_RECENT, null, 
null, 0, null, null, null, -1);
 
-    private static final SearchKey NEW = new SearchKey(TYPE_NEW, null, null, 
0, null, null, null);
+    private static final SearchKey OLD = new SearchKey(TYPE_OLD, null, null, 
0, null, null, null, -1);
 
-    private static final SearchKey FLAGGED = new SearchKey(TYPE_FLAGGED, null, 
null, 0, null, null, null);
+    private static final SearchKey NEW = new SearchKey(TYPE_NEW, null, null, 
0, null, null, null, -1);
 
-    private static final SearchKey DRAFT = new SearchKey(TYPE_DRAFT, null, 
null, 0, null, null, null);
+    private static final SearchKey FLAGGED = new SearchKey(TYPE_FLAGGED, null, 
null, 0, null, null, null, -1);
 
-    private static final SearchKey DELETED = new SearchKey(TYPE_DELETED, null, 
null, 0, null, null, null);
+    private static final SearchKey DRAFT = new SearchKey(TYPE_DRAFT, null, 
null, 0, null, null, null, -1);
 
-    private static final SearchKey ANSWERED = new SearchKey(TYPE_ANSWERED, 
null, null, 0, null, null, null);
+    private static final SearchKey DELETED = new SearchKey(TYPE_DELETED, null, 
null, 0, null, null, null, -1);
 
-    private static final SearchKey ALL = new SearchKey(TYPE_ALL, null, null, 
0, null, null, null);
+    private static final SearchKey ANSWERED = new SearchKey(TYPE_ANSWERED, 
null, null, 0, null, null, null, -1);
+
+    private static final SearchKey ALL = new SearchKey(TYPE_ALL, null, null, 
0, null, null, null, -1);
 
     // NUMBERS
     public static SearchKey buildSequenceSet(IdRange[] ids) {
-        return new SearchKey(TYPE_SEQUENCE_SET, null, null, 0, null, null, 
ids);
+        return new SearchKey(TYPE_SEQUENCE_SET, null, null, 0, null, null, 
ids, -1);
     }
 
     public static SearchKey buildUidSet(IdRange[] ids) {
-        return new SearchKey(TYPE_UID, null, null, 0, null, null, ids);
+        return new SearchKey(TYPE_UID, null, null, 0, null, null, ids, -1);
     }
 
     // NO PARAMETERS
@@ -209,85 +212,94 @@ public final class SearchKey {
 
     // ONE VALUE
     public static SearchKey buildBcc(String value) {
-        return new SearchKey(TYPE_BCC, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_BCC, null, null, 0, null, value, null, -1);
     }
 
     public static SearchKey buildBody(String value) {
-        return new SearchKey(TYPE_BODY, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_BODY, null, null, 0, null, value, null, -1);
     }
 
     public static SearchKey buildCc(String value) {
-        return new SearchKey(TYPE_CC, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_CC, null, null, 0, null, value, null, -1);
     }
 
     public static SearchKey buildFrom(String value) {
-        return new SearchKey(TYPE_FROM, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_FROM, null, null, 0, null, value, null, -1);
     }
 
     public static SearchKey buildKeyword(String value) {
-        return new SearchKey(TYPE_KEYWORD, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_KEYWORD, null, null, 0, null, value, null, 
-1);
     }
 
     public static SearchKey buildSubject(String value) {
-        return new SearchKey(TYPE_SUBJECT, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_SUBJECT, null, null, 0, null, value, null, 
-1);
     }
 
     public static SearchKey buildText(String value) {
-        return new SearchKey(TYPE_TEXT, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_TEXT, null, null, 0, null, value, null, -1);
     }
 
     public static SearchKey buildTo(String value) {
-        return new SearchKey(TYPE_TO, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_TO, null, null, 0, null, value, null, -1);
     }
 
     public static SearchKey buildUnkeyword(String value) {
-        return new SearchKey(TYPE_UNKEYWORD, null, null, 0, null, value, null);
+        return new SearchKey(TYPE_UNKEYWORD, null, null, 0, null, value, null, 
-1);
+    }
+    // ONE DATE
+    public static SearchKey buildYounger(long seconds) {
+        return new SearchKey(TYPE_YOUNGER, null, null, 0, null, null, null, 
seconds);
+    }
+
+    public static SearchKey buildOlder(long seconds) {
+        return new SearchKey(TYPE_OLDER, null, null, 0, null, null, null, 
seconds);
     }
 
+    
     // ONE DATE
     public static SearchKey buildBefore(DayMonthYear date) {
-        return new SearchKey(TYPE_BEFORE, date, null, 0, null, null, null);
+        return new SearchKey(TYPE_BEFORE, date, null, 0, null, null, null, -1);
     }
 
     public static SearchKey buildOn(DayMonthYear date) {
-        return new SearchKey(TYPE_ON, date, null, 0, null, null, null);
+        return new SearchKey(TYPE_ON, date, null, 0, null, null, null, -1);
     }
 
     public static SearchKey buildSentBefore(DayMonthYear date) {
-        return new SearchKey(TYPE_SENTBEFORE, date, null, 0, null, null, null);
+        return new SearchKey(TYPE_SENTBEFORE, date, null, 0, null, null, null, 
-1);
     }
 
     public static SearchKey buildSentOn(DayMonthYear date) {
-        return new SearchKey(TYPE_SENTON, date, null, 0, null, null, null);
+        return new SearchKey(TYPE_SENTON, date, null, 0, null, null, null, -1);
     }
 
     public static SearchKey buildSentSince(DayMonthYear date) {
-        return new SearchKey(TYPE_SENTSINCE, date, null, 0, null, null, null);
+        return new SearchKey(TYPE_SENTSINCE, date, null, 0, null, null, null, 
-1);
     }
 
     public static SearchKey buildSince(DayMonthYear date) {
-        return new SearchKey(TYPE_SINCE, date, null, 0, null, null, null);
+        return new SearchKey(TYPE_SINCE, date, null, 0, null, null, null, -1);
     }
 
     // FIELD VALUE
     public static SearchKey buildHeader(String name, String value) {
-        return new SearchKey(TYPE_HEADER, null, null, 0, name, value, null);
+        return new SearchKey(TYPE_HEADER, null, null, 0, name, value, null, 
-1);
     }
 
     // ONE NUMBER
     public static SearchKey buildLarger(long size) {
-        return new SearchKey(TYPE_LARGER, null, null, size, null, null, null);
+        return new SearchKey(TYPE_LARGER, null, null, size, null, null, null, 
-1);
     }
 
     public static SearchKey buildSmaller(long size) {
-        return new SearchKey(TYPE_SMALLER, null, null, size, null, null, null);
+        return new SearchKey(TYPE_SMALLER, null, null, size, null, null, null, 
-1);
     }
 
     // NOT
     public static SearchKey buildNot(SearchKey key) {
         final List<SearchKey> keys = new ArrayList<SearchKey>();
         keys.add(key);
-        return new SearchKey(TYPE_NOT, null, keys, 0, null, null, null);
+        return new SearchKey(TYPE_NOT, null, keys, 0, null, null, null, -1);
     }
 
     // OR
@@ -295,7 +307,7 @@ public final class SearchKey {
         final List<SearchKey> keys = new ArrayList<SearchKey>();
         keys.add(keyOne);
         keys.add(keyTwo);
-        return new SearchKey(TYPE_OR, null, keys, 0, null, null, null);
+        return new SearchKey(TYPE_OR, null, keys, 0, null, null, null, -1);
     }
 
     /**
@@ -306,7 +318,7 @@ public final class SearchKey {
      * @return <code>SearchKey</code>, not null
      */
     public static SearchKey buildAnd(final List<SearchKey> keys) {
-        return new SearchKey(TYPE_AND, null, keys, 0, null, null, null);
+        return new SearchKey(TYPE_AND, null, keys, 0, null, null, null, -1);
     }
 
     private final int type;
@@ -323,7 +335,9 @@ public final class SearchKey {
 
     private IdRange[] sequence;
 
-    private SearchKey(final int type, final DayMonthYear date, final 
List<SearchKey> keys, final long number, final String name, final String value, 
IdRange[] sequence) {
+    private long seconds;
+
+    private SearchKey(final int type, final DayMonthYear date, final 
List<SearchKey> keys, final long number, final String name, final String value, 
IdRange[] sequence, long seconds) {
         super();
         this.type = type;
         this.date = date;
@@ -332,6 +346,7 @@ public final class SearchKey {
         this.name = name;
         this.value = value;
         this.sequence = sequence;
+        this.seconds = seconds;
     }
 
     /**
@@ -344,6 +359,15 @@ public final class SearchKey {
     public DayMonthYear getDate() {
         return date;
     }
+    
+    /**
+     * Return the search seconds
+     * 
+     * @return seconds
+     */
+    public long getSeconds() {
+        return seconds;
+    }
 
     /**
      * Gets sequence numbers.

Modified: 
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java?rev=1101931&r1=1101930&r2=1101931&view=diff
==============================================================================
--- 
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
 (original)
+++ 
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
 Wed May 11 15:56:07 2011
@@ -116,6 +116,8 @@ public class SearchCommandParser extends
                 return t(request, charset);
             case 'U':
                 return u(request);
+            case 'Y':
+                return younger(request);
             default:
                 throw new 
DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Unknown search key");
             }
@@ -303,7 +305,18 @@ public class SearchCommandParser extends
             throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, 
"Unknown search key");
         }
     }
-
+    
+    private SearchKey old(ImapRequestLineReader request) throws 
DecodingException {
+        nextIsD(request);
+        try {
+            // Check if its OLDER keyword
+            nextIsE(request);
+            return older(request);
+        } catch (DecodingException e) {
+            return SearchKey.buildOld();
+        }
+    }
+    
     private SearchKey n(ImapRequestLineReader request, Charset charset) throws 
DecodingException {
         final int next = consumeAndCap(request);
         switch (next) {
@@ -483,11 +496,24 @@ public class SearchCommandParser extends
         result = SearchKey.buildUnanswered();
         return result;
     }
-
-    private SearchKey old(ImapRequestLineReader request) throws 
DecodingException {
+    private SearchKey younger(ImapRequestLineReader request) throws 
DecodingException {
         final SearchKey result;
-        nextIsD(request);
-        result = SearchKey.buildOld();
+        nextIsO(request);
+        nextIsU(request);
+        nextIsN(request);
+        nextIsG(request);
+        nextIsE(request);
+        nextIsR(request);
+        nextIsSpace(request);
+        result = SearchKey.buildYounger(request.nzNumber());
+        return result;
+    }
+    private SearchKey older(ImapRequestLineReader request) throws 
DecodingException {
+        final SearchKey result;
+        nextIsR(request);
+        
+        nextIsSpace(request);
+        result = SearchKey.buildOlder(request.nzNumber());
         return result;
     }
 
@@ -768,7 +794,9 @@ public class SearchCommandParser extends
     private void nextIsX(ImapRequestLineReader request) throws 
DecodingException {
         nextIs(request, 'X', 'x');
     }
-
+    private void nextIsU(ImapRequestLineReader request) throws 
DecodingException {
+        nextIs(request, 'U', 'u');
+    }
     private void nextIsO(ImapRequestLineReader request) throws 
DecodingException {
         nextIs(request, 'O', 'o');
     }

Modified: 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java?rev=1101931&r1=1101930&r2=1101931&view=diff
==============================================================================
--- 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
 (original)
+++ 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
 Wed May 11 15:56:07 2011
@@ -60,6 +60,9 @@ public class DefaultProcessorChain {
         final XListProcessor xlistProcessor = new 
XListProcessor(lsubProcessor, mailboxManager, statusResponseFactory, 
mailboxTyper);
         final ListProcessor listProcessor = new ListProcessor(xlistProcessor, 
mailboxManager, statusResponseFactory);
         final SearchProcessor searchProcessor = new 
SearchProcessor(listProcessor, mailboxManager, statusResponseFactory);
+        // WITHIN extension
+        capabilityProcessor.addProcessor(searchProcessor);
+
         final SelectProcessor selectProcessor = new 
SelectProcessor(searchProcessor, mailboxManager, statusResponseFactory);
         final NamespaceProcessor namespaceProcessor = new 
NamespaceProcessor(selectProcessor, mailboxManager, statusResponseFactory);
 

Modified: 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=1101931&r1=1101930&r2=1101931&view=diff
==============================================================================
--- 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
 (original)
+++ 
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
 Wed May 11 15:56:07 2011
@@ -20,7 +20,9 @@
 package org.apache.james.imap.processor;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TreeSet;
@@ -49,7 +51,7 @@ import org.apache.james.mailbox.SearchQu
 import org.apache.james.mailbox.SearchQuery.Criterion;
 import org.apache.james.mailbox.SearchQuery.DateResolution;
 
-public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> {
+public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> 
implements CapabilityImplementingProcessor {
 
     public SearchProcessor(final ImapProcessor next, final MailboxManager 
mailboxManager, final StatusResponseFactory factory) {
         super(SearchRequest.class, next, mailboxManager, factory);
@@ -214,11 +216,22 @@ public class SearchProcessor extends Abs
             return SearchQuery.flagIsUnSet(key.getValue());
         case SearchKey.TYPE_UNSEEN:
             return SearchQuery.flagIsUnSet(Flag.SEEN);
+        case SearchKey.TYPE_OLDER:
+            Date withinDate = createWithinDate(key);
+            return SearchQuery.or(SearchQuery.internalDateOn(withinDate, 
DateResolution.Second), SearchQuery.internalDateBefore(withinDate, 
DateResolution.Second));
+        case SearchKey.TYPE_YOUNGER:
+            Date withinDate2 = createWithinDate(key);
+            return SearchQuery.or(SearchQuery.internalDateOn(withinDate2, 
DateResolution.Second), SearchQuery.internalDateAfter(withinDate2, 
DateResolution.Second));
         default:
             session.getLog().warn("Ignoring unknown search key.");
             return SearchQuery.all();
         }
     }
+    private Date createWithinDate(SearchKey key) {
+        long seconds = key.getSeconds();
+        long res = System.currentTimeMillis() - seconds * 1000;
+        return new Date(res);
+    }
 
     private Criterion sequence(IdRange[] sequenceNumbers, final ImapSession 
session, boolean msn) throws MessageRangeException {
         final int length = sequenceNumbers.length;
@@ -263,4 +276,12 @@ public class SearchProcessor extends Abs
         final Criterion result = SearchQuery.and(criteria);
         return result;
     }
+
+    /*
+     * (non-Javadoc)
+     * @see 
org.apache.james.imap.processor.CapabilityImplementingProcessor#getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession)
+     */
+    public List<String> getImplementedCapabilities(ImapSession session) {
+        return Arrays.asList("WITHIN");
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to