Merge branch 'master' of github.com:gchq/stroom into gh-4484_pass_timerange_to_linked_dashboards

Author: stroomdev66

.idea/runConfigurations/Stroom_Grant_admin_to_IDP_user.xml

@@ -62,6 +62,7 @@ dropwizard-jersey = { module = "io.dropwizard:dropwizard-jersey" } # version con
 dropwizard-jetty = { module = "io.dropwizard:dropwizard-jetty" } #was 1.0.6 now 1.1.0
 dropwizard-lifecycle = { module = "io.dropwizard:dropwizard-lifecycle" } # version controlled by dropwizard-dependencies
 dropwizard-metrics-annotation = { module = "io.dropwizard.metrics:metrics-annotation" } # version controlled by dropwizard-dependencies
+dropwizard-metrics-caffeine3 = { module = "io.dropwizard.metrics:metrics-caffeine3" } # version controlled by dropwizard-dependencies
 dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core" } # version controlled by dropwizard-dependencies
 dropwizard-metrics-healthchecks = { module = "io.dropwizard.metrics:metrics-healthchecks" } # version controlled by dropwizard-dependencies
 dropwizard-servlets = { module = "io.dropwizard:dropwizard-servlets" } # version controlled by dropwizard-dependencies

gradle/libs.versions.toml

@@ -14,5 +14,5 @@ ADMIN_PORT=${ADMIN_PORT_OVERRIDE:-$ADMIN_PORT}
 #echo "ADMIN_PORT: ${ADMIN_PORT}"
 
 # Override jar path for dev
-PATH_TO_JAR="./stroom-proxy/stroom-proxy-app//build/libs/stroom-proxy-app-all.jar" \
+PATH_TO_JAR="./stroom-proxy/stroom-proxy-app/build/libs/stroom-proxy-app-all.jar" \
   ./dist/set_log_levels.sh "$@"

setProxyLogLevels.sh

@@ -293,3 +293,4 @@ include 'stroom-view:stroom-view-impl'
 include 'stroom-ssl-test'
 include 'stroom-view:stroom-view-api'
 include 'stroom-index:stroom-index-api'
+include 'stroom-cache:stroom-cache-service-impl'

settings.gradle

@@ -21,12 +21,12 @@
 import stroom.activity.shared.Activity;
 import stroom.activity.shared.Activity.ActivityDetails;
 import stroom.db.util.JooqUtil;
-import stroom.util.NullSafe;
 import stroom.util.exception.DataChangedException;
 import stroom.util.json.JsonUtil;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogUtil;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.UserRef;
 
 import jakarta.inject.Inject;

stroom-activity/stroom-activity-impl-db/src/main/java/stroom/activity/impl/db/ActivityDaoImpl.java

@@ -32,7 +32,6 @@
 import stroom.task.api.TaskContext;
 import stroom.task.api.TaskContextFactory;
 import stroom.task.api.TaskTerminatedException;
-import stroom.util.NullSafe;
 import stroom.util.concurrent.UncheckedInterruptedException;
 import stroom.util.concurrent.WorkQueue;
 import stroom.util.date.DateUtil;
@@ -43,6 +42,7 @@
 import stroom.util.scheduler.Trigger;
 import stroom.util.scheduler.TriggerFactory;
 import stroom.util.shared.HasUserDependencies;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.PermissionException;
 import stroom.util.shared.ResultPage;
 import stroom.util.shared.UserDependency;
@@ -307,7 +307,7 @@ public List<UserDependency> getUserDependencies(final UserRef userRef) {
                     return new UserDependency(userRef, details, executionSchedule.getOwningDoc());
                 })
 //                    .filter(userDependency ->
-//                            NullSafe.getOrElse(
+//                            GwtNullSafe.getOrElse(
 //                                    userDependency.getDocRef(),
 //                                    docRef -> securityContext.hasDocumentPermission(docRef, DocumentPermission.VIEW),
 //                                    true))

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

@@ -42,11 +42,11 @@
 import stroom.query.language.functions.ref.ErrorConsumer;
 import stroom.security.api.SecurityContext;
 import stroom.security.shared.DocumentPermission;
-import stroom.util.NullSafe;
 import stroom.util.io.FileUtil;
 import stroom.util.io.PathCreator;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.ResultPage;
 import stroom.view.shared.ViewDoc;
 

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

