#4484 Change selection handling to use fully qualified keys

Author: stroomdev66

settings.gradle

@@ -224,7 +224,6 @@ include 'stroom-query:stroom-query-api'
 include 'stroom-query:stroom-query-common'
 include 'stroom-query:stroom-query-impl'
 include 'stroom-query:stroom-query-language'
-include 'stroom-query:stroom-query-language-api'
 
 // State store
 include 'stroom-state:stroom-state-impl'

stroom-activity/stroom-activity-impl-db/build.gradle

@@ -8,7 +8,6 @@ dependencies {
     implementation project(':stroom-core-shared')
     implementation project(':stroom-db-util')
     implementation project(':stroom-query:stroom-query-api')
-    implementation project(':stroom-query:stroom-query-language-api')
     implementation project(':stroom-query:stroom-query-common')
     implementation project(':stroom-util')
     implementation project(':stroom-util-shared')

stroom-activity/stroom-activity-impl/build.gradle

@@ -6,7 +6,6 @@ dependencies {
     implementation project(':stroom-event-logging:stroom-event-logging-api')
     implementation project(':stroom-event-logging-rs:stroom-event-logging-rs-api')
     implementation project(':stroom-query:stroom-query-api')
-    implementation project(':stroom-query:stroom-query-language-api')
     implementation project(':stroom-query:stroom-query-common')
     implementation project(':stroom-security:stroom-security-api')
     implementation project(':stroom-util-shared')

stroom-activity/stroom-activity-impl/src/main/java/stroom/activity/impl/ActivityServiceImpl.java

@@ -20,7 +20,6 @@
 import stroom.activity.api.FindActivityCriteria;
 import stroom.activity.shared.Activity;
 import stroom.activity.shared.ActivityValidationResult;
-import stroom.expression.api.DateTimeSettings;
 import stroom.query.common.v2.ExpressionPredicateFactory;
 import stroom.query.common.v2.ExpressionPredicateFactory.ValueFunctionFactories;
 import stroom.query.common.v2.FieldProviderImpl;

stroom-analytics/stroom-analytics-impl-db/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     implementation project(':stroom-analytics:stroom-analytics-impl')
     implementation project(':stroom-analytics:stroom-analytics-impl-db-jooq')
     implementation project(':stroom-query:stroom-query-language')
-    implementation project(':stroom-query:stroom-query-language-api')
     implementation project(':stroom-query:stroom-query-api')
     implementation project(':stroom-query:stroom-query-common')
     implementation project(':stroom-security:stroom-security-api')

stroom-analytics/stroom-analytics-impl/build.gradle

@@ -28,7 +28,6 @@ dependencies {
     implementation project(':stroom-processor:stroom-processor-api')
     implementation project(':stroom-query:stroom-query-api')
     implementation project(':stroom-query:stroom-query-language')
-    implementation project(':stroom-query:stroom-query-language-api')
     implementation project(':stroom-query:stroom-query-common')
     implementation project(':stroom-search:stroom-expression-matcher')
     implementation project(':stroom-search:stroom-search-impl')

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AbstractAnalyticFieldListConsumer.java

@@ -16,7 +16,7 @@
 
 package stroom.analytics.impl;
 
-import stroom.query.api.v2.SearchRequest;
+import stroom.query.api.SearchRequest;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.StringFieldValue;
 import stroom.query.language.functions.FieldIndex;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticDataShardResourceImpl.java

@@ -25,7 +25,7 @@
 import stroom.node.api.NodeCallUtil;
 import stroom.node.api.NodeInfo;
 import stroom.node.api.NodeService;
-import stroom.query.api.v2.Result;
+import stroom.query.api.Result;
 import stroom.util.jersey.UriBuilderUtil;
 import stroom.util.jersey.WebTargetFactory;
 import stroom.util.rest.RestUtil;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticDataStores.java

@@ -13,19 +13,19 @@
 import stroom.lmdb2.LmdbEnvDir;
 import stroom.lmdb2.LmdbEnvDirFactory;
 import stroom.node.api.NodeInfo;
-import stroom.query.api.v2.FindResultStoreCriteria;
-import stroom.query.api.v2.OffsetRange;
-import stroom.query.api.v2.ParamUtil;
-import stroom.query.api.v2.QueryKey;
-import stroom.query.api.v2.Result;
-import stroom.query.api.v2.ResultRequest;
-import stroom.query.api.v2.ResultStoreInfo;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.SearchRequestSource;
-import stroom.query.api.v2.SearchRequestSource.SourceType;
-import stroom.query.api.v2.TableResult;
-import stroom.query.api.v2.TableSettings;
-import stroom.query.api.v2.TimeFilter;
+import stroom.query.api.FindResultStoreCriteria;
+import stroom.query.api.OffsetRange;
+import stroom.query.api.ParamUtil;
+import stroom.query.api.QueryKey;
+import stroom.query.api.Result;
+import stroom.query.api.ResultRequest;
+import stroom.query.api.ResultStoreInfo;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.SearchRequestSource;
+import stroom.query.api.SearchRequestSource.SourceType;
+import stroom.query.api.TableResult;
+import stroom.query.api.TableSettings;
+import stroom.query.api.TimeFilter;
 import stroom.query.common.v2.AbstractResultStoreConfig;
 import stroom.query.common.v2.AnalyticResultStoreConfig;
 import stroom.query.common.v2.DataStoreSettings;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticFields.java

@@ -16,8 +16,8 @@
 
 package stroom.analytics.impl;
 
-import stroom.datasource.api.v2.QueryField;
 import stroom.docref.DocRef;
+import stroom.query.api.datasource.QueryField;
 
 import java.util.ArrayList;
 import java.util.List;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticProcessResourceImpl.java

@@ -21,7 +21,7 @@
 import stroom.analytics.shared.AnalyticTracker;
 import stroom.event.logging.rs.api.AutoLogged;
 import stroom.event.logging.rs.api.AutoLogged.OperationType;
-import stroom.query.api.v2.ExpressionOperator;
+import stroom.query.api.ExpressionOperator;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticRuleSearchRequestHelper.java

@@ -1,12 +1,12 @@
 package stroom.analytics.impl;
 
 import stroom.analytics.shared.AbstractAnalyticRuleDoc;
-import stroom.expression.api.DateTimeSettings;
-import stroom.query.api.v2.Query;
-import stroom.query.api.v2.QueryKey;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.SearchRequestSource;
-import stroom.query.api.v2.SearchRequestSource.SourceType;
+import stroom.query.api.DateTimeSettings;
+import stroom.query.api.Query;
+import stroom.query.api.QueryKey;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.SearchRequestSource;
+import stroom.query.api.SearchRequestSource.SourceType;
 import stroom.query.common.v2.ExpressionContextFactory;
 import stroom.query.language.SearchRequestFactory;
 import stroom.query.language.functions.ExpressionContext;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsModule.java

@@ -17,11 +17,11 @@
 package stroom.analytics.impl;
 
 import stroom.analytics.api.AnalyticsService;
-import stroom.datasource.api.v2.DataSourceProvider;
 import stroom.explorer.api.IsSpecialExplorerDataSource;
 import stroom.job.api.ScheduledJobsBinder;
 import stroom.processor.api.ProcessorTaskExecutorBinder;
 import stroom.processor.shared.ProcessorType;
+import stroom.query.api.datasource.DataSourceProvider;
 import stroom.query.common.v2.HasResultStoreInfo;
 import stroom.query.common.v2.SearchProvider;
 import stroom.search.impl.NodeSearchTaskHandlerProvider;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsNodeSearchTaskCreator.java

@@ -3,7 +3,7 @@
 import stroom.cluster.task.api.NodeNotFoundException;
 import stroom.cluster.task.api.NullClusterStateException;
 import stroom.cluster.task.api.TargetNodeSetFactory;
-import stroom.query.api.v2.Query;
+import stroom.query.api.Query;
 import stroom.search.impl.FederatedSearchTask;
 import stroom.search.impl.NodeSearchTask;
 import stroom.search.impl.NodeSearchTaskType;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsNodeSearchTaskHandler.java

@@ -21,19 +21,19 @@
 import stroom.analytics.shared.AbstractAnalyticRuleDoc;
 import stroom.analytics.shared.AnalyticRuleDoc;
 import stroom.annotation.api.AnnotationFields;
-import stroom.datasource.api.v2.QueryField;
 import stroom.expression.matcher.ExpressionMatcher;
-import stroom.query.api.v2.Column;
-import stroom.query.api.v2.ExpressionOperator;
-import stroom.query.api.v2.OffsetRange;
-import stroom.query.api.v2.Query;
-import stroom.query.api.v2.ResultRequest;
-import stroom.query.api.v2.Row;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.TableResult;
-import stroom.query.api.v2.TableResultBuilder;
-import stroom.query.api.v2.TableSettings;
-import stroom.query.api.v2.TimeFilter;
+import stroom.query.api.Column;
+import stroom.query.api.ExpressionOperator;
+import stroom.query.api.OffsetRange;
+import stroom.query.api.Query;
+import stroom.query.api.ResultRequest;
+import stroom.query.api.Row;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.TableResult;
+import stroom.query.api.TableResultBuilder;
+import stroom.query.api.TableSettings;
+import stroom.query.api.TimeFilter;
+import stroom.query.api.datasource.QueryField;
 import stroom.query.common.v2.Coprocessors;
 import stroom.query.common.v2.DateExpressionParser;
 import stroom.query.common.v2.ExpressionPredicateFactory;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/AnalyticsSearchProvider.java

@@ -16,15 +16,15 @@
 
 package stroom.analytics.impl;
 
-import stroom.datasource.api.v2.FindFieldCriteria;
-import stroom.datasource.api.v2.QueryField;
 import stroom.docref.DocRef;
 import stroom.explorer.api.IsSpecialExplorerDataSource;
-import stroom.expression.api.DateTimeSettings;
-import stroom.query.api.v2.ExpressionOperator;
-import stroom.query.api.v2.ExpressionUtil;
-import stroom.query.api.v2.Query;
-import stroom.query.api.v2.SearchRequest;
+import stroom.query.api.DateTimeSettings;
+import stroom.query.api.ExpressionOperator;
+import stroom.query.api.ExpressionUtil;
+import stroom.query.api.Query;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.datasource.FindFieldCriteria;
+import stroom.query.api.datasource.QueryField;
 import stroom.query.common.v2.CoprocessorSettings;
 import stroom.query.common.v2.CoprocessorsFactory;
 import stroom.query.common.v2.CoprocessorsImpl;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DetectionConsumerProxy.java

@@ -2,9 +2,9 @@
 
 import stroom.analytics.shared.AbstractAnalyticRuleDoc;
 import stroom.analytics.shared.ExecutionSchedule;
-import stroom.expression.api.DateTimeSettings;
 import stroom.pipeline.errorhandler.ErrorReceiverProxy;
-import stroom.query.api.v2.Column;
+import stroom.query.api.Column;
+import stroom.query.api.DateTimeSettings;
 import stroom.query.common.v2.CompiledColumn;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.format.ColumnFormatter;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DuplicateCheck.java

@@ -1,6 +1,6 @@
 package stroom.analytics.impl;
 
-import stroom.query.api.v2.Row;
+import stroom.query.api.Row;
 
 public interface DuplicateCheck extends AutoCloseable {
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DuplicateCheckFactoryImpl.java

@@ -7,7 +7,7 @@
 import stroom.analytics.shared.DuplicateNotificationConfig;
 import stroom.analytics.shared.FindDuplicateCheckCriteria;
 import stroom.bytebuffer.impl6.ByteBufferFactory;
-import stroom.query.api.v2.Row;
+import stroom.query.api.Row;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.DuplicateCheckStoreConfig;
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DuplicateCheckRowFactory.java

@@ -2,7 +2,7 @@
 
 import stroom.analytics.shared.DuplicateCheckRow;
 import stroom.analytics.shared.DuplicateNotificationConfig;
-import stroom.query.api.v2.Row;
+import stroom.query.api.Row;
 import stroom.query.common.v2.CompiledColumn;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.util.logging.LambdaLogger;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DuplicateKeyFactory.java

@@ -2,7 +2,7 @@
 
 import stroom.analytics.shared.AnalyticRuleDoc;
 import stroom.bytebuffer.impl6.ByteBufferFactory;
-import stroom.query.api.v2.Row;
+import stroom.query.api.Row;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.LmdbKV;
 

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/ReportExecutor.java

@@ -37,19 +37,19 @@
 import stroom.data.store.api.Target;
 import stroom.docref.DocRef;
 import stroom.docrefinfo.api.DocRefInfoService;
-import stroom.expression.api.DateTimeSettings;
 import stroom.meta.api.MetaProperties;
 import stroom.node.api.NodeInfo;
 import stroom.pipeline.errorhandler.ErrorReceiverProxy;
-import stroom.query.api.v2.DestroyReason;
-import stroom.query.api.v2.OffsetRange;
-import stroom.query.api.v2.Query;
-import stroom.query.api.v2.Result;
-import stroom.query.api.v2.ResultRequest;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.SearchRequestSource;
-import stroom.query.api.v2.SearchRequestSource.SourceType;
-import stroom.query.api.v2.TableResultBuilder;
+import stroom.query.api.DateTimeSettings;
+import stroom.query.api.DestroyReason;
+import stroom.query.api.OffsetRange;
+import stroom.query.api.Query;
+import stroom.query.api.Result;
+import stroom.query.api.ResultRequest;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.SearchRequestSource;
+import stroom.query.api.SearchRequestSource.SourceType;
+import stroom.query.api.TableResultBuilder;
 import stroom.query.common.v2.DataStore;
 import stroom.query.common.v2.ErrorConsumerImpl;
 import stroom.query.common.v2.ExpressionContextFactory;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/ScheduledQueryAnalyticExecutor.java

@@ -22,21 +22,21 @@
 import stroom.analytics.shared.ExecutionTracker;
 import stroom.docref.DocRef;
 import stroom.docrefinfo.api.DocRefInfoService;
-import stroom.expression.api.DateTimeSettings;
 import stroom.index.shared.IndexConstants;
 import stroom.node.api.NodeInfo;
 import stroom.pipeline.errorhandler.ErrorReceiverProxy;
-import stroom.query.api.v2.Column;
-import stroom.query.api.v2.DestroyReason;
-import stroom.query.api.v2.OffsetRange;
-import stroom.query.api.v2.ParamUtil;
-import stroom.query.api.v2.Query;
-import stroom.query.api.v2.ResultRequest;
-import stroom.query.api.v2.Row;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.SearchRequestSource;
-import stroom.query.api.v2.SearchRequestSource.SourceType;
-import stroom.query.api.v2.TableSettings;
+import stroom.query.api.Column;
+import stroom.query.api.DateTimeSettings;
+import stroom.query.api.DestroyReason;
+import stroom.query.api.OffsetRange;
+import stroom.query.api.ParamUtil;
+import stroom.query.api.Query;
+import stroom.query.api.ResultRequest;
+import stroom.query.api.Row;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.SearchRequestSource;
+import stroom.query.api.SearchRequestSource.SourceType;
+import stroom.query.api.TableSettings;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.DataStore;
 import stroom.query.common.v2.ErrorConsumerImpl;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/StreamingAnalytic.java

@@ -1,7 +1,7 @@
 package stroom.analytics.impl;
 
 import stroom.analytics.shared.AbstractAnalyticRuleDoc;
-import stroom.query.api.v2.SearchRequest;
+import stroom.query.api.SearchRequest;
 import stroom.view.shared.ViewDoc;
 
 public record StreamingAnalytic(String ruleIdentity,

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/StreamingAnalyticCache.java

@@ -6,7 +6,7 @@
 import stroom.cache.api.CacheManager;
 import stroom.cache.api.LoadingStroomCache;
 import stroom.docref.DocRef;
-import stroom.query.api.v2.SearchRequest;
+import stroom.query.api.SearchRequest;
 import stroom.security.api.SecurityContext;
 import stroom.security.shared.DocumentPermission;
 import stroom.util.entityevent.EntityAction;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/StreamingAnalyticFieldListConsumer.java

@@ -1,6 +1,6 @@
 package stroom.analytics.impl;
 
-import stroom.query.api.v2.SearchRequest;
+import stroom.query.api.SearchRequest;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.language.functions.Val;
 import stroom.query.language.functions.ValuesConsumer;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/StreamingAnalyticProcessorTaskDecorator.java

@@ -21,9 +21,9 @@
 import stroom.core.dataprocess.ProcessorTaskDecorator;
 import stroom.docref.DocRef;
 import stroom.processor.shared.ProcessorFilter;
-import stroom.query.api.v2.ParamUtil;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.TableSettings;
+import stroom.query.api.ParamUtil;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.TableSettings;
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.ExpressionContextFactory;
 import stroom.query.common.v2.ExpressionPredicateFactory;

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/TableBuilderAnalyticExecutor.java

@@ -24,19 +24,19 @@
 import stroom.pipeline.factory.PipelineDataCache;
 import stroom.pipeline.shared.PipelineDoc;
 import stroom.pipeline.shared.data.PipelineData;
-import stroom.query.api.v2.Column;
-import stroom.query.api.v2.ExpressionOperator;
-import stroom.query.api.v2.ExpressionOperator.Op;
-import stroom.query.api.v2.ExpressionTerm.Condition;
-import stroom.query.api.v2.ExpressionUtil;
-import stroom.query.api.v2.OffsetRange;
-import stroom.query.api.v2.QueryKey;
-import stroom.query.api.v2.ResultRequest;
-import stroom.query.api.v2.Row;
-import stroom.query.api.v2.SearchRequest;
-import stroom.query.api.v2.TableResult;
-import stroom.query.api.v2.TableResultBuilder;
-import stroom.query.api.v2.TimeFilter;
+import stroom.query.api.Column;
+import stroom.query.api.ExpressionOperator;
+import stroom.query.api.ExpressionOperator.Op;
+import stroom.query.api.ExpressionTerm.Condition;
+import stroom.query.api.ExpressionUtil;
+import stroom.query.api.OffsetRange;
+import stroom.query.api.QueryKey;
+import stroom.query.api.ResultRequest;
+import stroom.query.api.Row;
+import stroom.query.api.SearchRequest;
+import stroom.query.api.TableResult;
+import stroom.query.api.TableResultBuilder;
+import stroom.query.api.TimeFilter;
 import stroom.query.common.v2.CurrentDbState;
 import stroom.query.common.v2.DeleteCommand;
 import stroom.query.common.v2.ExpressionPredicateFactory;