Updated to use jexl3

api/src/main/java/datawave/microservice/querymetric/BaseQueryMetric.java

@@ -617,7 +617,7 @@ public int getFieldNumber(String name) {
     @XmlElement
     protected String queryId = null;
     @XmlElement
-    protected long setupTime = 0;
+    protected long setupTime = -1;
     @XmlElement
     protected String query = null;
     @XmlElement

api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricListResponse.java

@@ -3,7 +3,9 @@
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.TreeMap;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -13,6 +15,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import datawave.microservice.querymetric.BaseQueryMetric.PageMetric;
 import datawave.webservice.HtmlProvider;
 import datawave.webservice.result.BaseResponse;
@@ -27,10 +31,27 @@ public abstract class BaseQueryMetricListResponse<T extends BaseQueryMetric> ext
     protected List<T> result = null;
     @XmlElement
     protected int numResults = 0;
+    @XmlElement
+    protected boolean isGeoQuery = false;
     @XmlTransient
     private boolean administratorMode = false;
-    @XmlTransient
-    private boolean isGeoQuery = false;
+    private String JQUERY_INCLUDES;
+    protected String BASE_URL = "/DataWave/Query/Metrics";
+
+    public BaseQueryMetricListResponse() {
+        setHtmlIncludePaths(new HashMap<>());
+    }
+
+    public void setHtmlIncludePaths(Map<String,String> pathMap) {
+        // @formatter:off
+        JQUERY_INCLUDES =
+                "<script type='text/javascript' src='" + pathMap.getOrDefault("jquery", "") + "/jquery.min.js'></script>\n";
+        // @formatter:on
+    }
+
+    public void setBaseUrl(String baseUrl) {
+        this.BASE_URL = baseUrl;
+    }
 
     private static String numToString(long number) {
         return (number == -1 || number == 0) ? "" : Long.toString(number);
@@ -69,21 +90,27 @@ public void setGeoQuery(boolean geoQuery) {
         isGeoQuery = geoQuery;
     }
 
+    @JsonIgnore
+    @XmlTransient
     @Override
     public String getTitle() {
         return TITLE;
     }
 
+    @JsonIgnore
+    @XmlTransient
     @Override
     public String getPageHeader() {
         return getTitle();
     }
 
+    @JsonIgnore
+    @XmlTransient
     @Override
     public String getHeadContent() {
         if (isGeoQuery) {
             // @formatter:off
-            return "<script type='text/javascript' src='/jquery.min.js'></script>" +
+            return JQUERY_INCLUDES +
                     "<script type='text/javascript'>" +
                     "$(document).ready(function() {" +
                     "   var currentUrl = window.location.href.replace(/\\/+$/, '');" +
@@ -97,7 +124,9 @@ public String getHeadContent() {
             return EMPTY;
         }
     }
-
+
+    @JsonIgnore
+    @XmlTransient
     @Override
     public String getMainContent() {
         StringBuilder builder = new StringBuilder();
@@ -155,7 +184,7 @@ public String getMainContent() {
             builder.append("<td style=\"word-wrap: break-word; min-width:300px !important;\">").append(queryAuths).append("</td>");
 
             builder.append("<td>").append(metric.getHost()).append("</td>");
-            builder.append("<td>").append(metric.getSetupTime()).append("</td>");
+            builder.append("<td>").append(numToString(metric.getSetupTime())).append("</td>");
             builder.append("<td>").append(numToString(metric.getCreateCallTime())).append("</td>\n");
             builder.append("<td>").append(metric.getNumPages()).append("</td>");
             builder.append("<td>").append(metric.getNumResults()).append("</td>");
@@ -188,5 +217,4 @@ public String getMainContent() {
 
         return builder.toString();
     }
-
 }

api/src/main/java/datawave/microservice/querymetric/CacheStats.java

@@ -15,7 +15,7 @@
 
 @XmlRootElement(name = "CacheStats")
 @XmlAccessorType(XmlAccessType.NONE)
-@XmlType(propOrder = {"serviceStats", "incomingQueryMetrics", "lastWrittenQueryMetrics"})
+@XmlType(propOrder = {"serviceStats", "incomingQueryMetrics"})
 public class CacheStats implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -34,10 +34,6 @@ public class CacheStats implements Serializable {
     @XmlJavaTypeAdapter(StringMapAdapter.class)
     private Map<String,String> incomingQueryMetrics = new HashMap<>();
 
-    @XmlElement(name = "lastWrittenQueryMetrics")
-    @XmlJavaTypeAdapter(StringMapAdapter.class)
-    private Map<String,String> lastWrittenQueryMetrics = new HashMap<>();
-
     public CacheStats() {
 
     }
@@ -66,14 +62,6 @@ public Map<String,String> getIncomingQueryMetrics() {
         return incomingQueryMetrics;
     }
 
-    public void setLastWrittenQueryMetrics(Map<String,String> stats) {
-        this.lastWrittenQueryMetrics = stats;
-    }
-
-    public Map<String,String> getLastWrittenQueryMetrics() {
-        return lastWrittenQueryMetrics;
-    }
-
     public void setServiceStats(Map<String,String> serviceStats) {
         this.serviceStats = serviceStats;
     }
@@ -90,11 +78,11 @@ public boolean equals(Object o) {
             return false;
         CacheStats that = (CacheStats) o;
         return host.equals(that.host) && memberUuid.equals(that.memberUuid) && incomingQueryMetrics.equals(that.incomingQueryMetrics)
-                        && lastWrittenQueryMetrics.equals(that.lastWrittenQueryMetrics) && serviceStats.equals(that.serviceStats);
+                        && serviceStats.equals(that.serviceStats);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(host, memberUuid, incomingQueryMetrics, lastWrittenQueryMetrics, serviceStats);
+        return Objects.hash(host, memberUuid, incomingQueryMetrics, serviceStats);
     }
 }

api/src/main/java/datawave/microservice/querymetric/QueryGeometry.java

@@ -0,0 +1,73 @@
+package datawave.microservice.querymetric;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.commons.text.StringEscapeUtils;
+
+/**
+ * This represents a datawave geo function and the associated query geometry in GeoJSON format.
+ */
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
+public class QueryGeometry implements Serializable {
+
+    @XmlElement
+    private String function;
+    @XmlElement
+    private String geometry;
+
+    public QueryGeometry() {
+
+    }
+
+    public QueryGeometry(String function, String geometry) {
+        this.function = function;
+        this.geometry = geometry;
+    }
+
+    public String getFunction() {
+        return function;
+    }
+
+    public void setFunction(String function) {
+        this.function = function;
+    }
+
+    public String getGeometry() {
+        return geometry;
+    }
+
+    public void setGeometry(String geometry) {
+        this.geometry = geometry;
+    }
+
+    public String toGeoJsonFeature() {
+        return "{'type': 'Feature', 'properties': {'function': \"" + StringEscapeUtils.escapeHtml4(function) + "\"},'geometry': " + geometry + "}";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof QueryGeometry))
+            return false;
+
+        QueryGeometry that = (QueryGeometry) o;
+
+        if (function != null ? !function.equals(that.function) : that.function != null)
+            return false;
+        return geometry != null ? geometry.equals(that.geometry) : that.geometry == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = function != null ? function.hashCode() : 0;
+        result = 31 * result + (geometry != null ? geometry.hashCode() : 0);
+        return result;
+    }
+}

api/src/main/java/datawave/microservice/querymetric/QueryGeometryResponse.java

@@ -0,0 +1,134 @@
+package datawave.microservice.querymetric;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.xml.bind.annotation.XmlAccessOrder;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorOrder;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import datawave.webservice.HtmlProvider;
+import datawave.webservice.result.BaseResponse;
+
+/**
+ * This response includes information about what query geometries were present in a given query. The geometries are displayed on a map using leaflet.
+ */
+@XmlRootElement(name = "QueryGeometry")
+@XmlAccessorType(XmlAccessType.NONE)
+@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
+public class QueryGeometryResponse extends BaseResponse implements HtmlProvider {
+
+    private static final long serialVersionUID = 1L;
+
+    private static final String TITLE = "Query Geometry";
+
+    private String LEAFLET_INCLUDES;
+    private String JQUERY_INCLUDES;
+    private String MAP_INCLUDES;
+
+    public QueryGeometryResponse() {
+        this(null, null);
+    }
+
+    public QueryGeometryResponse(String queryId, String basemaps) {
+        this.queryId = queryId;
+        this.basemaps = basemaps;
+        setHtmlIncludePaths(new HashMap<>());
+    }
+
+    public void setHtmlIncludePaths(Map<String,String> pathMap) {
+        // @formatter:off
+        LEAFLET_INCLUDES =
+                "<link rel='stylesheet' type='text/css' href='" + pathMap.getOrDefault("leaflet", "") + "/leaflet.css' />\n" +
+                        "<script type='text/javascript' src='" + pathMap.getOrDefault("leaflet", "") + "/leaflet.js'></script>\n";
+        JQUERY_INCLUDES =
+                "<script type='text/javascript' src='" + pathMap.getOrDefault("jquery", "") + "/jquery.min.js'></script>\n";
+        MAP_INCLUDES =
+                "<link rel='stylesheet' type='text/css' href='" + pathMap.getOrDefault("css", "") + "/queryMap.css' />\n" +
+                        "<script type='text/javascript' src='" + pathMap.getOrDefault("js", "") + "/queryMap.js'></script>";
+        // @formatter:on
+    }
+
+    @XmlElement(name = "queryId", nillable = true)
+    protected String queryId = null;
+
+    @JsonIgnore
+    @XmlTransient
+    protected String basemaps = null;
+
+    @XmlElementWrapper(name = "features")
+    @XmlElement(name = "feature")
+    protected List<QueryGeometry> result = null;
+
+    @JsonIgnore
+    @XmlTransient
+    @Override
+    public String getTitle() {
+        if (queryId != null)
+            return TITLE + " - " + queryId;
+        return TITLE;
+    }
+
+    @JsonIgnore
+    @XmlTransient
+    @Override
+    public String getHeadContent() {
+        String basemapData = "<script type='text/javascript'>var basemaps = " + basemaps + ";</script>\n";
+        String featureData = "<script type='text/javascript'>var features = " + toGeoJsonFeatures() + ";</script>\n";
+        return String.join("\n", featureData, JQUERY_INCLUDES, LEAFLET_INCLUDES, basemapData, MAP_INCLUDES);
+    }
+
+    @JsonIgnore
+    @XmlTransient
+    @Override
+    public String getPageHeader() {
+        return getTitle();
+    }
+
+    @JsonIgnore
+    @XmlTransient
+    @Override
+    public String getMainContent() {
+        return "<div align='center'><div id='map' style='height: calc(100% - 85px); width: 100%; position: fixed; top: 86px; left: 0px;'></div></div>";
+    }
+
+    private String toGeoJsonFeatures() {
+        if (!this.result.isEmpty())
+            return "[ " + this.result.stream().map(QueryGeometry::toGeoJsonFeature).collect(Collectors.joining(", ")) + " ]";
+        else
+            return "undefined";
+    }
+
+    public String getQueryId() {
+        return queryId;
+    }
+
+    public void setQueryId(String queryId) {
+        this.queryId = queryId;
+    }
+
+    public List<QueryGeometry> getResult() {
+        return result;
+    }
+
+    public void setResult(List<QueryGeometry> result) {
+        this.result = result;
+    }
+
+    public String getBasemaps() {
+        return basemaps;
+    }
+
+    public void setBasemaps(String basemaps) {
+        this.basemaps = basemaps;
+    }
+}