@@ -35,7 +35,7 @@
 import stroom.query.common.v2.SearchProvider;
 import stroom.search.impl.FederatedSearchExecutor;
 import stroom.search.impl.FederatedSearchTask;
-import stroom.util.NullSafe;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.ResultPage;
 
 import jakarta.inject.Inject;

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

@@ -1,7 +1,7 @@
 package stroom.analytics.impl;
 
-import stroom.util.NullSafe;
 import stroom.util.date.DateUtil;
+import stroom.util.shared.NullSafe;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -220,21 +220,21 @@ public boolean equals(final Object o) {
         }
         final Detection detection = (Detection) o;
         return Objects.equals(detectTime, detection.detectTime) &&
-                Objects.equals(detectorName, detection.detectorName) &&
-                Objects.equals(detectorUuid, detection.detectorUuid) &&
-                Objects.equals(detectorVersion, detection.detectorVersion) &&
-                Objects.equals(detectorEnvironment, detection.detectorEnvironment) &&
-                Objects.equals(headline, detection.headline) &&
-                Objects.equals(detailedDescription, detection.detailedDescription) &&
-                Objects.equals(fullDescription, detection.fullDescription) &&
-                Objects.equals(detectionUniqueId, detection.detectionUniqueId) &&
-                Objects.equals(detectionRevision, detection.detectionRevision) &&
-                Objects.equals(defunct, detection.defunct) &&
-                Objects.equals(executionSchedule, detection.executionSchedule) &&
-                Objects.equals(executionTime, detection.executionTime) &&
-                Objects.equals(effectiveExecutionTime, detection.effectiveExecutionTime) &&
-                Objects.equals(values, detection.values) &&
-                Objects.equals(linkedEvents, detection.linkedEvents);
+               Objects.equals(detectorName, detection.detectorName) &&
+               Objects.equals(detectorUuid, detection.detectorUuid) &&
+               Objects.equals(detectorVersion, detection.detectorVersion) &&
+               Objects.equals(detectorEnvironment, detection.detectorEnvironment) &&
+               Objects.equals(headline, detection.headline) &&
+               Objects.equals(detailedDescription, detection.detailedDescription) &&
+               Objects.equals(fullDescription, detection.fullDescription) &&
+               Objects.equals(detectionUniqueId, detection.detectionUniqueId) &&
+               Objects.equals(detectionRevision, detection.detectionRevision) &&
+               Objects.equals(defunct, detection.defunct) &&
+               Objects.equals(executionSchedule, detection.executionSchedule) &&
+               Objects.equals(executionTime, detection.executionTime) &&
+               Objects.equals(effectiveExecutionTime, detection.effectiveExecutionTime) &&
+               Objects.equals(values, detection.values) &&
+               Objects.equals(linkedEvents, detection.linkedEvents);
     }
 
     @Override
