From f4240578a99f7bbf434fce08347e69493176166f Mon Sep 17 00:00:00 2001 From: foster33 Date: Tue, 19 Sep 2023 02:22:50 -0400 Subject: [PATCH] correct response title & resolve formatting issues --- .../BaseQueryMetricSubplanResponse.java | 32 +++++++++---------- .../querymetric/QueryMetricOperations.java | 9 +++--- .../QueryMetricHandlerConfiguration.java | 2 +- ...BaseQueryMetricSubplanResponseFactory.java | 4 +-- .../QueryMetricSubplanResponseFactory.java | 4 +-- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricSubplanResponse.java b/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricSubplanResponse.java index a5b8adcc..ae383494 100644 --- a/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricSubplanResponse.java +++ b/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetricSubplanResponse.java @@ -13,12 +13,12 @@ import java.util.TreeMap; public class BaseQueryMetricSubplanResponse 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 result = null; @XmlElement protected int numResults = 0; @@ -26,54 +26,54 @@ public class BaseQueryMetricSubplanResponse extends B 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 getResult() { return result; } - + public int getNumResults() { return numResults; } - + public void setResult(List 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 index 2d641245..e7e9651b 100644 --- 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 getMetricList(String queryId, ProxiedUserDetails currentUser, String blacklistedFields) { List metricList = new ArrayList<>(); try { @@ -300,7 +301,7 @@ List getMetricList(String queryId, ProxiedUserDetails currentUs } return metricList; } - + /** * Returns metrics for the current users queries that are identified by the id * diff --git a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java b/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java index b6f99edd..0894e9d1 100644 --- a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java +++ b/service/src/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/service/src/main/java/datawave/microservice/querymetric/factory/BaseQueryMetricSubplanResponseFactory.java b/service/src/main/java/datawave/microservice/querymetric/factory/BaseQueryMetricSubplanResponseFactory.java index 5d85ab60..e5f41ceb 100644 --- a/service/src/main/java/datawave/microservice/querymetric/factory/BaseQueryMetricSubplanResponseFactory.java +++ b/service/src/main/java/datawave/microservice/querymetric/factory/BaseQueryMetricSubplanResponseFactory.java @@ -3,6 +3,6 @@ import datawave.microservice.querymetric.BaseQueryMetricSubplanResponse; public interface BaseQueryMetricSubplanResponseFactory { - + T createSubplanResponse(); -} \ No newline at end of file +} diff --git a/service/src/main/java/datawave/microservice/querymetric/factory/QueryMetricSubplanResponseFactory.java b/service/src/main/java/datawave/microservice/querymetric/factory/QueryMetricSubplanResponseFactory.java index 97f9e0c8..948e0ca9 100644 --- a/service/src/main/java/datawave/microservice/querymetric/factory/QueryMetricSubplanResponseFactory.java +++ b/service/src/main/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(); } -} \ No newline at end of file +}