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

Refactored duplicate methods createEntity and createTimeSeriesEntity

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

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

@ -62,28 +62,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
@Override @Override
public void createEntity(String indexName, String docId, String doc) { public void createEntity(String indexName, String docId, String doc) {
if (!isClientAvailable) { upsertDocument(indexName, docId, doc, "create entity");
LOG.error("ElasticSearch client is not available. Cannot create entity.");
return;
}
try {
client.update(
u ->
u.index(indexName)
.id(docId)
.docAsUpsert(true)
.refresh(Refresh.True)
.doc(toJsonData(doc)),
Map.class);
LOG.info(
"Successfully created entity in ElasticSearch for index: {}, docId: {}",
indexName,
docId);
} catch (Exception e) {
LOG.error(
"Failed to create entity in ElasticSearch for index: {}, docId: {}", indexName, docId, e);
}
} }
@Override @Override
@ -148,31 +127,7 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
@Override @Override
public void createTimeSeriesEntity(String indexName, String docId, String doc) { public void createTimeSeriesEntity(String indexName, String docId, String doc) {
if (!isClientAvailable) { upsertDocument(indexName, docId, doc, "create time series entity");
LOG.error("ElasticSearch client is not available. Cannot create time series entity.");
return;
}
try {
client.update(
u ->
u.index(indexName)
.id(docId)
.docAsUpsert(true)
.refresh(Refresh.True)
.doc(toJsonData(doc)),
Map.class);
LOG.info(
"Successfully created time series entity in ElasticSearch for index: {}, docId: {}",
indexName,
docId);
} catch (Exception e) {
LOG.error(
"Failed to create time series entity in ElasticSearch for index: {}, docId: {}",
indexName,
docId,
e);
}
} }
@Override @Override
@ -629,6 +584,29 @@ public class ElasticSearchEntityManager implements EntityManagementClient {
} }
} }
private void upsertDocument(String indexName, String docId, String doc, String operation) {
if (!isClientAvailable) {
LOG.error("ElasticSearch client is not available. Cannot {}.", operation);
return;
}
try {
client.update(
u ->
u.index(indexName)
.id(docId)
.docAsUpsert(true)
.refresh(Refresh.True)
.doc(toJsonData(doc)),
Map.class);
LOG.info(
"Successfully {} in ElasticSearch for index: {}, docId: {}", operation, indexName, docId);
} catch (Exception e) {
LOG.error(
"Failed to {} in ElasticSearch for index: {}, docId: {}", operation, indexName, docId, e);
}
}
private Map<String, JsonData> convertToJsonDataMap(Map<String, Object> map) { private Map<String, JsonData> convertToJsonDataMap(Map<String, Object> map) {
return JsonUtils.getMap(map).entrySet().stream() return JsonUtils.getMap(map).entrySet().stream()
.filter(entry -> entry.getValue() != null) .filter(entry -> entry.getValue() != null)

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

@ -63,26 +63,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
@Override @Override
public void createEntity(String indexName, String docId, String doc) { public void createEntity(String indexName, String docId, String doc) {
if (!isClientAvailable) { upsertDocument(indexName, docId, doc, "create entity");
LOG.error("OpenSearch client is not available. Cannot create entity.");
return;
}
try {
client.update(
u ->
u.index(indexName)
.id(docId)
.refresh(Refresh.True)
.docAsUpsert(true)
.doc(toJsonData(doc)),
Map.class);
LOG.info(
"Successfully created entity in OpenSearch for index: {}, docId: {}", indexName, docId);
} catch (Exception e) {
LOG.error(
"Failed to create entity in OpenSearch for index: {}, docId: {}", indexName, docId, e);
}
} }
@Override @Override
@ -145,31 +126,7 @@ public class OpenSearchEntityManager implements EntityManagementClient {
@Override @Override
public void createTimeSeriesEntity(String indexName, String docId, String doc) { public void createTimeSeriesEntity(String indexName, String docId, String doc) {
if (!isClientAvailable) { upsertDocument(indexName, docId, doc, "create time series entity");
LOG.error("OpenSearch client is not available. Cannot create time series entity.");
return;
}
try {
client.update(
u ->
u.index(indexName)
.id(docId)
.refresh(Refresh.True)
.docAsUpsert(true)
.doc(toJsonData(doc)),
Map.class);
LOG.info(
"Successfully created time series entity in OpenSearch for index: {}, docId: {}",
indexName,
docId);
} catch (Exception e) {
LOG.error(
"Failed to create time series entity in OpenSearch for index: {}, docId: {}",
indexName,
docId,
e);
}
} }
@Override @Override
@ -627,6 +584,29 @@ public class OpenSearchEntityManager implements EntityManagementClient {
} }
} }
private void upsertDocument(String indexName, String docId, String doc, String operation) {
if (!isClientAvailable) {
LOG.error("OpenSearch client is not available. Cannot {}.", operation);
return;
}
try {
client.update(
u ->
u.index(indexName)
.id(docId)
.refresh(Refresh.True)
.docAsUpsert(true)
.doc(toJsonData(doc)),
Map.class);
LOG.info(
"Successfully {} in OpenSearch for index: {}, docId: {}", operation, indexName, docId);
} catch (Exception e) {
LOG.error(
"Failed to {} in OpenSearch for index: {}, docId: {}", operation, indexName, docId, e);
}
}
private Map<String, JsonData> convertToJsonDataMap(Map<String, Object> map) { private Map<String, JsonData> convertToJsonDataMap(Map<String, Object> map) {
return JsonUtils.getMap(map).entrySet().stream() return JsonUtils.getMap(map).entrySet().stream()
.filter(entry -> entry.getValue() != null) .filter(entry -> entry.getValue() != null)