correct response title & resolve formatting issues

NationalSecurityAgency · Sep 19, 2023 · f424057 · f424057
1 parent feb95a3
commit f424057
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricSubplanResponse.java b/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricSubplanResponse.java
@@ -13,67 +13,67 @@
 import java.util.TreeMap;
 
 public class BaseQueryMetricSubplanResponse<T extends BaseQueryMetric> extends BaseResponse implements HtmlProvider {
-
+    
     private static final long serialVersionUID = 1L;
-    private static final String TITLE = "Query Metrics";
+    private static final String TITLE = "Query Subplans";
     private static final String EMPTY = "";
-    @XmlElementWrapper(name = "queryMetrics")
-    @XmlElement(name = "queryMetric")
+    @XmlElementWrapper(name = "querySubplans")
+    @XmlElement(name = "querySubplan")
     protected List<T> result = null;
     @XmlElement
     protected int numResults = 0;
     @XmlTransient
     private boolean administratorMode = false;
     @XmlTransient
     private boolean isGeoQuery = false;
-
+    
     private static String numToString(long number) {
         return (number == -1 || number == 0) ? "" : Long.toString(number);
     }
-
+    
     public List<T> getResult() {
         return result;
     }
-
+    
     public int getNumResults() {
         return numResults;
     }
-
+    
     public void setResult(List<T> result) {
         this.result = result;
         this.numResults = this.result.size();
     }
-
+    
     public void setNumResults(int numResults) {
         this.numResults = numResults;
     }
-
+    
     public boolean isAdministratorMode() {
         return administratorMode;
     }
-
+    
     public void setAdministratorMode(boolean administratorMode) {
         this.administratorMode = administratorMode;
     }
-
+    
     public boolean isGeoQuery() {
         return isGeoQuery;
     }
-
+    
     public void setGeoQuery(boolean geoQuery) {
         isGeoQuery = geoQuery;
     }
-
+    
     @Override
     public String getTitle() {
         return TITLE;
     }
-
+    
     @Override
     public String getPageHeader() {
         return getTitle();
     }
-
+    
     @Override
     public String getHeadContent() {
         if (isGeoQuery) {

diff --git a/service/src/main/java/datawave/microservice/querymetric/QueryMetricOperations.java b/service/src/main/java/datawave/microservice/querymetric/QueryMetricOperations.java
@@ -129,8 +129,9 @@ enum DEFAULT_DATETIME {
      */
     @Autowired
     public QueryMetricOperations(@Named("queryMetricCacheManager") CacheManager cacheManager, ShardTableQueryMetricHandler handler,
-                    QueryGeometryHandler geometryHandler, MarkingFunctions markingFunctions, BaseQueryMetricListResponseFactory queryMetricListResponseFactory, BaseQueryMetricSubplanResponseFactory queryMetricSubplanResponseFactory,
-                    MergeLockLifecycleListener mergeLock, MetricUpdateEntryProcessorFactory entryProcessorFactory, QueryMetricOperationsStats stats) {
+                    QueryGeometryHandler geometryHandler, MarkingFunctions markingFunctions, BaseQueryMetricListResponseFactory queryMetricListResponseFactory,
+                    BaseQueryMetricSubplanResponseFactory queryMetricSubplanResponseFactory, MergeLockLifecycleListener mergeLock,
+                    MetricUpdateEntryProcessorFactory entryProcessorFactory, QueryMetricOperationsStats stats) {
         this.handler = handler;
         this.geometryHandler = geometryHandler;
         this.cacheManager = cacheManager;
@@ -257,7 +258,7 @@ private void storeMetricUpdate(QueryMetricUpdateHolder metricUpdate) {
         }
         storeTimer.stop();
     }
-
+    
     List<BaseQueryMetric> getMetricList(String queryId, ProxiedUserDetails currentUser, String blacklistedFields) {
         List<BaseQueryMetric> metricList = new ArrayList<>();
         try {
@@ -300,7 +301,7 @@ List<BaseQueryMetric> getMetricList(String queryId, ProxiedUserDetails currentUs
         }
         return metricList;
     }
-
+    
     /**
      * Returns metrics for the current users queries that are identified by the id
      *

diff --git a/...c/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java b/...c/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java
@@ -93,7 +93,7 @@ public QueryGeometryHandler geometryHandler(QueryMetricHandlerProperties queryMe
     public BaseQueryMetricListResponseFactory queryMetricListResponseFactory() {
         return new QueryMetricListResponseFactory();
     }
-
+    
     @Bean
     public BaseQueryMetricSubplanResponseFactory queryMetricSubplanResponseFactory() {
         return new QueryMetricSubplanResponseFactory();

diff --git a/...java/datawave/microservice/querymetric/factory/BaseQueryMetricSubplanResponseFactory.java b/...java/datawave/microservice/querymetric/factory/BaseQueryMetricSubplanResponseFactory.java
@@ -3,6 +3,6 @@
 import datawave.microservice.querymetric.BaseQueryMetricSubplanResponse;
 
 public interface BaseQueryMetricSubplanResponseFactory<T extends BaseQueryMetricSubplanResponse> {
-
+    
     T createSubplanResponse();
-}
+}
diff --git a/...ain/java/datawave/microservice/querymetric/factory/QueryMetricSubplanResponseFactory.java b/...ain/java/datawave/microservice/querymetric/factory/QueryMetricSubplanResponseFactory.java
@@ -3,9 +3,9 @@
 import datawave.microservice.querymetric.BaseQueryMetricSubplanResponse;
 
 public class QueryMetricSubplanResponseFactory implements BaseQueryMetricSubplanResponseFactory {
-
+    
     @Override
     public BaseQueryMetricSubplanResponse createSubplanResponse() {
         return new BaseQueryMetricSubplanResponse();
     }
-}
+}