yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-30 03:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Bhanu Agrawal 2025-09-25 13:24:02 +01:00
parent e9d202c959
commit 8a35bf3f28
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchEntityManager.java
View File

@ -27,7 +27,6 @@ import jakarta.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -56,9 +55,8 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
public ElasticSearchEntityManager(ElasticsearchClient client) { public ElasticSearchEntityManager(ElasticsearchClient client) {
this.client = client; this.client = client;
this.isClientAvailable = client != null; this.isClientAvailable = client != null;
if (this.isClientAvailable) { this.asyncClient =
this.asyncClient = new ElasticsearchAsyncClient(this.client._transport()); this.isClientAvailable ? new ElasticsearchAsyncClient(this.client._transport()) : null;
}
this.isAsyncClientAvailable = this.asyncClient != null; this.isAsyncClientAvailable = this.asyncClient != null;
} }
@ -340,7 +338,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
inline inline
.lang(ScriptLanguage.Painless) .lang(ScriptLanguage.Painless)
.source(scriptTxt) .source(scriptTxt)
.params(new HashMap<>()))), .params(Map.of()))),
Map.class); Map.class);
LOG.info( LOG.info(
"Successfully soft deleted/restored entity in ElasticSearch for index: {}, docId: {}", "Successfully soft deleted/restored entity in ElasticSearch for index: {}, docId: {}",
@ -383,7 +381,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
inline inline
.lang(ScriptLanguage.Painless) .lang(ScriptLanguage.Painless)
.source(scriptTxt) .source(scriptTxt)
.params(new HashMap<>()))) .params(Map.of())))
.refresh(true)); .refresh(true));
LOG.info( LOG.info(
@ -453,7 +451,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
try { try {
Map<String, JsonData> params = Map<String, JsonData> params =
convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue());
client.updateByQuery( client.updateByQuery(
u -> u ->
@ -493,7 +491,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
try { try {
Map<String, JsonData> params = Map<String, JsonData> params =
convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue());
client.updateByQuery( client.updateByQuery(
u -> u ->
@ -564,7 +562,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
entityRelationshipData != null entityRelationshipData != null
? Collections.singletonMap( ? Collections.singletonMap(
"entityRelationshipData", JsonData.of(entityRelationshipData)) "entityRelationshipData", JsonData.of(entityRelationshipData))
: new HashMap<>(); : Map.of();
UpdateByQueryResponse response = UpdateByQueryResponse response =
client.updateByQuery( client.updateByQuery(

16
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchEntityManager.java
View File

@ -11,7 +11,6 @@ import jakarta.ws.rs.core.Response;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -57,9 +56,8 @@ public class OpenSearchEntityManager implements EntityManagementClient {
public OpenSearchEntityManager(OpenSearchClient client) { public OpenSearchEntityManager(OpenSearchClient client) {
this.client = client; this.client = client;
this.isClientAvailable = client != null; this.isClientAvailable = client != null;
if (this.isClientAvailable) { this.asyncClient =
this.asyncClient = new OpenSearchAsyncClient(this.client._transport()); this.isClientAvailable ? new OpenSearchAsyncClient(client._transport()) : null;
}
this.isAsyncClientAvailable = this.asyncClient != null; this.isAsyncClientAvailable = this.asyncClient != null;
} }
@ -341,7 +339,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
inline inline
.lang(ScriptLanguage.Painless.jsonValue()) .lang(ScriptLanguage.Painless.jsonValue())
.source(scriptTxt) .source(scriptTxt)
.params(new HashMap<>()))), .params(Map.of()))),
Map.class); Map.class);
LOG.info( LOG.info(
"Successfully soft deleted/restored entity in OpenSearch for index: {}, docId: {}", "Successfully soft deleted/restored entity in OpenSearch for index: {}, docId: {}",
@ -384,7 +382,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
inline inline
.lang(ScriptLanguage.Painless.jsonValue()) .lang(ScriptLanguage.Painless.jsonValue())
.source(scriptTxt) .source(scriptTxt)
.params(new HashMap<>()))) .params(Map.of())))
.refresh(true)); .refresh(true));
LOG.info( LOG.info(
@ -453,7 +451,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
try { try {
Map<String, JsonData> params = Map<String, JsonData> params =
convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue());
client.updateByQuery( client.updateByQuery(
u -> u ->
@ -493,7 +491,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
try { try {
Map<String, JsonData> params = Map<String, JsonData> params =
convertToJsonDataMap(updates.getValue() == null ? new HashMap<>() : updates.getValue()); convertToJsonDataMap(updates.getValue() == null ? Map.of() : updates.getValue());
client.updateByQuery( client.updateByQuery(
u -> u ->
@ -564,7 +562,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
entityRelationshipData != null entityRelationshipData != null
? Collections.singletonMap( ? Collections.singletonMap(
"entityRelationshipData", JsonData.of(entityRelationshipData)) "entityRelationshipData", JsonData.of(entityRelationshipData))
: new HashMap<>(); : Map.of();
UpdateByQueryResponse response = UpdateByQueryResponse response =
client.updateByQuery( client.updateByQuery(