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

fixed displayName issue for owner (#12724)

Browse Source
This commit is contained in:
07Himank 2023-08-03 19:09:35 +05:30 committed by GitHub
parent e5c4fbc361
commit 00885380b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/ContainerIndex.java
View File

@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.Container;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
import org.openmetadata.service.elasticsearch.ParseTags;
@ -21,6 +23,11 @@ public class ContainerIndex implements ColumnIndex {
}
public Map<String, Object> buildESDoc() {
if (container.getOwner() != null) {
EntityReference owner = container.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
container.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(container);
List<ElasticSearchSuggest> suggest = new ArrayList<>();
List<ElasticSearchSuggest> columnSuggest = new ArrayList<>();

6
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/DashboardIndex.java
View File

@ -5,6 +5,7 @@ import static org.openmetadata.common.utils.CommonUtil.listOrEmpty;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.Dashboard;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.service.Entity;
@ -22,6 +23,11 @@ public class DashboardIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (dashboard.getOwner() != null) {
EntityReference owner = dashboard.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
dashboard.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(dashboard);
ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
List<ElasticSearchSuggest> suggest = new ArrayList<>();

7
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/GlossaryTermIndex.java
View File

@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.GlossaryTerm;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
import org.openmetadata.service.elasticsearch.models.ElasticSearchSuggest;
@ -18,6 +20,11 @@ public class GlossaryTermIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (glossaryTerm.getOwner() != null) {
EntityReference owner = glossaryTerm.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
glossaryTerm.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(glossaryTerm);
ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
List<ElasticSearchSuggest> suggest = new ArrayList<>();

7
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/MlModelIndex.java
View File

@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.MlModel;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
import org.openmetadata.service.elasticsearch.ParseTags;
@ -19,6 +21,11 @@ public class MlModelIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (mlModel.getOwner() != null) {
EntityReference owner = mlModel.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
mlModel.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(mlModel);
List<ElasticSearchSuggest> suggest = new ArrayList<>();
ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);

7
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/PipelineIndex.java
View File

@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.Pipeline;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.schema.type.Task;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
@ -20,6 +22,11 @@ public class PipelineIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (pipeline.getOwner() != null) {
EntityReference owner = pipeline.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
pipeline.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(pipeline);
ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
List<ElasticSearchSuggest> suggest = new ArrayList<>();

8
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TableIndex.java
View File

@ -4,7 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.Table;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
import org.openmetadata.service.elasticsearch.ParseTags;
@ -28,6 +30,11 @@ public class TableIndex implements ColumnIndex {
}
public Map<String, Object> buildESDoc() {
if (table.getOwner() != null) {
EntityReference owner = table.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
table.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(table);
List<ElasticSearchSuggest> suggest = new ArrayList<>();
List<ElasticSearchSuggest> columnSuggest = new ArrayList<>();
@ -35,7 +42,6 @@ public class TableIndex implements ColumnIndex {
List<ElasticSearchSuggest> databaseSuggest = new ArrayList<>();
List<ElasticSearchSuggest> serviceSuggest = new ArrayList<>();
ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
if (table.getColumns() != null) {
List<FlattenColumn> cols = new ArrayList<>();
parseColumns(table.getColumns(), cols, null);

3
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TeamIndex.java
View File

@ -3,6 +3,7 @@ package org.openmetadata.service.elasticsearch.indexes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.teams.Team;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
@ -18,7 +19,7 @@ public class TeamIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (team.getDisplayName() == null) {
if (CommonUtil.nullOrEmpty(team.getDisplayName())) {
team.setDisplayName(team.getName());
}
Map<String, Object> doc = JsonUtils.getMap(team);

7
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TopicIndex.java
View File

@ -5,7 +5,9 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Predicate;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.data.Topic;
import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.schema.type.Field;
import org.openmetadata.schema.type.TagLabel;
import org.openmetadata.service.Entity;
@ -25,6 +27,11 @@ public class TopicIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (topic.getOwner() != null) {
EntityReference owner = topic.getOwner();
owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
topic.setOwner(owner);
}
Map<String, Object> doc = JsonUtils.getMap(topic);
List<ElasticSearchSuggest> suggest = new ArrayList<>();
List<ElasticSearchSuggest> fieldSuggest = new ArrayList<>();

3
openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/UserIndex.java
View File

@ -3,6 +3,7 @@ package org.openmetadata.service.elasticsearch.indexes;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.teams.User;
import org.openmetadata.service.Entity;
import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
@ -18,7 +19,7 @@ public class UserIndex implements ElasticSearchIndex {
}
public Map<String, Object> buildESDoc() {
if (user.getDisplayName() == null) {
if (CommonUtil.nullOrEmpty(user.getDisplayName())) {
user.setDisplayName(user.getName());
}
if (user.getIsBot() == null) {