chibenwa commented on code in PR #2018: URL: https://github.com/apache/james-project/pull/2018#discussion_r1500462621
########## mailbox/opensearch/src/test/java/org/apache/james/mailbox/opensearch/OpenSearchNoIndexBodyIntegrationTest.java: ########## @@ -0,0 +1,197 @@ +/**************************************************************** + * 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.opensearch; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.time.ZoneId; +import java.util.UUID; + +import org.apache.james.backends.opensearch.DockerOpenSearchExtension; +import org.apache.james.backends.opensearch.IndexName; +import org.apache.james.backends.opensearch.OpenSearchIndexer; +import org.apache.james.backends.opensearch.ReactorOpenSearchClient; +import org.apache.james.backends.opensearch.ReadAliasName; +import org.apache.james.backends.opensearch.WriteAliasName; +import org.apache.james.core.Username; +import org.apache.james.mailbox.MailboxSession; +import org.apache.james.mailbox.MessageManager; +import org.apache.james.mailbox.inmemory.InMemoryMailboxManager; +import org.apache.james.mailbox.inmemory.InMemoryMessageId; +import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; +import org.apache.james.mailbox.model.ComposedMessageId; +import org.apache.james.mailbox.model.Mailbox; +import org.apache.james.mailbox.model.MailboxPath; +import org.apache.james.mailbox.model.SearchQuery; +import org.apache.james.mailbox.opensearch.events.OpenSearchListeningMessageSearchIndex; +import org.apache.james.mailbox.opensearch.json.MessageToOpenSearchJson; +import org.apache.james.mailbox.opensearch.query.CriterionConverter; +import org.apache.james.mailbox.opensearch.query.QueryConverter; +import org.apache.james.mailbox.opensearch.search.OpenSearchSearcher; +import org.apache.james.mailbox.store.StoreMessageManager; +import org.apache.james.mailbox.store.search.MessageSearchIndex; +import org.apache.james.mailbox.tika.TikaConfiguration; +import org.apache.james.mailbox.tika.TikaExtension; +import org.apache.james.mailbox.tika.TikaHttpClientImpl; +import org.apache.james.mailbox.tika.TikaTextExtractor; +import org.apache.james.metrics.tests.RecordingMetricFactory; +import org.apache.james.mime4j.dom.Message; +import org.awaitility.Awaitility; +import org.awaitility.Durations; +import org.awaitility.core.ConditionFactory; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.opensearch.client.opensearch._types.query_dsl.Query; +import org.opensearch.client.opensearch._types.query_dsl.QueryBuilders; +import org.opensearch.client.opensearch.core.SearchRequest; + +import com.google.common.collect.ImmutableSet; + +import reactor.core.publisher.Mono; + +public class OpenSearchNoIndexBodyIntegrationTest { + static final int SEARCH_SIZE = 1; + private static final Username USERNAME = Username.of("user"); + private static final ConditionFactory CALMLY_AWAIT = Awaitility + .with().pollInterval(ONE_HUNDRED_MILLISECONDS) + .and().pollDelay(ONE_HUNDRED_MILLISECONDS) + .await(); + + @RegisterExtension + static TikaExtension tika = new TikaExtension(); + + @RegisterExtension + static DockerOpenSearchExtension openSearch = new DockerOpenSearchExtension(DockerOpenSearchExtension.CleanupStrategy.NONE); + + TikaTextExtractor textExtractor; + ReactorOpenSearchClient client; + private InMemoryMailboxManager storeMailboxManager; + private MessageSearchIndex messageSearchIndex; + private IndexName indexName; + protected MailboxSession session; + private Mailbox mailbox; + private MailboxPath inboxPath; + + + @BeforeEach + void setUp() throws Exception { + textExtractor = new TikaTextExtractor(new RecordingMetricFactory(), + new TikaHttpClientImpl(TikaConfiguration.builder() + .host(tika.getIp()) + .port(tika.getPort()) + .timeoutInMillis(tika.getTimeoutInMillis()) + .build())); + client = openSearch.getDockerOpenSearch().clientProvider().get(); + + InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory(); + MailboxIdRoutingKeyFactory routingKeyFactory = new MailboxIdRoutingKeyFactory(); + ReadAliasName readAliasName = new ReadAliasName(UUID.randomUUID().toString()); + WriteAliasName writeAliasName = new WriteAliasName(UUID.randomUUID().toString()); + indexName = new IndexName(UUID.randomUUID().toString()); + MailboxIndexCreationUtil.prepareClient(client, readAliasName, writeAliasName, indexName, + openSearch.getDockerOpenSearch().configuration()); + + InMemoryIntegrationResources resources = InMemoryIntegrationResources.builder() + .preProvisionnedFakeAuthenticator() + .fakeAuthorizator() + .inVmEventBus() + .defaultAnnotationLimits() + .defaultMessageParser() + .listeningSearchIndex(preInstanciationStage -> new OpenSearchListeningMessageSearchIndex( + preInstanciationStage.getMapperFactory(), + ImmutableSet.of(), + new OpenSearchIndexer(client, writeAliasName), + new OpenSearchSearcher(client, new QueryConverter(new CriterionConverter()), SEARCH_SIZE, readAliasName, routingKeyFactory), + new MessageToOpenSearchJson(textExtractor, ZoneId.of("Europe/Paris"), IndexAttachments.YES, IndexHeaders.YES), + preInstanciationStage.getSessionProvider(), routingKeyFactory, messageIdFactory, + OpenSearchMailboxConfiguration.builder().indexBody(IndexBody.NO).build(), new RecordingMetricFactory())) + .noPreDeletionHooks() + .storeQuotaManager() + .build(); + + storeMailboxManager = resources.getMailboxManager(); + messageSearchIndex = resources.getSearchIndex(); + + session = storeMailboxManager.createSystemSession(USERNAME); + inboxPath = MailboxPath.inbox(USERNAME); + storeMailboxManager.createMailbox(inboxPath, session); + + StoreMessageManager inboxMessageManager = (StoreMessageManager) storeMailboxManager.getMailbox(inboxPath, session); + mailbox = inboxMessageManager.getMailboxEntity(); + } + + @AfterEach + void tearDown() throws IOException { + client.close(); + } + + @Test + void searchingByBodyContentShouldNotReturnMessageWhenNoIndexBody() throws Exception { + addMessage(session, inboxPath).block(); + + awaitForOpenSearch(QueryBuilders.matchAll().build()._toQuery(), 1L); + + SearchQuery searchQuery = SearchQuery.of(SearchQuery.bodyContains("Hello")); + + assertThat(messageSearchIndex.search(session, mailbox, searchQuery).collectList().block()) + .isEmpty(); Review Comment: Memory backend is not compliant with FetchTyle and always return the full message. CF `InMemoryMessageMapper::findInMailbox`. We should cary other the indexed body config deep into `MimePartParser::parse` and use `message.getHeaderContent()` instead of `message.getFullContent()` in order to make it work. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
