#3871 Add support for Java 21

gchq · Nov 1, 2023 · a36f779 · a36f779
1 parent 1af431e
commit a36f779
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/...ics-impl/src/main/java/stroom/analytics/impl/StreamingAnalyticDataProcessorDecorator.java b/...ics-impl/src/main/java/stroom/analytics/impl/StreamingAnalyticDataProcessorDecorator.java
@@ -17,22 +17,24 @@
 
 package stroom.analytics.impl;
 
+import stroom.analytics.api.NotificationState;
 import stroom.analytics.rule.impl.AnalyticRuleStore;
 import stroom.analytics.shared.AnalyticRuleDoc;
 import stroom.analytics.shared.StreamingAnalyticProcessConfig;
 import stroom.docref.DocRef;
 import stroom.expression.api.ExpressionContext;
 import stroom.meta.shared.Meta;
-import stroom.pipeline.filter.FieldValue;
 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.common.v2.CompiledFields;
 import stroom.query.common.v2.ExpressionContextFactory;
 import stroom.query.language.functions.FieldIndex;
+import stroom.search.extraction.AnalyticFieldListConsumer;
 import stroom.search.extraction.FieldListConsumerHolder;
-import stroom.search.impl.SearchExpressionQueryBuilderFactory;
+import stroom.search.extraction.FieldValue;
+import stroom.search.extraction.MemoryIndex;
 import stroom.task.api.TaskTerminatedException;
 import stroom.util.concurrent.UncheckedInterruptedException;
 import stroom.util.logging.LambdaLogger;
@@ -57,7 +59,7 @@ public class StreamingAnalyticDataProcessorDecorator {
     private final AnalyticRuleSearchRequestHelper analyticRuleSearchRequestHelper;
     private final AnalyticHelper analyticHelper;
     private final ExpressionContextFactory expressionContextFactory;
-    private final SearchExpressionQueryBuilderFactory searchExpressionQueryBuilderFactory;
+    private final MemoryIndex memoryIndex;
     private final NotificationStateService notificationStateService;
     private final DetectionConsumerFactory detectionConsumerFactory;
     private final DetectionConsumerProxy detectionConsumerProxy;
@@ -71,8 +73,7 @@ public StreamingAnalyticDataProcessorDecorator(final AnalyticRuleStore analyticR
                                                            analyticRuleSearchRequestHelper,
                                                    final AnalyticHelper analyticHelper,
                                                    final ExpressionContextFactory expressionContextFactory,
-                                                   final SearchExpressionQueryBuilderFactory
-                                                           searchExpressionQueryBuilderFactory,
+                                                   final MemoryIndex memoryIndex,
                                                    final NotificationStateService notificationStateService,
                                                    final DetectionConsumerFactory detectionConsumerFactory,
                                                    final DetectionConsumerProxy detectionConsumerProxy,
@@ -81,7 +82,7 @@ public StreamingAnalyticDataProcessorDecorator(final AnalyticRuleStore analyticR
         this.analyticRuleSearchRequestHelper = analyticRuleSearchRequestHelper;
         this.analyticHelper = analyticHelper;
         this.expressionContextFactory = expressionContextFactory;
-        this.searchExpressionQueryBuilderFactory = searchExpressionQueryBuilderFactory;
+        this.memoryIndex = memoryIndex;
         this.notificationStateService = notificationStateService;
         this.detectionConsumerFactory = detectionConsumerFactory;
         this.detectionConsumerProxy = detectionConsumerProxy;
@@ -135,10 +136,6 @@ private Optional<AnalyticFieldListConsumer> createEventConsumer(final StreamingA
                 paramMap);
         final FieldIndex fieldIndex = compiledFields.getFieldIndex();
 
-        // Cache the query for use across multiple streams.
-        final SearchExpressionQueryCache searchExpressionQueryCache =
-                new SearchExpressionQueryCache(searchExpressionQueryBuilderFactory, searchRequest);
-
         // Determine if notifications have been disabled.
         final NotificationState notificationState = notificationStateService.getState(analytic.analyticRuleDoc);
         // Only execute if the state is enabled.
@@ -157,7 +154,7 @@ private Optional<AnalyticFieldListConsumer> createEventConsumer(final StreamingA
                         fieldIndex,
                         notificationState,
                         detectionConsumerProxy,
-                        searchExpressionQueryCache,
+                        memoryIndex,
                         null,
                         detectionConsumerProxy));
 
@@ -177,7 +174,7 @@ private StreamingAnalytic loadStreamingAnalytic(final DocRef analyticRule) {
         info(() -> "Loading rule");
         final AnalyticRuleDoc analyticRuleDoc = analyticRuleStore.readDocument(analyticRule);
 
-        ViewDoc viewDoc = null;
+        ViewDoc viewDoc;
 
         // Try and get view.
         final String ruleIdentity = AnalyticUtil.getAnalyticRuleIdentity(analyticRuleDoc);