diff --git a/search-service-v1/search-service-server-v1/pom.xml b/search-service-v1/search-service-server-v1/pom.xml index 5d3ee7e..e0aaa10 100644 --- a/search-service-v1/search-service-server-v1/pom.xml +++ b/search-service-v1/search-service-server-v1/pom.xml @@ -13,7 +13,7 @@ 2.93.0 - 0.12.0 + 0.13.0 diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentDeleteServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentDeleteServiceImpl.java index f377d8c..12ee950 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentDeleteServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentDeleteServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.service.DocumentDeleteService; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import co.elastic.clients.elasticsearch._types.ElasticsearchException; import co.elastic.clients.elasticsearch._types.Refresh; @@ -26,7 +26,10 @@ public class DocumentDeleteServiceImpl implements DocumentDeleteService { public void deleteDocument(String fileId) { - DeleteRequest request = new DeleteRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()).id(fileId).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())).build(); + DeleteRequest request = new DeleteRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) + .id(fileId) + .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())) + .build(); try { clientCache.getClient().delete(request); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentIndexServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentIndexServiceImpl.java index 151707f..99db581 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentIndexServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentIndexServiceImpl.java @@ -9,7 +9,7 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.model.IndexDocument; import com.iqser.red.service.search.v1.server.service.DocumentIndexService; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import co.elastic.clients.elasticsearch._types.ElasticsearchException; import co.elastic.clients.elasticsearch._types.Refresh; @@ -32,7 +32,7 @@ public class DocumentIndexServiceImpl implements DocumentIndexService { try { clientCache.getClient() - .index(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()) + .index(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) .id(indexDocument.getFileId()) .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())) .document(indexDocument)); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentUpdateServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentUpdateServiceImpl.java index c2aa39c..bed0165 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentUpdateServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/DocumentUpdateServiceImpl.java @@ -9,7 +9,7 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate; import com.iqser.red.service.search.v1.server.service.DocumentUpdateService; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import co.elastic.clients.elasticsearch._types.ElasticsearchException; import co.elastic.clients.elasticsearch._types.Refresh; @@ -32,8 +32,10 @@ public class DocumentUpdateServiceImpl implements DocumentUpdateService { try { clientCache.getClient() - .update(u -> u.index(clientCache.getClient().getSearchConnection().getIndexName()).id(fileId).doc(indexDocumentUpdate).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), - IndexDocumentUpdate.class); + .update(u -> u.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) + .id(fileId) + .doc(indexDocumentUpdate) + .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), IndexDocumentUpdate.class); } catch (IOException | ElasticsearchException e) { throw IndexException.documentUpdateError(fileId, e); } diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexCreatorServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexCreatorServiceImpl.java index 1b30a1e..ad61fb7 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexCreatorServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexCreatorServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch.indices.IndexSettings; @@ -32,7 +32,10 @@ public class IndexCreatorServiceImpl { if (!indexExists(esClient)) { try { - var response = esClient.indices().create(i -> i.index(esClient.getSearchConnection().getIndexName()).settings(createIndexSettings(esClient)).mappings(createIndexMapping())); + var response = esClient.indices() + .create(i -> i.index(IndexNameHelper.getSearchIndex(esClient.getSearchConnection().getIndexPrefix())) + .settings(createIndexSettings(esClient)) + .mappings(createIndexMapping())); log.info("Successfully created index: {}", response.index()); } catch (IOException e) { log.error("Failed to create index.", e); @@ -44,7 +47,7 @@ public class IndexCreatorServiceImpl { private boolean indexExists(EsClient esClient) { try { - var response = esClient.indices().exists(i -> i.index(esClient.getSearchConnection().getIndexName())); + var response = esClient.indices().exists(i -> i.index(IndexNameHelper.getSearchIndex(esClient.getSearchConnection().getIndexPrefix()))); return response.value(); } catch (IOException e) { throw IndexException.indexExists(e); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexDeleteServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexDeleteServiceImpl.java index 2a310cd..29c23d1 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexDeleteServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/IndexDeleteServiceImpl.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.service.IndexDeleteService; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -32,7 +32,9 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { @SneakyThrows public void closeIndex() { - var closeIndexResponse = clientCache.getClient().indices().close(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).timeout(t -> t.time("2m"))); + var closeIndexResponse = clientCache.getClient() + .indices() + .close(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())).timeout(t -> t.time("2m"))); if (closeIndexResponse.acknowledged()) { log.info("Index is closed"); } else { @@ -45,7 +47,9 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { public void dropIndex() { log.info("Will drop index"); - var deleteIndexResponse = clientCache.getClient().indices().delete(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).timeout(t -> t.time("2m"))); + var deleteIndexResponse = clientCache.getClient() + .indices() + .delete(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())).timeout(t -> t.time("2m"))); if (deleteIndexResponse.acknowledged()) { log.info("Index is dropped"); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java index 40e893d..bc0235f 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/SearchServiceImpl.java @@ -22,8 +22,8 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.model.IndexDocument; import com.iqser.red.service.search.v1.server.model.Query; import com.iqser.red.service.search.v1.server.service.SearchService; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import com.iqser.red.service.search.v1.server.utils.QueryStringConverter; -import com.knecon.fforesight.tenantcommons.TenantContext; import co.elastic.clients.elasticsearch._types.FieldValue; import co.elastic.clients.elasticsearch._types.query_dsl.ChildScoreMode; @@ -71,7 +71,7 @@ public class SearchServiceImpl implements SearchService { highlightFieldMap.put("filename", new HighlightField.Builder().build()); highlightFieldMap.put("fileAttributes.value", new HighlightField.Builder().build()); - SearchRequest request = new SearchRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()) + SearchRequest request = new SearchRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) .query(convertQuery(query, dossierTemplateIds, dossierIds, diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentDeleteServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentDeleteServiceImpl.java index 5b69f01..76b8d34 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentDeleteServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentDeleteServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.service.DocumentDeleteService; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import lombok.RequiredArgsConstructor; @@ -26,7 +26,10 @@ public class DocumentDeleteServiceImpl implements DocumentDeleteService { public void deleteDocument(String fileId) { - DeleteRequest request = new DeleteRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()).id(fileId).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())).build(); + DeleteRequest request = new DeleteRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) + .id(fileId) + .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())) + .build(); try { clientCache.getClient().delete(request); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentIndexServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentIndexServiceImpl.java index 49d21f4..563d7dc 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentIndexServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentIndexServiceImpl.java @@ -11,7 +11,7 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.model.IndexDocument; import com.iqser.red.service.search.v1.server.service.DocumentIndexService; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import io.micrometer.core.annotation.Timed; import lombok.RequiredArgsConstructor; @@ -31,7 +31,7 @@ public class DocumentIndexServiceImpl implements DocumentIndexService { public void indexDocument(IndexDocument indexDocument) { try { - clientCache.getClient().index(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()) + clientCache.getClient().index(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) .id(indexDocument.getFileId()) .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())) .document(indexDocument)); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentUpdateServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentUpdateServiceImpl.java index 5d618ef..c16e3f2 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentUpdateServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/DocumentUpdateServiceImpl.java @@ -11,7 +11,7 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.model.IndexDocumentUpdate; import com.iqser.red.service.search.v1.server.service.DocumentUpdateService; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import io.micrometer.core.annotation.Timed; import lombok.RequiredArgsConstructor; @@ -32,8 +32,10 @@ public class DocumentUpdateServiceImpl implements DocumentUpdateService { try { clientCache.getClient() - .update(u -> u.index(clientCache.getClient().getSearchConnection().getIndexName()).id(fileId).doc(indexDocumentUpdate).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), - IndexDocumentUpdate.class); + .update(u -> u.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) + .id(fileId) + .doc(indexDocumentUpdate) + .refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), IndexDocumentUpdate.class); } catch (IOException | OpenSearchException e) { throw IndexException.documentUpdateError(fileId, e); } diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexCreatorServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexCreatorServiceImpl.java index 5b07d55..1579ee4 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexCreatorServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexCreatorServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import jakarta.json.stream.JsonParser; import lombok.RequiredArgsConstructor; @@ -34,7 +34,10 @@ public class IndexCreatorServiceImpl { if (!indexExists(client)) { try { - var response = client.indices().create(i -> i.index(client.getSearchConnection().getIndexName()).settings(createIndexSettings(client)).mappings(createIndexMapping(client))); + var response = client.indices() + .create(i -> i.index(IndexNameHelper.getSearchIndex(client.getSearchConnection().getIndexPrefix())) + .settings(createIndexSettings(client)) + .mappings(createIndexMapping(client))); log.info("Successfully created index: {}", response.index()); } catch (IOException e) { log.error("Failed to create index.", e); @@ -46,7 +49,7 @@ public class IndexCreatorServiceImpl { private boolean indexExists(OpensearchClient client) { try { - var response = client.indices().exists(i -> i.index(client.getSearchConnection().getIndexName())); + var response = client.indices().exists(i -> i.index(IndexNameHelper.getSearchIndex(client.getSearchConnection().getIndexPrefix()))); return response.value(); } catch (IOException e) { throw IndexException.indexExists(e); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexDeleteServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexDeleteServiceImpl.java index d45e6a0..377baf8 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexDeleteServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/IndexDeleteServiceImpl.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.service.IndexDeleteService; -import com.knecon.fforesight.tenantcommons.TenantContext; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -32,7 +32,9 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { @SneakyThrows public void closeIndex() { - var closeIndexResponse = clientCache.getClient().indices().close(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).timeout(t -> t.time("2m"))); + var closeIndexResponse = clientCache.getClient() + .indices() + .close(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())).timeout(t -> t.time("2m"))); if (closeIndexResponse.acknowledged()) { log.info("Index is closed"); } else { @@ -45,7 +47,9 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { public void dropIndex() { log.info("Will drop index"); - var deleteIndexResponse = clientCache.getClient().indices().delete(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).timeout(t -> t.time("2m"))); + var deleteIndexResponse = clientCache.getClient() + .indices() + .delete(i -> i.index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())).timeout(t -> t.time("2m"))); if (deleteIndexResponse.acknowledged()) { log.info("Index is dropped"); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java index 4ed9350..8e44bf2 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/SearchServiceImpl.java @@ -33,8 +33,8 @@ import com.iqser.red.service.search.v1.server.exception.IndexException; import com.iqser.red.service.search.v1.server.model.IndexDocument; import com.iqser.red.service.search.v1.server.model.Query; import com.iqser.red.service.search.v1.server.service.SearchService; +import com.iqser.red.service.search.v1.server.utils.IndexNameHelper; import com.iqser.red.service.search.v1.server.utils.QueryStringConverter; -import com.knecon.fforesight.tenantcommons.TenantContext; import io.micrometer.core.annotation.Timed; import io.micrometer.core.instrument.util.StringUtils; @@ -72,7 +72,7 @@ public class SearchServiceImpl implements SearchService { highlightFieldMap.put("filename", new HighlightField.Builder().build()); highlightFieldMap.put("fileAttributes.value", new HighlightField.Builder().build()); - SearchRequest request = new SearchRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()) + SearchRequest request = new SearchRequest.Builder().index(IndexNameHelper.getSearchIndex(clientCache.getClient().getSearchConnection().getIndexPrefix())) .query(convertQuery(query, dossierTemplateIds, dossierIds, diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java new file mode 100644 index 0000000..e7564ff --- /dev/null +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java @@ -0,0 +1,24 @@ +package com.iqser.red.service.search.v1.server.utils; + +import com.knecon.fforesight.tenantcommons.TenantContext; + +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; + +@UtilityClass +@Slf4j +public class IndexNameHelper { + + private static final String SEARCH_INDEX = "%s_search"; + + + public String getSearchIndex(String indexPrefix) { + log.info("INDEX_PREFIX: {}", indexPrefix); + if(indexPrefix != null) { + return String.format(SEARCH_INDEX, indexPrefix); + } else { + return String.format(SEARCH_INDEX, TenantContext.getTenantId()); + } + } + +} diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java index b34943e..d0efc38 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java @@ -57,7 +57,7 @@ public abstract class AbstractElasticsearchIntegrationTest { TenantContext.setTenantId("redaction"); when(tenantsClient.getTenant("redaction")).thenReturn(TenantResponse.builder() - .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(port).scheme("http").numberOfShards("1").numberOfReplicas("5").indexName("indexname").build()) + .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(port).scheme("http").numberOfShards("1").numberOfReplicas("5").indexPrefix("indexprefix").build()) .build()); } diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractOpensearchIntegrationTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractOpensearchIntegrationTest.java index 43b74bf..dc60d1b 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractOpensearchIntegrationTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractOpensearchIntegrationTest.java @@ -55,7 +55,7 @@ public abstract class AbstractOpensearchIntegrationTest { TenantContext.setTenantId("redaction"); when(tenantsClient.getTenant("redaction")).thenReturn(TenantResponse.builder() - .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(port).scheme("http").numberOfShards("1").numberOfReplicas("5").indexName("indexname").build()) + .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(port).scheme("http").numberOfShards("1").numberOfReplicas("5").indexPrefix("indexprefix").build()) .build()); }