From 8a35bf3f2860e781afb83d74898c01977c2b15ef Mon Sep 17 00:00:00 2001 From: Bhanu Agrawal Date: Thu, 25 Sep 2025 13:24:02 +0100 Subject: [PATCH] Refactoring --- .../ElasticSearchEntityManager.java | 16 +++++++--------- .../opensearch/OpenSearchEntityManager.java | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityManager.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityManager.java index c105d0c4551..7a13e4ab20c 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityManager.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityManager.java @@ -27,7 +27,6 @@ import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -56,9 +55,8 @@ public class ElasticSearchEntityManager implements EntityManagementClient { public ElasticSearchEntityManager(ElasticsearchClient client) { this.client = client; this.isClientAvailable = client != null; - if (this.isClientAvailable) { - this.asyncClient = new ElasticsearchAsyncClient(this.client._transport()); - } + this.asyncClient = + this.isClientAvailable ? new ElasticsearchAsyncClient(this.client._transport()) : null; this.isAsyncClientAvailable = this.asyncClient != null; } @@ -340,7 +338,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient { inline .lang(ScriptLanguage.Painless) .source(scriptTxt) - .params(new HashMap<>()))), + .params(Map.of()))), Map.class); LOG.info( "Successfully soft deleted/restored entity in ElasticSearch for index: {}, docId: {}", @@ -383,7 +381,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient { inline .lang(ScriptLanguage.Painless) .source(scriptTxt) - .params(new HashMap<>()))) + .params(Map.of()))) .refresh(true)); LOG.info( @@ -453,7 +451,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient { try { Map params = - convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); + convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue()); client.updateByQuery( u -> @@ -493,7 +491,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient { try { Map params = - convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); + convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue()); client.updateByQuery( u -> @@ -564,7 +562,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient { entityRelationshipData != null ? Collections.singletonMap( "entityRelationshipData", JsonData.of(entityRelationshipData)) - : new HashMap<>(); + : Map.of(); UpdateByQueryResponse response = client.updateByQuery( diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityManager.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityManager.java index 63c08514aa3..05356b963e0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityManager.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityManager.java @@ -11,7 +11,6 @@ import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -57,9 +56,8 @@ public class OpenSearchEntityManager implements EntityManagementClient { public OpenSearchEntityManager(OpenSearchClient client) { this.client = client; this.isClientAvailable = client != null; - if (this.isClientAvailable) { - this.asyncClient = new OpenSearchAsyncClient(this.client._transport()); - } + this.asyncClient = + this.isClientAvailable ? new OpenSearchAsyncClient(client._transport()) : null; this.isAsyncClientAvailable = this.asyncClient != null; } @@ -341,7 +339,7 @@ public class OpenSearchEntityManager implements EntityManagementClient { inline .lang(ScriptLanguage.Painless.jsonValue()) .source(scriptTxt) - .params(new HashMap<>()))), + .params(Map.of()))), Map.class); LOG.info( "Successfully soft deleted/restored entity in OpenSearch for index: {}, docId: {}", @@ -384,7 +382,7 @@ public class OpenSearchEntityManager implements EntityManagementClient { inline .lang(ScriptLanguage.Painless.jsonValue()) .source(scriptTxt) - .params(new HashMap<>()))) + .params(Map.of()))) .refresh(true)); LOG.info( @@ -453,7 +451,7 @@ public class OpenSearchEntityManager implements EntityManagementClient { try { Map params = - convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); + convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue()); client.updateByQuery( u -> @@ -493,7 +491,7 @@ public class OpenSearchEntityManager implements EntityManagementClient { try { Map params = - convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); + convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue()); client.updateByQuery( u -> @@ -564,7 +562,7 @@ public class OpenSearchEntityManager implements EntityManagementClient { entityRelationshipData != null ? Collections.singletonMap( "entityRelationshipData", JsonData.of(entityRelationshipData)) - : new HashMap<>(); + : Map.of(); UpdateByQueryResponse response = client.updateByQuery(