Merge commit 'refs/pull/5084/head' of github.com:gchq/stroom

Author: stroomdev66

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

@@ -62,6 +62,7 @@
 import stroom.util.concurrent.UncheckedInterruptedException;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.ErrorMessage;
 
 import jakarta.inject.Inject;
 
@@ -309,9 +310,9 @@ public TableResultConsumer componentId(final String componentId) {
         }
 
         @Override
-        public TableResultConsumer errors(final List<String> errors) {
-            for (final String error : errors) {
-                LOGGER.error(error);
+        public TableResultConsumer errorMessages(final List<ErrorMessage> errorMessages) {
+            for (final ErrorMessage errorMessage : errorMessages) {
+                LOGGER.error(errorMessage.toString());
             }
             return this;
         }

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

@@ -67,6 +67,7 @@
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogUtil;
 import stroom.util.scheduler.Trigger;
+import stroom.util.shared.ErrorMessage;
 import stroom.util.shared.NullSafe;
 import stroom.util.shared.Severity;
 
@@ -308,16 +309,16 @@ boolean process(final AnalyticRuleDoc analytic,
                         }
 
                     } finally {
-                        final List<String> errors = errorConsumer.getErrors();
-                        if (errors != null) {
-                            for (final String error : errors) {
+                        final List<ErrorMessage> errorMessages = errorConsumer.getErrorMessages();
+                        if (errorMessages != null) {
+                            for (final ErrorMessage errorMessage : errorMessages) {
                                 if (executionResult.status() == null) {
-                                    executionResult = new ExecutionResult("Error", error);
+                                    executionResult = new ExecutionResult("Error", errorMessage.getMessage());
                                 }
 
                                 errorReceiverProxyProvider.get()
                                         .getErrorReceiver()
-                                        .log(Severity.ERROR, null, null, error, null);
+                                        .log(errorMessage.getSeverity(), null, null, errorMessage.getMessage(), null);
                             }
                         }
 

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

@@ -66,6 +66,7 @@
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.logging.LogExecutionTime;
 import stroom.util.logging.LogUtil;
+import stroom.util.shared.ErrorMessage;
 import stroom.util.shared.NullSafe;
 import stroom.util.shared.UserRef;
 import stroom.util.shared.time.SimpleDuration;
@@ -824,9 +825,9 @@ public TableResultConsumer componentId(final String componentId) {
         }
 
         @Override
-        public TableResultConsumer errors(final List<String> errors) {
-            for (final String error : errors) {
-                LOGGER.error(error);
+        public TableResultConsumer errorMessages(final List<ErrorMessage> errorMessages) {
+            for (final ErrorMessage errorMessage : errorMessages) {
+                LOGGER.error(errorMessage.toString());
             }
             return this;
         }

stroom-app/src/test/java/stroom/search/AbstractSearchTest.java

@@ -35,6 +35,7 @@
 import stroom.query.common.v2.ResultStoreManager;
 import stroom.test.AbstractCoreIntegrationTest;
 import stroom.util.json.JsonUtil;
+import stroom.util.shared.ErrorMessage;
 
 import jakarta.inject.Inject;
 import org.slf4j.Logger;
@@ -123,8 +124,10 @@ public static void testInteractive(
                 .search(searchRequest, searchResponseCreatorManager);
 
         assertThat(searchResponse).as("Search response is null").isNotNull();
-        if (searchResponse.getErrors() != null && searchResponse.getErrors().size() > 0) {
-            final String errors = String.join(", ", searchResponse.getErrors());
+        if (searchResponse.getErrorMessages() != null && searchResponse.getErrorMessages().size() > 0) {
+            final List<String> messages = searchResponse.getErrorMessages().stream()
+                    .map(ErrorMessage::getMessage).toList();
+            final String errors = String.join(", ", messages);
             assertThat(errors).as("Found errors: " + errors).isBlank();
         }
         assertThat(searchResponse.complete()).as("Search is not complete").isTrue();

stroom-app/src/test/java/stroom/search/AbstractSearchTest2.java

@@ -35,6 +35,7 @@
 import stroom.query.language.functions.ExpressionContext;
 import stroom.test.AbstractCoreIntegrationTest;
 import stroom.util.json.JsonUtil;
+import stroom.util.shared.ErrorMessage;
 
 import jakarta.inject.Inject;
 import org.slf4j.Logger;
@@ -134,8 +135,10 @@ public void testInteractive(
                 .search(searchRequest, searchResponseCreatorManager);
 
         assertThat(searchResponse).as("Search response is null").isNotNull();
-        if (searchResponse.getErrors() != null && searchResponse.getErrors().size() > 0) {
-            final String errors = String.join(", ", searchResponse.getErrors());
+        if (searchResponse.getErrorMessages() != null && searchResponse.getErrorMessages().size() > 0) {
+            final List<String> messages = searchResponse.getErrorMessages().stream()
+                    .map(ErrorMessage::getMessage).toList();
+            final String errors = String.join(", ", messages);
             assertThat(errors).as("Found errors: " + errors).isBlank();
         }
         assertThat(searchResponse.complete()).as("Search is not complete").isTrue();

stroom-core-client-widget/src/main/java/stroom/data/grid/client/MessagePanel.java

@@ -1,12 +1,14 @@
 package stroom.data.grid.client;
 
+import stroom.util.shared.ErrorMessage;
+
 import com.google.gwt.safehtml.shared.SafeHtml;
 
 import java.util.List;
 
 public interface MessagePanel {
 
-    void showMessage(List<String> errors);
+    void showMessage(List<ErrorMessage> errors);
 
     void showMessage(SafeHtml message);
 

stroom-core-client-widget/src/main/java/stroom/data/grid/client/MessagePanelImpl.java

@@ -1,5 +1,6 @@
 package stroom.data.grid.client;
 
+import stroom.util.shared.ErrorMessage;
 import stroom.widget.util.client.SafeHtmlUtil;
 
 import com.google.gwt.safehtml.shared.SafeHtml;
@@ -20,11 +21,11 @@ public MessagePanelImpl() {
     }
 
     @Override
-    public void showMessage(final List<String> errors) {
-        if (errors != null && errors.size() > 0) {
+    public void showMessage(final List<ErrorMessage> errors) {
+        if (errors != null && !errors.isEmpty()) {
             final SafeHtmlBuilder sb = new SafeHtmlBuilder();
-            for (final String error : errors) {
-                final String[] lines = error.split("\n");
+            for (final ErrorMessage error : errors) {
+                final String[] lines = error.getMessage().split("\n");
                 for (final String line : lines) {
                     sb.appendEscaped(line);
                     sb.appendHtmlConstant("<br />");

stroom-core-client/src/main/java/stroom/alert/client/event/FireAlertEventFunction.java

@@ -0,0 +1,7 @@
+package stroom.alert.client.event;
+
+import com.google.gwt.event.shared.HasHandlers;
+
+public interface FireAlertEventFunction {
+    void apply(HasHandlers hasHandlers, String message, String detail, AlertCallback alertCallback);
+}

stroom-core-client/src/main/java/stroom/analytics/client/presenter/AnalyticDataShardsPresenter.java

@@ -29,6 +29,8 @@
 import stroom.query.client.presenter.DateTimeSettingsFactory;
 import stroom.query.client.presenter.QueryResultTablePresenter;
 import stroom.query.client.presenter.QueryToolbarPresenter;
+import stroom.util.shared.ErrorMessage;
+import stroom.util.shared.Severity;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
@@ -109,7 +111,8 @@ private void update() {
                         queryToolbarPresenter.onSearching(false);
                     })
                     .onFailure(t -> {
-                        queryToolbarPresenter.onError(Collections.singletonList(t.getMessage()));
+                        queryToolbarPresenter.onError(
+                                Collections.singletonList(new ErrorMessage(Severity.ERROR, t.getMessage())));
                         queryToolbarPresenter.onSearching(false);
                     })
                     .taskMonitorFactory(this)

stroom-core-client/src/main/java/stroom/dashboard/client/embeddedquery/EmbeddedQueryPresenter.java

@@ -60,6 +60,7 @@
 import stroom.query.shared.QueryDoc;
 import stroom.query.shared.QueryTablePreferences;
 import stroom.task.client.TaskMonitorFactory;
+import stroom.util.shared.ErrorMessage;
 import stroom.util.shared.ModelStringUtil;
 import stroom.util.shared.NullSafe;
 
@@ -110,7 +111,7 @@ public class EmbeddedQueryPresenter
     private QueryResultVisPresenter currentVisPresenter;
     private final List<HandlerRegistration> tableHandlerRegistrations = new ArrayList<>();
 
-    private List<String> currentErrors;
+    private List<ErrorMessage> currentErrors;
     private boolean initialised;
     private Timer autoRefreshTimer;
     private ExpressionOperator currentSelectionQuery;
@@ -738,13 +739,13 @@ public void setResultStoreInfo(final ResultStoreInfo resultStoreInfo) {
     }
 
     @Override
-    public void onError(final List<String> errors) {
+    public void onError(final List<ErrorMessage> errors) {
         currentErrors = errors;
 //        setWarningsVisible(currentErrors != null && !currentErrors.isEmpty());
     }
 
     @Override
-    public List<String> getCurrentErrors() {
+    public List<ErrorMessage> getCurrentErrors() {
         return currentErrors;
     }