JAMES-1818 Move TextExtractor from store to API
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6c905bcf Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6c905bcf Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6c905bcf Branch: refs/heads/master Commit: 6c905bcf791d23efe032ba870e982e5eb9ac4f36 Parents: b9c1f44 Author: Raphael Ouazana <[email protected]> Authored: Thu Aug 25 17:51:04 2016 +0200 Committer: Raphael Ouazana <[email protected]> Committed: Mon Aug 29 15:17:17 2016 +0200 ---------------------------------------------------------------------- .../james/mailbox/extractor/ParsedContent.java | 43 ++++++++++++++++++++ .../james/mailbox/extractor/TextExtractor.java | 28 +++++++++++++ .../elasticsearch/json/IndexableMessage.java | 2 +- .../json/MessageToElasticSearchJson.java | 2 +- .../mailbox/elasticsearch/json/MimePart.java | 4 +- .../json/MimePartContainerBuilder.java | 6 +-- .../elasticsearch/json/MimePartParser.java | 11 ++--- .../json/RootMimePartContainerBuilder.java | 6 +-- .../mailbox/inmemory/JsoupTextExtractor.java | 4 +- .../store/extractor/DefaultTextExtractor.java | 2 + .../mailbox/store/extractor/ParsedContent.java | 43 -------------------- .../mailbox/store/extractor/TextExtractor.java | 28 ------------- .../extractor/DefaultTextExtractorTest.java | 4 +- .../tika/extractor/TikaTextExtractor.java | 7 ++-- .../tika/extractor/TikaTextExtractorTest.java | 6 +-- .../mailbox/ElasticSearchMailboxModule.java | 2 +- .../modules/data/MemoryDataJmapModule.java | 2 +- .../modules/mailbox/MemoryMailboxModule.java | 2 +- .../utils/MailboxBasedHtmlTextExtractor.java | 2 +- 19 files changed, 105 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/ParsedContent.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/ParsedContent.java b/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/ParsedContent.java new file mode 100644 index 0000000..fc5af9f --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/ParsedContent.java @@ -0,0 +1,43 @@ +/**************************************************************** + * 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.extractor; + +import java.util.List; +import java.util.Map; + +public class ParsedContent { + + private final String textualContent; + private final Map<String, List<String>> metadata; + + public ParsedContent(String textualContent, Map<String, List<String>> metadata) { + this.textualContent = textualContent; + this.metadata = metadata; + } + + public String getTextualContent() { + return textualContent; + } + + public Map<String, List<String>> getMetadata() { + return metadata; + } + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/TextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/TextExtractor.java b/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/TextExtractor.java new file mode 100644 index 0000000..95036f8 --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/extractor/TextExtractor.java @@ -0,0 +1,28 @@ +/**************************************************************** + * 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.extractor; + +import java.io.InputStream; + +public interface TextExtractor { + + ParsedContent extractContent(InputStream inputStream, String contentType, String fileName) throws Exception; + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java index e7a6e2c..f67e5d1 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessage.java @@ -30,7 +30,7 @@ import java.util.stream.Stream; import org.apache.james.mailbox.MailboxSession.User; import org.apache.james.mailbox.elasticsearch.query.DateResolutionFormater; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.Property; import org.apache.james.mime4j.MimeException; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java index a35825e..dd27a6e 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJson.java @@ -26,7 +26,7 @@ import javax.inject.Inject; import javax.mail.Flags; import org.apache.james.mailbox.MailboxSession.User; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import com.fasterxml.jackson.core.JsonProcessingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePart.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePart.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePart.java index 28b229d..d2416a9 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePart.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePart.java @@ -25,9 +25,9 @@ import java.util.Optional; import java.util.stream.Stream; import org.apache.commons.io.FilenameUtils; +import org.apache.james.mailbox.extractor.ParsedContent; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.extractor.ParsedContent; -import org.apache.james.mailbox.store.extractor.TextExtractor; import org.apache.james.mime4j.stream.Field; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartContainerBuilder.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartContainerBuilder.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartContainerBuilder.java index aa69606..b56d303 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartContainerBuilder.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartContainerBuilder.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.elasticsearch.json; -import org.apache.james.mailbox.store.extractor.TextExtractor; -import org.apache.james.mime4j.stream.Field; - import java.io.InputStream; +import org.apache.james.mailbox.extractor.TextExtractor; +import org.apache.james.mime4j.stream.Field; + public interface MimePartContainerBuilder { MimePart build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java index 5e45a7a..be22627 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/MimePartParser.java @@ -19,8 +19,11 @@ package org.apache.james.mailbox.elasticsearch.json; -import com.google.common.base.Preconditions; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import java.io.IOException; +import java.util.Deque; +import java.util.LinkedList; + +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.mail.model.Message; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.message.DefaultBodyDescriptorBuilder; @@ -29,9 +32,7 @@ import org.apache.james.mime4j.stream.EntityState; import org.apache.james.mime4j.stream.MimeConfig; import org.apache.james.mime4j.stream.MimeTokenStream; -import java.io.IOException; -import java.util.Deque; -import java.util.LinkedList; +import com.google.common.base.Preconditions; public class MimePartParser { http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/RootMimePartContainerBuilder.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/RootMimePartContainerBuilder.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/RootMimePartContainerBuilder.java index a186bec..b0718c2 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/RootMimePartContainerBuilder.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/RootMimePartContainerBuilder.java @@ -19,13 +19,13 @@ package org.apache.james.mailbox.elasticsearch.json; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import java.io.InputStream; + +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mime4j.stream.Field; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.InputStream; - public class RootMimePartContainerBuilder implements MimePartContainerBuilder { private static final Logger LOGGER = LoggerFactory.getLogger(RootMimePartContainerBuilder.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java index 6f2de77..aac74a6 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/JsoupTextExtractor.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.james.mailbox.store.extractor.ParsedContent; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.extractor.ParsedContent; +import org.apache.james.mailbox.extractor.TextExtractor; import org.jsoup.Jsoup; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java index a6798c2..e692c27 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java @@ -24,6 +24,8 @@ import java.util.HashMap; import java.util.List; import org.apache.commons.io.IOUtils; +import org.apache.james.mailbox.extractor.ParsedContent; +import org.apache.james.mailbox.extractor.TextExtractor; /** * A default text extractor that is directly based on the input file provided. http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/ParsedContent.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/ParsedContent.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/ParsedContent.java deleted file mode 100644 index 03d844b..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/ParsedContent.java +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************** - * 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.store.extractor; - -import java.util.List; -import java.util.Map; - -public class ParsedContent { - - private final String textualContent; - private final Map<String, List<String>> metadata; - - public ParsedContent(String textualContent, Map<String, List<String>> metadata) { - this.textualContent = textualContent; - this.metadata = metadata; - } - - public String getTextualContent() { - return textualContent; - } - - public Map<String, List<String>> getMetadata() { - return metadata; - } - -} http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/TextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/TextExtractor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/TextExtractor.java deleted file mode 100644 index 3557d28..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/TextExtractor.java +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************** - * 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.store.extractor; - -import java.io.InputStream; - -public interface TextExtractor { - - ParsedContent extractContent(InputStream inputStream, String contentType, String fileName) throws Exception; - -} http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/store/src/test/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractorTest.java index 414ef1b..7d3834f 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractorTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractorTest.java @@ -19,11 +19,13 @@ package org.apache.james.mailbox.store.extractor; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.InputStream; +import org.apache.james.mailbox.extractor.TextExtractor; import org.junit.Before; import org.junit.Test; -import static org.assertj.core.api.Assertions.assertThat; public class DefaultTextExtractorTest { private TextExtractor textExtractor; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractor.java ---------------------------------------------------------------------- diff --git a/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractor.java b/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractor.java index 8ce7541..d4a376e 100644 --- a/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractor.java +++ b/mailbox/tika/src/main/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractor.java @@ -26,15 +26,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.collect.ImmutableList; -import org.apache.james.mailbox.store.extractor.ParsedContent; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.extractor.ParsedContent; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; import org.apache.tika.sax.BodyContentHandler; +import com.google.common.collect.ImmutableList; + public class TikaTextExtractor implements TextExtractor { private static class MetadataEntry { http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractorTest.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractorTest.java index 716c43f..7a03c93 100644 --- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractorTest.java +++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/extractor/TikaTextExtractorTest.java @@ -19,11 +19,11 @@ package org.apache.james.mailbox.tika.extractor; -import java.io.InputStream; - import static org.assertj.core.api.Assertions.assertThat; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import java.io.InputStream; + +import org.apache.james.mailbox.extractor.TextExtractor; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java index 6151a9a..0ea91bf 100644 --- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java +++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java @@ -32,7 +32,7 @@ import org.apache.james.mailbox.elasticsearch.ClientProviderImpl; import org.apache.james.mailbox.elasticsearch.IndexCreationFactory; import org.apache.james.mailbox.elasticsearch.NodeMappingFactory; import org.apache.james.mailbox.elasticsearch.events.ElasticSearchListeningMessageSearchIndex; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.store.search.ListeningMessageSearchIndex; import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.tika.extractor.TikaTextExtractor; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java index 7eef012..43b50ad 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataJmapModule.java @@ -25,9 +25,9 @@ import org.apache.james.jmap.api.vacation.VacationRepository; import org.apache.james.jmap.memory.access.MemoryAccessTokenRepository; import org.apache.james.jmap.memory.vacation.MemoryNotificationRegistry; import org.apache.james.jmap.memory.vacation.MemoryVacationRepository; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.inmemory.JsoupTextExtractor; import org.apache.james.mailbox.store.extractor.DefaultTextExtractor; -import org.apache.james.mailbox.store.extractor.TextExtractor; import com.google.inject.AbstractModule; import com.google.inject.Scopes; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java index 4bc7a0a..726fef9 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java @@ -30,6 +30,7 @@ import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.acl.UnionMailboxACLResolver; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.extractor.TextExtractor; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.inmemory.InMemoryMailboxManager; import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory; @@ -41,7 +42,6 @@ import org.apache.james.mailbox.store.Authenticator; import org.apache.james.mailbox.store.JVMMailboxPathLocker; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.StoreSubscriptionManager; -import org.apache.james.mailbox.store.extractor.TextExtractor; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapperFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/6c905bcf/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/MailboxBasedHtmlTextExtractor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/MailboxBasedHtmlTextExtractor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/MailboxBasedHtmlTextExtractor.java index db9f0d4..99cb01e 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/MailboxBasedHtmlTextExtractor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/MailboxBasedHtmlTextExtractor.java @@ -6,7 +6,7 @@ import java.io.ByteArrayInputStream; import javax.inject.Inject; -import org.apache.james.mailbox.store.extractor.TextExtractor; +import org.apache.james.mailbox.extractor.TextExtractor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
