#91 Implemented support for highlights

Author: dclemenzi

gt-elasticsearch/src/main/java/mil/nga/giat/data/elasticsearch/ElasticFeatureReader.java

@@ -104,6 +104,7 @@ private String nextHit() {
         final ElasticHit hit = searchHitIterator.next();
         final SimpleFeatureType type = getFeatureType();
         final Map<String, Object> source = hit.getSource();
+        final Map<String, List<String>> highlights = hit.getHighlight();
 
         final Float score;
         final Float relativeScore;
@@ -120,6 +121,12 @@ private String nextHit() {
             final String sourceName = (String) descriptor.getUserData().get(FULL_NAME);
 
             List<Object> values = hit.field(sourceName);
+
+            if (values == null && highlights != null && highlights.containsKey(sourceName)) {
+                // read field from source
+                values = Collections.unmodifiableList(highlights.get(sourceName));
+            }
+
             if (values == null && source != null) {
                 // read field from source
                 values = parserUtil.readField(source, sourceName);

gt-elasticsearch/src/main/java/mil/nga/giat/data/elasticsearch/ElasticFeatureSource.java

@@ -6,6 +6,7 @@
 
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -210,6 +211,18 @@ private ElasticRequest prepareSearchRequest(Query query, boolean scroll) throws
             searchRequest.setSize(0);
         }
 
+        if (filterToElastic.gethighlights() != null) {
+            searchRequest.setHighlights(filterToElastic.gethighlights());
+
+            List<String> source = searchRequest.getSourceIncludes();
+            for (String key : filterToElastic.gethighlights().keySet()) {
+                if (source.contains(key))
+                {
+                    source.remove(key);
+                }
+            }
+        }
+
         return searchRequest;
     }
 

gt-elasticsearch/src/main/java/mil/nga/giat/data/elasticsearch/ElasticHit.java

@@ -30,6 +30,8 @@ public class ElasticHit {
 
     private Map<String,List<Object>> fields;
 
+    private Map<String,List<String>> highlight;
+
     public String getIndex() {
         return index;
     }
@@ -78,4 +80,11 @@ public List<Object> field(String name) {
         return this.fields != null ? this.fields.get(name) : null;
     }
 
+    public Map<String, List<String>> getHighlight() {
+        return highlight;
+    }
+
+    public void setHighlight(Map<String, List<String>> highlight) {
+        this.highlight = highlight;
+    }
 }

gt-elasticsearch/src/main/java/mil/nga/giat/data/elasticsearch/ElasticRequest.java

@@ -15,6 +15,8 @@ public class ElasticRequest {
 
     private Map<String,Map<String,Map<String,Object>>> aggregations;
 
+    private Map<String, Object> highlights;
+
     private Integer size;
 
     private Integer from;
@@ -49,6 +51,14 @@ public void setAggregations(Map<String,Map<String,Map<String,Object>>> aggregati
         this.aggregations = aggregations;
     }
 
+    public Map<String, Object> getHighlights() {
+        return highlights;
+    }
+
+    public void setHighlights(Map<String, Object> highlights) {
+        this.highlights = highlights;
+    }
+
     public Integer getSize() {
         return size;
     }