Author: btellier Date: Mon Jan 4 22:41:39 2016 New Revision: 1722973 URL: http://svn.apache.org/viewvc?rev=1722973&view=rev Log: JSIEVE-73 Move Message searcher to mime4J
Removed: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java Modified: james/project/trunk/mailbox/pom.xml james/project/trunk/mailbox/store/pom.xml james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java Modified: james/project/trunk/mailbox/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/pom.xml?rev=1722973&r1=1722972&r2=1722973&view=diff ============================================================================== --- james/project/trunk/mailbox/pom.xml (original) +++ james/project/trunk/mailbox/pom.xml Mon Jan 4 22:41:39 2016 @@ -241,6 +241,12 @@ <artifactId>apache-mime4j-dom</artifactId> <version>${apache-mime4j.version}</version> </dependency> + + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-james-utils</artifactId> + <version>${apache-mime4j.version}</version> + </dependency> <!-- Declare javamail as provided to be able to easily switch --> <!-- to different implementations (Geronimo) --> <dependency> Modified: james/project/trunk/mailbox/store/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/pom.xml?rev=1722973&r1=1722972&r2=1722973&view=diff ============================================================================== --- james/project/trunk/mailbox/store/pom.xml (original) +++ james/project/trunk/mailbox/store/pom.xml Mon Jan 4 22:41:39 2016 @@ -42,6 +42,10 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> + <artifactId>apache-mime4j-james-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>apache-mime4j-dom</artifactId> </dependency> <dependency> Modified: james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java?rev=1722973&r1=1722972&r2=1722973&view=diff ============================================================================== --- james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (original) +++ james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java Mon Jan 4 22:41:39 2016 @@ -36,6 +36,7 @@ import java.util.TreeSet; import javax.mail.Flags; +import com.google.common.collect.Lists; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.UnsupportedSearchException; import org.apache.james.mailbox.model.MessageResult.Header; @@ -57,6 +58,7 @@ import org.apache.james.mime4j.field.add import org.apache.james.mime4j.field.address.LenientAddressParser; import org.apache.james.mime4j.field.datetime.parser.DateTimeParser; import org.apache.james.mime4j.field.datetime.parser.ParseException; +import org.apache.james.mime4j.utils.search.MessageMatcher; import org.slf4j.Logger; /** @@ -207,14 +209,15 @@ public class MessageSearches implements return result; } - protected boolean isInMessage(String value, final InputStream input, boolean header, Logger log) - throws IOException, MimeException { - final MessageSearcher searcher = new MessageSearcher(value, true, header); + protected boolean isInMessage(String value, final InputStream input, boolean header, Logger log) throws IOException, MimeException { + MessageMatcher.MessageMatcherBuilder builder = MessageMatcher.builder() + .searchContents(Lists.<CharSequence>newArrayList(value)) + .caseInsensitive(true) + .includeHeaders(header); if (log != null) { - searcher.setLogger(log); + builder.logger(log); } - final boolean result = searcher.isFoundIn(input); - return result; + return builder.build().messageMatches(input); } protected boolean messageContains(String value, Message<?> message, Logger log) throws IOException, MimeException { Modified: james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java?rev=1722973&r1=1722972&r2=1722973&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java (original) +++ james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ResourceLocatorImpl.java Mon Jan 4 22:41:39 2016 @@ -36,7 +36,6 @@ public class ResourceLocatorImpl impleme } public InputStream get(String uri) throws SieveRepositoryException { - System.out.println(uri); // Use the complete email address for finding the sieve file uri = uri.substring(2); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org