[atlas] branch branch-2.0 updated: ATLAS-3433: Basic Search: Results include Internal Entities.

[sarath]

This is an automated email from the ASF dual-hosted git repository.

sarath pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 05cd593  ATLAS-3433: Basic Search: Results include Internal Entities.
05cd593 is described below

commit 05cd593259f8d5fb41f44c1f032a600fe0912d44
Author: Ashutosh Mestry <ames...@hortonworks.com>
AuthorDate: Tue Oct 1 16:22:46 2019 -0700

    ATLAS-3433: Basic Search: Results include Internal Entities.
    
    Signed-off-by: Sarath Subramanian <sar...@apache.org>
    (cherry picked from commit 929e505a8c2292d82f303e33561360c75a94c5d3)
---
 .../org/apache/atlas/repository/graph/SolrIndexHelper.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/repository/src/main/java/org/apache/atlas/repository/graph/SolrIndexHelper.java
 
b/repository/src/main/java/org/apache/atlas/repository/graph/SolrIndexHelper.java
index 4380a7e..26121fe 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/graph/SolrIndexHelper.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/graph/SolrIndexHelper.java
@@ -107,10 +107,16 @@ public class SolrIndexHelper implements 
IndexChangeListener {
         ret.put(typeRegistry.getIndexFieldName(CLASSIFICATION_TEXT_KEY), 
SEARCHWEIGHT_FOR_CLASSIFICATIONS);
         ret.put(typeRegistry.getIndexFieldName(TYPE_NAME_PROPERTY_KEY), 
SEARCHWEIGHT_FOR_TYPENAME);
 
-        if (CollectionUtils.isNotEmpty(entityTypes)) {
-            for (AtlasEntityType entityType : entityTypes) {
-                processEntityType(ret, entityType);
+        if (!CollectionUtils.isNotEmpty(entityTypes)) {
+            return ret;
+        }
+
+        for (AtlasEntityType entityType : entityTypes) {
+            if (entityType.isInternalType()) {
+                continue;
             }
+
+            processEntityType(ret, entityType);
         }
 
         return ret;