diff --git a/api/pom.xml b/api/pom.xml index 972aff58..0ab15fe8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,11 +4,11 @@ gov.nsa.datawave.microservice datawave-microservice-parent - 3.0.4 + 4.0.0-SNAPSHOT ../../../microservice-parent/pom.xml query-metric-api - 3.0.10-SNAPSHOT + 4.0.0-SNAPSHOT https://code.nsa.gov/datawave-query-metric-service scm:git:https://github.com/NationalSecurityAgency/datawave-query-metric-service.git @@ -19,15 +19,16 @@ http://webservice.datawave.nsa/v1 ${basedir}/spotbugs-exclude.xml - 3.0.1 - 3.0.0 + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT 3.12.0 1.9 - 6.9.3 + 7.0.0-SNAPSHOT 2.3.6 31.1-jre 2.12.5 2.3.1 + 1.0.0-SNAPSHOT 3.7.1 1.6.2 1.7.36 @@ -66,6 +67,17 @@ + + gov.nsa.datawave.microservice + query-api + ${version.microservice.query-api} + + + * + * + + + gov.nsa.datawave.webservices datawave-ws-client @@ -157,6 +169,10 @@ gov.nsa.datawave.microservice base-rest-responses + + gov.nsa.datawave.microservice + query-api + gov.nsa.datawave.webservices datawave-ws-client diff --git a/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetric.java b/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetric.java index ad1dac9c..976d1776 100644 --- a/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetric.java +++ b/api/src/main/java/datawave/microservice/querymetric/BaseQueryMetric.java @@ -34,8 +34,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import datawave.marking.MarkingFunctions; -import datawave.webservice.query.Query; -import datawave.webservice.query.QueryImpl.Parameter; +import datawave.microservice.query.Query; +import datawave.microservice.query.QueryImpl.Parameter; import datawave.webservice.query.exception.QueryException; import datawave.webservice.query.result.event.HasMarkings; import io.protostuff.Input; diff --git a/api/src/main/java/datawave/microservice/querymetric/QueryMetric.java b/api/src/main/java/datawave/microservice/querymetric/QueryMetric.java index 59133d8b..63cd79b6 100644 --- a/api/src/main/java/datawave/microservice/querymetric/QueryMetric.java +++ b/api/src/main/java/datawave/microservice/querymetric/QueryMetric.java @@ -24,8 +24,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.collect.Lists; -import datawave.webservice.query.Query; -import datawave.webservice.query.QueryImpl.Parameter; +import datawave.microservice.query.Query; +import datawave.microservice.query.QueryImpl.Parameter; import datawave.webservice.query.result.event.HasMarkings; import io.protostuff.Input; import io.protostuff.Message; diff --git a/api/src/main/java/datawave/microservice/querymetric/QueryMetricModelFormat.java b/api/src/main/java/datawave/microservice/querymetric/QueryMetricModelFormat.java index 6b42b631..d8ec3571 100644 --- a/api/src/main/java/datawave/microservice/querymetric/QueryMetricModelFormat.java +++ b/api/src/main/java/datawave/microservice/querymetric/QueryMetricModelFormat.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import datawave.webservice.query.QueryImpl; +import datawave.microservice.query.QueryImpl; public interface QueryMetricModelFormat { diff --git a/pom.xml b/pom.xml index 152118b4..dffe58d0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ gov.nsa.datawave.microservice datawave-microservice-parent - 3.0.4 + 4.0.0-SNAPSHOT ../../microservice-parent/pom.xml query-metric-parent - 3.0.10-SNAPSHOT + 4.0.0-SNAPSHOT pom https://code.nsa.gov/datawave-query-metric-service diff --git a/service/pom.xml b/service/pom.xml index e2405a94..5ce8ec7d 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -4,11 +4,11 @@ gov.nsa.datawave.microservice datawave-microservice-service-parent - 4.0.4 + 5.0.0-SNAPSHOT ../../../microservice-service-parent/pom.xml query-metric-service - 3.0.10-SNAPSHOT + 4.0.0-SNAPSHOT DATAWAVE Query Metric Microservice https://code.nsa.gov/datawave-query-metric-service @@ -20,19 +20,19 @@ ${basedir}/spotbugs-exclude.xml datawave.microservice.querymetric.QueryMetricService - 3.0.1 - 3.0.0 + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT 1.1.1 - 6.9.3 + 7.0.0-SNAPSHOT 2.2.3 - 3.0.1 - 3.0.0 - 3.0.0 - ${project.version} - 3.0.0 - 2.0.0 - 2.0.0 - 2.0.2 + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT 3.7.1 2.0.2 4.3.1 @@ -89,6 +89,10 @@ slf4j-reload4j org.slf4j + + reload4j + ch.qos.reload4j + @@ -237,6 +241,14 @@ avro org.apache.avro + + reload4j + ch.qos.reload4j + + + avro + org.apache.avro + @@ -280,6 +292,10 @@ zookeeper ${version.zookeeper} + + * + ch.qos.logback + slf4j-log4j12 org.slf4j diff --git a/service/src/main/java/datawave/microservice/querymetric/config/AccumuloConfiguration.java b/service/src/main/java/datawave/microservice/querymetric/config/AccumuloConfiguration.java index 59ddc874..6cbe5551 100644 --- a/service/src/main/java/datawave/microservice/querymetric/config/AccumuloConfiguration.java +++ b/service/src/main/java/datawave/microservice/querymetric/config/AccumuloConfiguration.java @@ -8,11 +8,11 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; +import datawave.core.common.connection.AccumuloClientPool; +import datawave.core.common.connection.AccumuloClientPoolFactory; import datawave.microservice.config.accumulo.AccumuloProperties; import datawave.microservice.config.cluster.ClusterProperties; import datawave.microservice.querymetric.factory.WrappedAccumuloClientPoolFactory; -import datawave.webservice.common.connection.AccumuloClientPool; -import datawave.webservice.common.connection.AccumuloClientPoolFactory; @Configuration @EnableConfigurationProperties({AccumuloConfiguration.WarehouseClusterProperties.class}) 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 99584045..69d2d951 100644 --- a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java +++ b/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerConfiguration.java @@ -29,6 +29,8 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; import com.github.benmanes.caffeine.cache.CaffeineSpec; +import datawave.core.common.connection.AccumuloClientPool; +import datawave.core.query.result.event.DefaultResponseObjectFactory; import datawave.marking.MarkingFunctions; import datawave.microservice.http.converter.html.BannerProvider; import datawave.microservice.querymetric.BaseQueryMetric; @@ -55,8 +57,6 @@ import datawave.query.util.DateIndexHelperFactory; import datawave.query.util.TypeMetadataHelper; import datawave.security.authorization.JWTTokenHandler; -import datawave.webservice.common.connection.AccumuloClientPool; -import datawave.webservice.query.result.event.DefaultResponseObjectFactory; import datawave.webservice.query.result.event.ResponseObjectFactory; @Configuration diff --git a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java b/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java index 482575fe..6c7ca62e 100644 --- a/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java +++ b/service/src/main/java/datawave/microservice/querymetric/config/QueryMetricHandlerProperties.java @@ -76,9 +76,9 @@ public class QueryMetricHandlerProperties { protected boolean useRemoteQuery = true; protected long remoteAuthTimeout = 1L; - protected TimeUnit remoteAuthTimeUnit = TimeUnit.MINUTES; + protected TimeUnit remoteAuthTimeoutUnit = TimeUnit.MINUTES; protected long remoteQueryTimeout = 1L; - protected TimeUnit remoteQueryTimeUnit = TimeUnit.MINUTES; + protected TimeUnit remoteQueryTimeoutUnit = TimeUnit.MINUTES; protected String npeOuEntries; protected String subjectDnPattern; @@ -519,19 +519,19 @@ public long getRemoteAuthTimeout() { } public long getRemoteAuthTimeoutMillis() { - return remoteAuthTimeUnit.toMillis(remoteAuthTimeout); + return remoteAuthTimeoutUnit.toMillis(remoteAuthTimeout); } public void setRemoteAuthTimeout(long remoteAuthTimeout) { this.remoteAuthTimeout = remoteAuthTimeout; } - public TimeUnit getRemoteAuthTimeUnit() { - return remoteAuthTimeUnit; + public TimeUnit getRemoteAuthTimeoutUnit() { + return remoteAuthTimeoutUnit; } - public void setRemoteAuthTimeUnit(TimeUnit remoteAuthTimeUnit) { - this.remoteAuthTimeUnit = remoteAuthTimeUnit; + public void setRemoteAuthTimeoutUnit(TimeUnit remoteAuthTimeoutUnit) { + this.remoteAuthTimeoutUnit = remoteAuthTimeoutUnit; } public long getRemoteQueryTimeout() { @@ -539,19 +539,19 @@ public long getRemoteQueryTimeout() { } public long getRemoteQueryTimeoutMillis() { - return remoteQueryTimeUnit.toMillis(remoteQueryTimeout); + return remoteQueryTimeoutUnit.toMillis(remoteQueryTimeout); } public void setRemoteQueryTimeout(long remoteQueryTimeout) { this.remoteQueryTimeout = remoteQueryTimeout; } - public TimeUnit getRemoteQueryTimeUnit() { - return remoteQueryTimeUnit; + public TimeUnit getRemoteQueryTimeoutUnit() { + return remoteQueryTimeoutUnit; } - public void setRemoteQueryTimeUnit(TimeUnit remoteQueryTimeUnit) { - this.remoteQueryTimeUnit = remoteQueryTimeUnit; + public void setRemoteQueryTimeoutUnit(TimeUnit remoteQueryTimeoutUnit) { + this.remoteQueryTimeoutUnit = remoteQueryTimeoutUnit; } public String getNpeOuEntries() { diff --git a/service/src/main/java/datawave/microservice/querymetric/factory/WrappedAccumuloClientPoolFactory.java b/service/src/main/java/datawave/microservice/querymetric/factory/WrappedAccumuloClientPoolFactory.java index 7d1ce754..5c17a428 100644 --- a/service/src/main/java/datawave/microservice/querymetric/factory/WrappedAccumuloClientPoolFactory.java +++ b/service/src/main/java/datawave/microservice/querymetric/factory/WrappedAccumuloClientPoolFactory.java @@ -8,7 +8,7 @@ import datawave.accumulo.inmemory.InMemoryAccumuloClient; import datawave.accumulo.inmemory.InMemoryInstance; -import datawave.webservice.common.connection.AccumuloClientPoolFactory; +import datawave.core.common.connection.AccumuloClientPoolFactory; import datawave.webservice.common.connection.WrappedAccumuloClient; /* diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/AccumuloRecordWriter.java b/service/src/main/java/datawave/microservice/querymetric/handler/AccumuloRecordWriter.java index bff45734..4aad30f8 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/AccumuloRecordWriter.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/AccumuloRecordWriter.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import datawave.webservice.common.connection.AccumuloClientPool; +import datawave.core.common.connection.AccumuloClientPool; public class AccumuloRecordWriter extends RecordWriter { private MultiTableBatchWriter mtbw = null; diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/ContentQueryMetricsIngestHelper.java b/service/src/main/java/datawave/microservice/querymetric/handler/ContentQueryMetricsIngestHelper.java index 27225a72..36bbd512 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/ContentQueryMetricsIngestHelper.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/ContentQueryMetricsIngestHelper.java @@ -16,14 +16,15 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import datawave.core.query.util.QueryUtil; import datawave.ingest.data.config.NormalizedContentInterface; import datawave.ingest.data.config.NormalizedFieldAndValue; import datawave.ingest.data.config.ingest.CSVIngestHelper; import datawave.ingest.data.config.ingest.TermFrequencyIngestHelperInterface; +import datawave.microservice.query.QueryImpl; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.BaseQueryMetric.PageMetric; import datawave.microservice.querymetric.BaseQueryMetric.Prediction; -import datawave.webservice.query.util.QueryUtil; public class ContentQueryMetricsIngestHelper extends CSVIngestHelper implements TermFrequencyIngestHelperInterface { diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/LocalShardTableQueryMetricHandler.java b/service/src/main/java/datawave/microservice/querymetric/handler/LocalShardTableQueryMetricHandler.java index f68cb7b5..2e8a8138 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/LocalShardTableQueryMetricHandler.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/LocalShardTableQueryMetricHandler.java @@ -22,7 +22,12 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; +import datawave.core.common.connection.AccumuloClientPool; +import datawave.core.common.connection.AccumuloConnectionFactory; +import datawave.core.query.logic.QueryLogic; +import datawave.core.query.logic.QueryLogicTransformer; import datawave.marking.MarkingFunctions; +import datawave.microservice.query.Query; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.QueryMetricFactory; import datawave.microservice.querymetric.config.QueryMetricHandlerProperties; @@ -32,11 +37,6 @@ import datawave.security.authorization.DatawavePrincipal; import datawave.security.authorization.DatawaveUser; import datawave.security.authorization.SubjectIssuerDNPair; -import datawave.webservice.common.connection.AccumuloClientPool; -import datawave.webservice.common.connection.AccumuloConnectionFactory; -import datawave.webservice.query.Query; -import datawave.webservice.query.logic.QueryLogic; -import datawave.webservice.query.logic.QueryLogicTransformer; import datawave.webservice.query.runner.RunningQuery; import datawave.webservice.result.BaseQueryResponse; diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/QueryMetricHandler.java b/service/src/main/java/datawave/microservice/querymetric/handler/QueryMetricHandler.java index 976d1818..85e1fb21 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/QueryMetricHandler.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/QueryMetricHandler.java @@ -5,10 +5,10 @@ import java.util.Map; import datawave.microservice.authorization.user.DatawaveUserDetails; +import datawave.microservice.query.Query; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.QueryMetricType; import datawave.microservice.querymetric.QueryMetricsSummaryResponse; -import datawave.webservice.query.Query; public interface QueryMetricHandler { diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/RemoteShardTableQueryMetricHandler.java b/service/src/main/java/datawave/microservice/querymetric/handler/RemoteShardTableQueryMetricHandler.java index 6145af2d..1203d53b 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/RemoteShardTableQueryMetricHandler.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/RemoteShardTableQueryMetricHandler.java @@ -14,8 +14,12 @@ import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; +import datawave.core.common.connection.AccumuloClientPool; import datawave.marking.MarkingFunctions; import datawave.microservice.authorization.user.DatawaveUserDetails; +import datawave.microservice.query.DefaultQueryParameters; +import datawave.microservice.query.Query; +import datawave.microservice.query.QueryParameters; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.QueryMetricFactory; import datawave.microservice.querymetric.config.QueryMetricHandlerProperties; @@ -24,10 +28,6 @@ import datawave.query.language.parser.jexl.LuceneToJexlQueryParser; import datawave.security.authorization.DatawaveUser; import datawave.security.authorization.JWTTokenHandler; -import datawave.webservice.common.connection.AccumuloClientPool; -import datawave.webservice.query.Query; -import datawave.webservice.query.QueryParameters; -import datawave.webservice.query.QueryParametersImpl; import datawave.webservice.query.result.event.ResponseObjectFactory; import datawave.webservice.result.BaseQueryResponse; @@ -79,9 +79,9 @@ protected String createBearerHeader() { protected BaseQueryResponse createAndNext(Query query) throws Exception { String bearerHeader = createBearerHeader(); - String beginDate = QueryParametersImpl.formatDate(query.getBeginDate()); - String endDate = QueryParametersImpl.formatDate(query.getEndDate()); - String expirationDate = QueryParametersImpl.formatDate(query.getExpirationDate()); + String beginDate = DefaultQueryParameters.formatDate(query.getBeginDate()); + String endDate = DefaultQueryParameters.formatDate(query.getEndDate()); + String expirationDate = DefaultQueryParameters.formatDate(query.getExpirationDate()); Collection userAuths = new ArrayList<>(userDetails.getPrimaryUser().getAuths()); if (clientAuthorizations != null) { @@ -106,6 +106,7 @@ protected BaseQueryResponse createAndNext(Query query) throws Exception { .queryParam(QueryParameters.QUERY_PARAMS, query.getParameters().stream().map(p -> String.join(":", p.getParameterName(), p.getParameterValue())).collect(Collectors.joining(";"))) .build()) .header("Authorization", bearerHeader) + .header("Pool", queryMetricHandlerProperties.getQueryPool()) .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) .retrieve() .bodyToMono(responseObjectFactory.getEventQueryResponse().getClass()) diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/ShardTableQueryMetricHandler.java b/service/src/main/java/datawave/microservice/querymetric/handler/ShardTableQueryMetricHandler.java index 6a933700..ae1d7bca 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/ShardTableQueryMetricHandler.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/ShardTableQueryMetricHandler.java @@ -46,6 +46,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import datawave.core.common.connection.AccumuloClientPool; +import datawave.core.query.util.QueryUtil; import datawave.data.hash.UID; import datawave.data.hash.UIDBuilder; import datawave.ingest.config.RawRecordContainerImpl; @@ -60,6 +62,8 @@ import datawave.ingest.table.config.TableConfigHelper; import datawave.marking.MarkingFunctions; import datawave.microservice.authorization.user.DatawaveUserDetails; +import datawave.microservice.query.Query; +import datawave.microservice.query.QueryImpl; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.BaseQueryMetric.Lifecycle; import datawave.microservice.querymetric.BaseQueryMetric.PageMetric; @@ -75,13 +79,9 @@ import datawave.query.language.parser.jexl.LuceneToJexlQueryParser; import datawave.security.authorization.DatawaveUser; import datawave.security.util.WSAuthorizationsUtil; -import datawave.webservice.common.connection.AccumuloClientPool; -import datawave.webservice.query.Query; -import datawave.webservice.query.QueryImpl; import datawave.webservice.query.exception.QueryExceptionType; import datawave.webservice.query.result.event.EventBase; import datawave.webservice.query.result.event.FieldBase; -import datawave.webservice.query.util.QueryUtil; import datawave.webservice.result.BaseQueryResponse; import datawave.webservice.result.EventQueryResponseBase; diff --git a/service/src/main/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandler.java b/service/src/main/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandler.java index 727e8b19..e575ce82 100644 --- a/service/src/main/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandler.java +++ b/service/src/main/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandler.java @@ -12,6 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import datawave.microservice.query.QueryImpl; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.QueryGeometry; import datawave.microservice.querymetric.QueryGeometryResponse; @@ -21,7 +22,6 @@ import datawave.query.jexl.visitors.GeoFeatureVisitor; import datawave.query.language.parser.ParseException; import datawave.query.language.parser.jexl.LuceneToJexlQueryParser; -import datawave.webservice.query.QueryImpl; /** * This class is used to extract query geometries from the query metrics in an effort to provide those geometries for subsequent display to the user. diff --git a/service/src/test/java/datawave/microservice/querymetric/QueryMetricTestBase.java b/service/src/test/java/datawave/microservice/querymetric/QueryMetricTestBase.java index 18aa7516..7e752f47 100644 --- a/service/src/test/java/datawave/microservice/querymetric/QueryMetricTestBase.java +++ b/service/src/test/java/datawave/microservice/querymetric/QueryMetricTestBase.java @@ -63,6 +63,7 @@ import com.hazelcast.map.IMap; import com.hazelcast.spring.cache.HazelcastCacheManager; +import datawave.core.common.connection.AccumuloClientPool; import datawave.ingest.protobuf.Uid; import datawave.marking.MarkingFunctions; import datawave.microservice.authorization.preauth.ProxiedEntityX509Filter; @@ -77,7 +78,6 @@ import datawave.security.authorization.DatawaveUser; import datawave.security.authorization.JWTTokenHandler; import datawave.security.authorization.SubjectIssuerDNPair; -import datawave.webservice.common.connection.AccumuloClientPool; import datawave.webservice.query.result.event.DefaultEvent; import datawave.webservice.query.result.event.DefaultField; import datawave.webservice.query.result.event.EventBase; @@ -389,7 +389,7 @@ public static void metricAssertEquals(String message, BaseQueryMetric m1, BaseQu } assertTrue(assertObjectsEqual(m1.getQueryId(), m2.getQueryId()), message + "queryId"); assertTrue(assertObjectsEqual(m1.getQueryType(), m2.getQueryType()), message + "queryType"); - assertTrue(assertObjectsEqual(m1.getQueryAuthorizations(), m2.getQueryAuthorizations()), message + "queryAuthorizatio1ns"); + assertTrue(assertObjectsEqual(m1.getQueryAuthorizations(), m2.getQueryAuthorizations()), message + "queryAuthorizations"); assertTrue(assertObjectsEqual(m1.getColumnVisibility(), m2.getColumnVisibility()), message + "columnVisibility"); assertEquals(m1.getMarkings(), m2.getMarkings(), message + "markings"); assertTrue(assertObjectsEqual(m1.getBeginDate(), m2.getBeginDate()), message + "beginDate"); diff --git a/service/src/test/java/datawave/microservice/querymetric/config/AlternateQueryMetricConfiguration.java b/service/src/test/java/datawave/microservice/querymetric/config/AlternateQueryMetricConfiguration.java index 5296b7b3..b94aa90a 100644 --- a/service/src/test/java/datawave/microservice/querymetric/config/AlternateQueryMetricConfiguration.java +++ b/service/src/test/java/datawave/microservice/querymetric/config/AlternateQueryMetricConfiguration.java @@ -10,6 +10,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import datawave.core.common.connection.AccumuloClientPool; import datawave.marking.MarkingFunctions; import datawave.microservice.querymetric.BaseQueryMetric; import datawave.microservice.querymetric.QueryMetricFactory; @@ -18,7 +19,6 @@ import datawave.microservice.querymetric.handler.ShardTableQueryMetricHandler; import datawave.microservice.security.util.DnUtils; import datawave.query.language.parser.jexl.LuceneToJexlQueryParser; -import datawave.webservice.common.connection.AccumuloClientPool; @ImportAutoConfiguration({RefreshAutoConfiguration.class}) @AutoConfigureCache(cacheProvider = CacheType.HAZELCAST) diff --git a/service/src/test/java/datawave/microservice/querymetric/config/AlternateShardTableQueryMetricHandler.java b/service/src/test/java/datawave/microservice/querymetric/config/AlternateShardTableQueryMetricHandler.java index df869773..bd1e89ff 100644 --- a/service/src/test/java/datawave/microservice/querymetric/config/AlternateShardTableQueryMetricHandler.java +++ b/service/src/test/java/datawave/microservice/querymetric/config/AlternateShardTableQueryMetricHandler.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Qualifier; +import datawave.core.common.connection.AccumuloClientPool; import datawave.marking.MarkingFunctions; import datawave.microservice.querymetric.QueryMetricFactory; import datawave.microservice.querymetric.factory.QueryMetricQueryLogicFactory; @@ -13,7 +14,6 @@ import datawave.microservice.querymetric.handler.QueryMetricCombiner; import datawave.microservice.security.util.DnUtils; import datawave.query.language.parser.jexl.LuceneToJexlQueryParser; -import datawave.webservice.common.connection.AccumuloClientPool; import datawave.webservice.query.result.event.EventBase; import datawave.webservice.query.result.event.FieldBase; diff --git a/service/src/test/java/datawave/microservice/querymetric/config/QueryMetricTestConfiguration.java b/service/src/test/java/datawave/microservice/querymetric/config/QueryMetricTestConfiguration.java index 1dd7d2ca..332dd37f 100644 --- a/service/src/test/java/datawave/microservice/querymetric/config/QueryMetricTestConfiguration.java +++ b/service/src/test/java/datawave/microservice/querymetric/config/QueryMetricTestConfiguration.java @@ -18,9 +18,9 @@ import datawave.accumulo.inmemory.InMemoryAccumuloClient; import datawave.accumulo.inmemory.InMemoryInstance; +import datawave.core.common.connection.AccumuloClientPool; +import datawave.core.common.connection.AccumuloClientPoolFactory; import datawave.microservice.config.accumulo.AccumuloProperties; -import datawave.webservice.common.connection.AccumuloClientPool; -import datawave.webservice.common.connection.AccumuloClientPoolFactory; @ImportAutoConfiguration({RefreshAutoConfiguration.class}) @AutoConfigureCache(cacheProvider = CacheType.HAZELCAST) diff --git a/service/src/test/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandlerTest.java b/service/src/test/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandlerTest.java index a87e5d8b..de5aa19d 100644 --- a/service/src/test/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandlerTest.java +++ b/service/src/test/java/datawave/microservice/querymetric/handler/SimpleQueryGeometryHandlerTest.java @@ -12,12 +12,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import datawave.microservice.query.QueryImpl; import datawave.microservice.querymetric.QueryGeometry; import datawave.microservice.querymetric.QueryGeometryResponse; import datawave.microservice.querymetric.QueryMetric; import datawave.microservice.querymetric.config.QueryMetricHandlerProperties; import datawave.microservice.querymetric.factory.QueryMetricResponseFactory; -import datawave.webservice.query.QueryImpl; import datawave.webservice.query.exception.QueryExceptionType; public class SimpleQueryGeometryHandlerTest {