diff --git a/search-service-v1/search-service-server-v1/pom.xml b/search-service-v1/search-service-server-v1/pom.xml index ae2e952..5d3ee7e 100644 --- a/search-service-v1/search-service-server-v1/pom.xml +++ b/search-service-v1/search-service-server-v1/pom.xml @@ -13,14 +13,14 @@ 2.93.0 - 0.10.0 + 0.12.0 com.knecon.fforesight tenant-commons - ${tennat-commons.version} + ${tenant-commons.version} com.google.guava 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 3cb9e8d..f377d8c 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 @@ -26,7 +26,7 @@ public class DocumentDeleteServiceImpl implements DocumentDeleteService { public void deleteDocument(String fileId) { - DeleteRequest request = new DeleteRequest.Builder().index(TenantContext.getTenantId()).id(fileId).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())).build(); + DeleteRequest request = new DeleteRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()).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 86f54a7..151707f 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 @@ -32,7 +32,7 @@ public class DocumentIndexServiceImpl implements DocumentIndexService { try { clientCache.getClient() - .index(i -> i.index(TenantContext.getTenantId()) + .index(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()) .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 7645494..c2aa39c 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 @@ -32,7 +32,7 @@ public class DocumentUpdateServiceImpl implements DocumentUpdateService { try { clientCache.getClient() - .update(u -> u.index(TenantContext.getTenantId()).id(fileId).doc(indexDocumentUpdate).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), + .update(u -> u.index(clientCache.getClient().getSearchConnection().getIndexName()).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 14329ca..1b30a1e 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 @@ -32,7 +32,7 @@ public class IndexCreatorServiceImpl { if (!indexExists(esClient)) { try { - var response = esClient.indices().create(i -> i.index(TenantContext.getTenantId()).settings(createIndexSettings(esClient)).mappings(createIndexMapping())); + var response = esClient.indices().create(i -> i.index(esClient.getSearchConnection().getIndexName()).settings(createIndexSettings(esClient)).mappings(createIndexMapping())); log.info("Successfully created index: {}", response.index()); } catch (IOException e) { log.error("Failed to create index.", e); @@ -44,7 +44,7 @@ public class IndexCreatorServiceImpl { private boolean indexExists(EsClient esClient) { try { - var response = esClient.indices().exists(i -> i.index(TenantContext.getTenantId())); + var response = esClient.indices().exists(i -> i.index(esClient.getSearchConnection().getIndexName())); 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 b9ec479..2a310cd 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 @@ -32,7 +32,7 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { @SneakyThrows public void closeIndex() { - var closeIndexResponse = clientCache.getClient().indices().close(i -> i.index(TenantContext.getTenantId()).timeout(t -> t.time("2m"))); + var closeIndexResponse = clientCache.getClient().indices().close(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).timeout(t -> t.time("2m"))); if (closeIndexResponse.acknowledged()) { log.info("Index is closed"); } else { @@ -45,7 +45,7 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { public void dropIndex() { log.info("Will drop index"); - var deleteIndexResponse = clientCache.getClient().indices().delete(i -> i.index(TenantContext.getTenantId()).timeout(t -> t.time("2m"))); + var deleteIndexResponse = clientCache.getClient().indices().delete(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).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 b318602..40e893d 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 @@ -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(TenantContext.getTenantId()) + SearchRequest request = new SearchRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()) .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 f304057..5b69f01 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 @@ -26,7 +26,7 @@ public class DocumentDeleteServiceImpl implements DocumentDeleteService { public void deleteDocument(String fileId) { - DeleteRequest request = new DeleteRequest.Builder().index(TenantContext.getTenantId()).id(fileId).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())).build(); + DeleteRequest request = new DeleteRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()).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 b4941c4..49d21f4 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 @@ -31,7 +31,7 @@ public class DocumentIndexServiceImpl implements DocumentIndexService { public void indexDocument(IndexDocument indexDocument) { try { - clientCache.getClient().index(i -> i.index(TenantContext.getTenantId()) + clientCache.getClient().index(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()) .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 71e6150..5d618ef 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 @@ -32,7 +32,7 @@ public class DocumentUpdateServiceImpl implements DocumentUpdateService { try { clientCache.getClient() - .update(u -> u.index(TenantContext.getTenantId()).id(fileId).doc(indexDocumentUpdate).refresh(Refresh._DESERIALIZER.parse(settings.getRefreshPolicy())), + .update(u -> u.index(clientCache.getClient().getSearchConnection().getIndexName()).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 9019724..5b07d55 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 @@ -34,7 +34,7 @@ public class IndexCreatorServiceImpl { if (!indexExists(client)) { try { - var response = client.indices().create(i -> i.index(TenantContext.getTenantId()).settings(createIndexSettings(client)).mappings(createIndexMapping(client))); + var response = client.indices().create(i -> i.index(client.getSearchConnection().getIndexName()).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 +46,7 @@ public class IndexCreatorServiceImpl { private boolean indexExists(OpensearchClient client) { try { - var response = client.indices().exists(i -> i.index(TenantContext.getTenantId())); + var response = client.indices().exists(i -> i.index(client.getSearchConnection().getIndexName())); 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 f69ab67..d45e6a0 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 @@ -32,7 +32,7 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { @SneakyThrows public void closeIndex() { - var closeIndexResponse = clientCache.getClient().indices().close(i -> i.index(TenantContext.getTenantId()).timeout(t -> t.time("2m"))); + var closeIndexResponse = clientCache.getClient().indices().close(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).timeout(t -> t.time("2m"))); if (closeIndexResponse.acknowledged()) { log.info("Index is closed"); } else { @@ -45,7 +45,7 @@ public class IndexDeleteServiceImpl implements IndexDeleteService { public void dropIndex() { log.info("Will drop index"); - var deleteIndexResponse = clientCache.getClient().indices().delete(i -> i.index(TenantContext.getTenantId()).timeout(t -> t.time("2m"))); + var deleteIndexResponse = clientCache.getClient().indices().delete(i -> i.index(clientCache.getClient().getSearchConnection().getIndexName()).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 5994dc7..4ed9350 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 @@ -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(TenantContext.getTenantId()) + SearchRequest request = new SearchRequest.Builder().index(clientCache.getClient().getSearchConnection().getIndexName()) .query(convertQuery(query, dossierTemplateIds, dossierIds, 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 fc01ab0..b34943e 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").build()) + .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(port).scheme("http").numberOfShards("1").numberOfReplicas("5").indexName("indexname").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 1eb5a24..43b74bf 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").build()) + .searchConnection(SearchConnection.builder().hosts(Set.of("localhost")).port(port).scheme("http").numberOfShards("1").numberOfReplicas("5").indexName("indexname").build()) .build()); }