DG-721 Review Fixes

atlanhq · Jan 16, 2024 · c41b374 · c41b374
1 parent 78c4187
commit c41b374
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/DirectIndexQueryResult.java b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/DirectIndexQueryResult.java
@@ -8,8 +8,6 @@
 public class DirectIndexQueryResult<V, E> {
     private Iterator<AtlasIndexQuery.Result<V, E>> iterator;
     private Map<String, Aggregation> aggregationMap;
-
-    private Map<String, Object> highlightMap;
     private Integer approximateCount;
 
     public Iterator<AtlasIndexQuery.Result<V, E>> getIterator() {
@@ -36,11 +34,4 @@ public void setApproximateCount(Integer approximateCount) {
         this.approximateCount = approximateCount;
     }
 
-    public Map<String, Object> getHighlightMap() {
-        return highlightMap;
-    }
-
-    public void setHighlightMap(Map<String, Object> highlightMap) {
-        this.highlightMap = highlightMap;
-    }
 }
diff --git a/...anus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasElasticsearchQuery.java b/...anus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasElasticsearchQuery.java
@@ -344,7 +344,11 @@ public double getScore() {
 
         @Override
         public Map<String, List<String>> getHighLights() {
-            return (Map<String, List<String>>) this.hit.get("highlight");
+            Object highlight = this.hit.get("highlight");
+            if(Objects.isNull(highlight)) {
+                return (Map<String, List<String>>) highlight;
+            }
+            return null;
         }
     }
 }
diff --git a/intg/src/main/java/org/apache/atlas/model/discovery/AtlasSearchResult.java b/intg/src/main/java/org/apache/atlas/model/discovery/AtlasSearchResult.java
@@ -59,7 +59,7 @@ public class AtlasSearchResult implements Serializable {
     private Map<String, Object>            aggregations;
     private Map<String,Double>             searchScore;
 
-    private Map<String, SearchMetadata>   searchMetadata;
+    private Map<String, ElasticsearchMetadata>   searchMetadata;
 
 
 
@@ -156,15 +156,15 @@ public void setSearchScore(HashMap<String, Double> searchScore) {
 
     public void setNextMarker(String nextMarker) { this.nextMarker = nextMarker; }
 
-    public Map<String, SearchMetadata> getSearchMetadata() {
+    public Map<String, ElasticsearchMetadata> getSearchMetadata() {
         return searchMetadata;
     }
 
     public void addHighlights(String guid, Map<String, List<String>> highlights) {
         if(MapUtils.isEmpty(this.searchMetadata)) {
             this.searchMetadata = new HashMap<>();
         }
-        SearchMetadata v = this.searchMetadata.getOrDefault(guid, new SearchMetadata());
+        ElasticsearchMetadata v = this.searchMetadata.getOrDefault(guid, new ElasticsearchMetadata());
         v.addHighlights(highlights);
         this.searchMetadata.put(guid, v);
     }

diff --git a/...atlas/model/discovery/SearchMetadata.java → ...odel/discovery/ElasticsearchMetadata.java b/...atlas/model/discovery/SearchMetadata.java → ...odel/discovery/ElasticsearchMetadata.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class SearchMetadata {
+public class ElasticsearchMetadata {
 
     private Map<String, List<String>> highlights;