@@ -260,23 +260,23 @@ public int hashCode() {
     @Override
     public String toString() {
         return "Detection{" +
-                "detectTime='" + detectTime + '\'' +
-                ", detectorName='" + detectorName + '\'' +
-                ", detectorUuid='" + detectorUuid + '\'' +
-                ", detectorVersion='" + detectorVersion + '\'' +
-                ", detectorEnvironment='" + detectorEnvironment + '\'' +
-                ", headline='" + headline + '\'' +
-                ", detailedDescription='" + detailedDescription + '\'' +
-                ", fullDescription='" + fullDescription + '\'' +
-                ", detectionUniqueId='" + detectionUniqueId + '\'' +
-                ", detectionRevision=" + detectionRevision +
-                ", defunct=" + defunct +
-                ", executionSchedule='" + executionSchedule + '\'' +
-                ", executionTime=" + executionTime +
-                ", effectiveExecutionTime=" + effectiveExecutionTime +
-                ", values=" + values +
-                ", linkedEvents=" + linkedEvents +
-                '}';
+               "detectTime='" + detectTime + '\'' +
+               ", detectorName='" + detectorName + '\'' +
+               ", detectorUuid='" + detectorUuid + '\'' +
+               ", detectorVersion='" + detectorVersion + '\'' +
+               ", detectorEnvironment='" + detectorEnvironment + '\'' +
+               ", headline='" + headline + '\'' +
+               ", detailedDescription='" + detailedDescription + '\'' +
+               ", fullDescription='" + fullDescription + '\'' +
+               ", detectionUniqueId='" + detectionUniqueId + '\'' +
+               ", detectionRevision=" + detectionRevision +
+               ", defunct=" + defunct +
+               ", executionSchedule='" + executionSchedule + '\'' +
+               ", executionTime=" + executionTime +
+               ", effectiveExecutionTime=" + effectiveExecutionTime +
+               ", values=" + values +
+               ", linkedEvents=" + linkedEvents +
+               '}';
     }
 
     public static Builder builder() {

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

@@ -15,8 +15,8 @@
 import stroom.query.language.functions.ValuesConsumer;
 import stroom.query.language.functions.ref.StoredValues;
 import stroom.search.extraction.ProcessLifecycleAware;
-import stroom.util.NullSafe;
 import stroom.util.date.DateUtil;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.Severity;
 
 import jakarta.inject.Inject;
@@ -117,8 +117,8 @@ public void accept(final Val[] values) {
         // Analytics generation search extraction - create records when filters match
         if (values == null || values.length == 0) {
             log(Severity.WARNING, "Rules error: Query " +
-                    analyticRuleDoc.getUuid() +
-                    ". No values to extract from ", null);
+                                  analyticRuleDoc.getUuid() +
+                                  ". No values to extract from ", null);
             return;
         }
 

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

@@ -2,7 +2,7 @@
 
 import stroom.pipeline.errorhandler.ErrorReceiverProxy;
 import stroom.pipeline.filter.XMLFilter;
-import stroom.util.NullSafe;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.Severity;
 
 import jakarta.inject.Inject;

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

@@ -4,10 +4,10 @@
 import stroom.lmdb2.LmdbEnvDir;
 import stroom.lmdb2.LmdbEnvDirFactory;
 import stroom.query.common.v2.DuplicateCheckStoreConfig;
-import stroom.util.NullSafe;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogUtil;
+import stroom.util.shared.NullSafe;
 
 import jakarta.inject.Inject;
 

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

@@ -16,10 +16,10 @@
 import stroom.lmdb2.WriteTxn;
 import stroom.query.common.v2.DuplicateCheckStoreConfig;
 import stroom.query.common.v2.LmdbKV;
-import stroom.util.NullSafe;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.shared.HasPrimitiveValue;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.PageRequest;
 import stroom.util.shared.ResultPage;
 

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

@@ -21,12 +21,11 @@
 import stroom.analytics.shared.EmailContent;
 import stroom.analytics.shared.NotificationEmailDestination;
 import stroom.analytics.shared.ReportDoc;
-import stroom.util.NullSafe;
 import stroom.util.date.DateUtil;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogUtil;
-import stroom.util.shared.GwtNullSafe;
+import stroom.util.shared.NullSafe;
 
 import com.google.common.base.Preconditions;
 import jakarta.activation.FileDataSource;
@@ -223,20 +222,20 @@ private void validate(final NotificationEmailDestination emailDestination) {
         final String subject = emailDestination.getSubjectTemplate();
         final String body = emailDestination.getBodyTemplate();
 
-        if (GwtNullSafe.isBlankString(subject)) {
+        if (NullSafe.isBlankString(subject)) {
             msgs.add("Subject cannot be blank.");
         }
         if (subject.contains("\n") || subject.contains("\r")) {
             msgs.add("Subject contains line breaks or carriage returns. It must be one line only.");
         }
-        if (GwtNullSafe.isBlankString(body)) {
+        if (NullSafe.isBlankString(body)) {
             msgs.add("Body cannot be blank.");
         }
         final boolean hasRecipients = Stream.of(
                         emailDestination.getTo(),
                         emailDestination.getCc(),
                         emailDestination.getBcc())
-                .anyMatch(str -> !GwtNullSafe.isBlankString(str));
+                .anyMatch(str -> !NullSafe.isBlankString(str));
 
         if (!hasRecipients) {
             msgs.add("You must enter at least one recipient (To, Cc, Bcc).");

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

@@ -2,9 +2,9 @@
 
 import stroom.analytics.shared.EmailContent;
 import stroom.analytics.shared.NotificationEmailDestination;
-import stroom.util.NullSafe;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.NullSafe;
 
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
@@ -107,10 +107,10 @@ private String errorsToString(final List<TemplateError> errors) {
             final String detail = errors.stream()
                     .map(error ->
                             error.getSeverity() + ": "
-                                    + error.getMessage()
-                                    + ", at " + error.getLineno() + ":" + error.getStartPosition()
-                                    + ", reason: " + error.getReason()
-                                    + ", fieldName: " + error.getFieldName())
+                            + error.getMessage()
+                            + ", at " + error.getLineno() + ":" + error.getStartPosition()
+                            + ", reason: " + error.getReason()
+                            + ", fieldName: " + error.getFieldName())
                     .collect(Collectors.joining("\n"));
             return prefix + "\n" + detail;
         }
@@ -153,7 +153,7 @@ private Map<String, Object> buildContext(final Detection detection) {
                 }
                 if (!dupKeys.isEmpty()) {
                     LOGGER.warn("Duplicate names {} found in detection values for detector '{}' ({}). " +
-                                    "The first value will be used in each case.",
+                                "The first value will be used in each case.",
                             dupKeys, detection.getDetectorName(), detection.getDetectorUuid());
                 }
             }

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

@@ -1,7 +1,7 @@
 package stroom.analytics.impl;
 
 import stroom.docstore.shared.Doc;
-import stroom.util.NullSafe;
+import stroom.util.shared.NullSafe;
 
 public class RuleUtil {
 

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

@@ -59,12 +59,12 @@
 import stroom.task.api.ExecutorProvider;
 import stroom.task.api.TaskContextFactory;
 import stroom.ui.config.shared.AnalyticUiDefaultConfig;
-import stroom.util.NullSafe;
 import stroom.util.date.DateUtil;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogUtil;
 import stroom.util.scheduler.Trigger;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.Severity;
 
 import jakarta.inject.Inject;

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

@@ -9,7 +9,6 @@
 import stroom.query.api.v2.SearchRequest;
 import stroom.security.api.SecurityContext;
 import stroom.security.shared.DocumentPermission;
-import stroom.util.NullSafe;
 import stroom.util.entityevent.EntityAction;
 import stroom.util.entityevent.EntityEvent;
 import stroom.util.entityevent.EntityEventHandler;
@@ -18,6 +17,7 @@
 import stroom.util.logging.LogExecutionTime;
 import stroom.util.logging.LogUtil;
 import stroom.util.shared.Clearable;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.PermissionException;
 import stroom.view.api.ViewStore;
 import stroom.view.shared.ViewDoc;

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

@@ -60,13 +60,13 @@
 import stroom.task.api.TaskTerminatedException;
 import stroom.task.api.TerminateHandlerFactory;
 import stroom.ui.config.shared.AnalyticUiDefaultConfig;
-import stroom.util.NullSafe;
 import stroom.util.concurrent.UncheckedInterruptedException;
 import stroom.util.date.DateUtil;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogExecutionTime;
 import stroom.util.logging.LogUtil;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.UserRef;
 import stroom.util.shared.time.SimpleDuration;
 import stroom.util.shared.time.TimeUnit;

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

@@ -46,9 +46,9 @@
 import stroom.query.language.functions.ValString;
 import stroom.query.language.functions.ValuesConsumer;
 import stroom.security.user.api.UserRefLookup;
-import stroom.util.NullSafe;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.UserRef;
 
 import jakarta.inject.Inject;

stroom-annotation/stroom-annotation-impl-db/src/main/java/stroom/annotation/impl/db/AnnotationDaoImpl.java

@@ -33,9 +33,9 @@
 import stroom.search.extraction.AnnotationsDecoratorFactory;
 import stroom.search.extraction.ExpressionFilter;
 import stroom.security.api.SecurityContext;
-import stroom.util.NullSafe;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.UserRef;
 
 import jakarta.inject.Inject;

stroom-annotation/stroom-annotation-impl/src/main/java/stroom/annotation/impl/AnnotationReceiverDecoratorFactory.java

@@ -36,9 +36,9 @@
 import stroom.searchable.api.Searchable;
 import stroom.security.api.SecurityContext;
 import stroom.security.shared.AppPermission;
-import stroom.util.NullSafe;
 import stroom.util.logging.LogUtil;
 import stroom.util.shared.HasUserDependencies;
+import stroom.util.shared.NullSafe;
 import stroom.util.shared.PermissionException;
 import stroom.util.shared.ResultPage;
 import stroom.util.shared.UserDependency;