From 5be7bca5f8560be175e40dff64245556a261ac09 Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:32:48 +0530 Subject: [PATCH] Fix failed to parse field [followers] of type [keyword] in document with i (#15670) --- .../org/openmetadata/service/search/indexes/ChartIndex.java | 1 + .../service/search/indexes/ClassificationIndex.java | 4 ++-- .../service/search/indexes/DashboardServiceIndex.java | 1 + .../openmetadata/service/search/indexes/DataProductIndex.java | 1 + .../openmetadata/service/search/indexes/DatabaseIndex.java | 1 + .../service/search/indexes/DatabaseSchemaIndex.java | 1 + .../service/search/indexes/DatabaseServiceIndex.java | 4 ++-- .../org/openmetadata/service/search/indexes/DomainIndex.java | 1 + .../openmetadata/service/search/indexes/GlossaryIndex.java | 1 + .../service/search/indexes/GlossaryTermIndex.java | 1 + .../service/search/indexes/MessagingServiceIndex.java | 4 ++-- .../service/search/indexes/MetadataServiceIndex.java | 4 ++-- .../service/search/indexes/MlModelServiceIndex.java | 4 ++-- .../service/search/indexes/PipelineServiceIndex.java | 4 ++-- .../service/search/indexes/SearchServiceIndex.java | 1 + .../service/search/indexes/StorageServiceIndex.java | 1 + .../org/openmetadata/service/search/indexes/TagIndex.java | 1 + .../org/openmetadata/service/search/indexes/TeamIndex.java | 1 + .../openmetadata/service/search/indexes/TestCaseIndex.java | 1 + .../openmetadata/service/search/indexes/TestSuiteIndex.java | 1 + .../org/openmetadata/service/search/indexes/UserIndex.java | 1 + 21 files changed, 27 insertions(+), 12 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java index fca43e42386..64deeb63a43 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ChartIndex.java @@ -27,6 +27,7 @@ public record ChartIndex(Chart chart) implements SearchIndex { doc.put("entityType", Entity.CHART); doc.put("owner", getEntityWithDisplayName(chart.getOwner())); doc.put("domain", getEntityWithDisplayName(chart.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(chart.getFollowers())); doc.put( "totalVotes", CommonUtil.nullOrEmpty(chart.getVotes()) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java index ce6a8071292..b7d71dafedd 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/ClassificationIndex.java @@ -3,7 +3,6 @@ package org.openmetadata.service.search.indexes; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.openmetadata.schema.entity.classification.Classification; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; @@ -24,10 +23,11 @@ public record ClassificationIndex(Classification classification) implements Sear "fqnParts", getFQNParts( classification.getFullyQualifiedName(), - suggest.stream().map(SearchSuggest::getInput).collect(Collectors.toList()))); + suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("suggest", suggest); doc.put("entityType", Entity.CLASSIFICATION); doc.put("owner", getEntityWithDisplayName(classification.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(classification.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java index 3c0e0729da5..20026af1108 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DashboardServiceIndex.java @@ -29,6 +29,7 @@ public record DashboardServiceIndex(DashboardService dashboardService) implement doc.put("entityType", Entity.DASHBOARD_SERVICE); doc.put("owner", getEntityWithDisplayName(dashboardService.getOwner())); doc.put("domain", getEntityWithDisplayName(dashboardService.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(dashboardService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java index 044e7aeeab7..d8584bd524f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DataProductIndex.java @@ -27,6 +27,7 @@ public record DataProductIndex(DataProduct dataProduct) implements SearchIndex { doc.put("entityType", Entity.DATA_PRODUCT); doc.put("owner", getEntityWithDisplayName(dataProduct.getOwner())); doc.put("domain", getEntityWithDisplayName(dataProduct.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(dataProduct.getFollowers())); return doc; } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java index 5c8623c111d..f7523b55c08 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseIndex.java @@ -33,6 +33,7 @@ public record DatabaseIndex(Database database) implements SearchIndex { : database.getVotes().getUpVotes() - database.getVotes().getDownVotes()); doc.put("owner", getEntityWithDisplayName(database.getOwner())); doc.put("domain", getEntityWithDisplayName(database.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(database.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java index 0dde36a0546..c54f9a1ad85 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseSchemaIndex.java @@ -34,6 +34,7 @@ public record DatabaseSchemaIndex(DatabaseSchema databaseSchema) implements Sear ? 0 : databaseSchema.getVotes().getUpVotes() - databaseSchema.getVotes().getDownVotes()); doc.put("domain", getEntityWithDisplayName(databaseSchema.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(databaseSchema.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java index 428d5b7e740..f007fa8871d 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DatabaseServiceIndex.java @@ -3,7 +3,6 @@ package org.openmetadata.service.search.indexes; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.openmetadata.schema.entity.services.DatabaseService; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; @@ -24,11 +23,12 @@ public record DatabaseServiceIndex(DatabaseService databaseService) implements S "fqnParts", getFQNParts( databaseService.getFullyQualifiedName(), - suggest.stream().map(SearchSuggest::getInput).collect(Collectors.toList()))); + suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("suggest", suggest); doc.put("entityType", Entity.DATABASE_SERVICE); doc.put("owner", getEntityWithDisplayName(databaseService.getOwner())); doc.put("domain", getEntityWithDisplayName(databaseService.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(databaseService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java index 88ce3193198..9d2bcbb5c27 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/DomainIndex.java @@ -25,6 +25,7 @@ public record DomainIndex(Domain domain) implements SearchIndex { suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("suggest", suggest); doc.put("entityType", Entity.DOMAIN); + doc.put("followers", SearchIndexUtils.parseFollowers(domain.getFollowers())); return doc; } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryIndex.java index 960c05cf73a..7acb2588e6b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryIndex.java @@ -40,6 +40,7 @@ public class GlossaryIndex implements SearchIndex { ? 0 : glossary.getVotes().getUpVotes() - glossary.getVotes().getDownVotes()); doc.put("domain", getEntityWithDisplayName(glossary.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(glossary.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryTermIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryTermIndex.java index 244c2eeb5c8..dff89c3cf0e 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryTermIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/GlossaryTermIndex.java @@ -40,6 +40,7 @@ public class GlossaryTermIndex implements SearchIndex { : glossaryTerm.getVotes().getUpVotes() - glossaryTerm.getVotes().getDownVotes()); doc.put("owner", getEntityWithDisplayName(glossaryTerm.getOwner())); doc.put("domain", getEntityWithDisplayName(glossaryTerm.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(glossaryTerm.getFollowers())); return doc; } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java index 11f26bb2834..8a6cb3b1684 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MessagingServiceIndex.java @@ -3,7 +3,6 @@ package org.openmetadata.service.search.indexes; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.openmetadata.schema.entity.services.MessagingService; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; @@ -24,11 +23,12 @@ public record MessagingServiceIndex(MessagingService messagingService) implement "fqnParts", getFQNParts( messagingService.getFullyQualifiedName(), - suggest.stream().map(SearchSuggest::getInput).collect(Collectors.toList()))); + suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("suggest", suggest); doc.put("entityType", Entity.MESSAGING_SERVICE); doc.put("owner", getEntityWithDisplayName(messagingService.getOwner())); doc.put("domain", getEntityWithDisplayName(messagingService.getDomain())); + doc.put("followers", SearchIndexUtils.parseFollowers(messagingService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MetadataServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MetadataServiceIndex.java index 817e7c4bd86..cd982521a5b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MetadataServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MetadataServiceIndex.java @@ -3,7 +3,6 @@ package org.openmetadata.service.search.indexes; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.openmetadata.schema.entity.services.MetadataService; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; @@ -24,10 +23,11 @@ public record MetadataServiceIndex(MetadataService metadataService) implements S "fqnParts", getFQNParts( metadataService.getFullyQualifiedName(), - suggest.stream().map(SearchSuggest::getInput).collect(Collectors.toList()))); + suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("suggest", suggest); doc.put("entityType", Entity.METADATA_SERVICE); doc.put("owner", getEntityWithDisplayName(metadataService.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(metadataService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java index 71db73140d2..bb8bd288439 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/MlModelServiceIndex.java @@ -3,7 +3,6 @@ package org.openmetadata.service.search.indexes; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.openmetadata.schema.entity.services.MlModelService; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; @@ -24,10 +23,11 @@ public record MlModelServiceIndex(MlModelService mlModelService) implements Sear "fqnParts", getFQNParts( mlModelService.getFullyQualifiedName(), - suggest.stream().map(SearchSuggest::getInput).collect(Collectors.toList()))); + suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("suggest", suggest); doc.put("entityType", Entity.MLMODEL_SERVICE); doc.put("owner", getEntityWithDisplayName(mlModelService.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(mlModelService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java index 856bc9e444c..4c9625d163f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/PipelineServiceIndex.java @@ -3,7 +3,6 @@ package org.openmetadata.service.search.indexes; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.openmetadata.schema.entity.services.PipelineService; import org.openmetadata.service.Entity; import org.openmetadata.service.search.SearchIndexUtils; @@ -26,8 +25,9 @@ public record PipelineServiceIndex(PipelineService pipelineService) implements S "fqnParts", getFQNParts( pipelineService.getFullyQualifiedName(), - suggest.stream().map(SearchSuggest::getInput).collect(Collectors.toList()))); + suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("owner", getEntityWithDisplayName(pipelineService.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(pipelineService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java index 98515c99450..35faf461118 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/SearchServiceIndex.java @@ -27,6 +27,7 @@ public record SearchServiceIndex(SearchService searchService) implements SearchI searchService.getFullyQualifiedName(), suggest.stream().map(SearchSuggest::getInput).toList())); doc.put("owner", getEntityWithDisplayName(searchService.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(searchService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StorageServiceIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StorageServiceIndex.java index cdb682a90bc..60e5e33c098 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StorageServiceIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/StorageServiceIndex.java @@ -27,6 +27,7 @@ public record StorageServiceIndex(StorageService storageService) implements Sear doc.put("suggest", suggest); doc.put("entityType", Entity.STORAGE_SERVICE); doc.put("owner", getEntityWithDisplayName(storageService.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(storageService.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TagIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TagIndex.java index 6d9ca672507..7f5336df96b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TagIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TagIndex.java @@ -29,6 +29,7 @@ public record TagIndex(Tag tag) implements SearchIndex { } doc.put("suggest", suggest); doc.put("entityType", Entity.TAG); + doc.put("followers", SearchIndexUtils.parseFollowers(tag.getFollowers())); return doc; } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TeamIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TeamIndex.java index e9c787603ed..2f4bd4fa9ef 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TeamIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TeamIndex.java @@ -34,6 +34,7 @@ public class TeamIndex implements SearchIndex { doc.put( "displayName", CommonUtil.nullOrEmpty(team.getDisplayName()) ? team.getName() : team.getDisplayName()); + doc.put("followers", SearchIndexUtils.parseFollowers(team.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java index dc7bac870bf..d27a6dee846 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestCaseIndex.java @@ -40,6 +40,7 @@ public record TestCaseIndex(TestCase testCase) implements SearchIndex { doc.put("suggest", suggest); doc.put("entityType", Entity.TEST_CASE); doc.put("owner", getEntityWithDisplayName(testCase.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(testCase.getFollowers())); return doc; } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java index bbb50678ba8..333c5d914a6 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/TestSuiteIndex.java @@ -26,6 +26,7 @@ public record TestSuiteIndex(TestSuite testSuite) implements SearchIndex { doc.put("suggest", suggest); doc.put("entityType", Entity.TEST_SUITE); doc.put("owner", getEntityWithDisplayName(testSuite.getOwner())); + doc.put("followers", SearchIndexUtils.parseFollowers(testSuite.getFollowers())); return doc; } } diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/UserIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/UserIndex.java index 88d505982df..959847f08ce 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/UserIndex.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/indexes/UserIndex.java @@ -37,6 +37,7 @@ public class UserIndex implements SearchIndex { if (user.getIsBot() == null) { doc.put("isBot", false); } + doc.put("followers", SearchIndexUtils.parseFollowers(user.getFollowers())); return doc; }