Merge branch '7.3'

Author: at055612

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

@@ -55,6 +55,8 @@ dependencies {
     testImplementation libs.assertj_core
     testImplementation libs.guice_extension
     testImplementation libs.junit_jupiter_api
+    testImplementation libs.mockito_core
+    testImplementation libs.mockito_junit_jupiter
 
     // The following logging libs are needed when running junits outside dropwizard
     testRuntimeOnly libs.jakarta_activation

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

@@ -38,6 +38,8 @@
 @JsonPropertyOrder(alphabetic = true)
 public class SmtpConfig extends AbstractConfig implements IsStroomConfig {
 
+    public static final String DEFAULT_TRANSPORT = "plain";
+
     @NotNull
     @JsonProperty("host")
     @JsonPropertyDescription("The fully qualified hostname of the SMTP server.")
@@ -66,7 +68,7 @@ public class SmtpConfig extends AbstractConfig implements IsStroomConfig {
     public SmtpConfig() {
         host = "localhost";
         port = 2525;
-        transport = "plain";
+        transport = DEFAULT_TRANSPORT;
         password = null;
         username = null;
     }
@@ -85,6 +87,11 @@ public SmtpConfig(@JsonProperty("host") final String host,
         this.password = password;
     }
 
+    public static SmtpConfig unauthenticated(final String host,
+                                             final int port) {
+        return new SmtpConfig(host, port, DEFAULT_TRANSPORT, null, null);
+    }
+
     public String getHost() {
         return host;
     }
@@ -110,7 +117,7 @@ public TransportStrategy getTransportStrategy() {
         switch (transport) {
             case "TLS", "SSL":
                 return TransportStrategy.SMTP_TLS;
-            case "plain":
+            case DEFAULT_TRANSPORT:
             default:
                 return TransportStrategy.SMTP;
         }

stroom-analytics/stroom-analytics-impl/src/test/java/stroom/analytics/impl/TestEmailSender.java

@@ -0,0 +1,53 @@
+package stroom.analytics.impl;
+
+import stroom.analytics.shared.AnalyticNotificationEmailDestination;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.UUID;
+
+@ExtendWith(MockitoExtension.class)
+class TestEmailSender {
+
+    @Mock
+    private AnalyticsConfig mockAnalyticsConfig;
+
+    @Disabled // manual only due to reliance on smtp.freesmtpservers.com
+    @Test
+    void send() {
+        // See https://www.wpoven.com/tools/free-smtp-server-for-testing to check the email sent
+        Mockito.when(mockAnalyticsConfig.getEmailConfig())
+                .thenReturn(new EmailConfig(
+                        SmtpConfig.unauthenticated("smtp.freesmtpservers.com", 25),
+                        "[email protected]",
+                        "Mr Foo"));
+
+        final EmailSender emailSender = new EmailSender(() -> mockAnalyticsConfig);
+
+        final AnalyticNotificationEmailDestination destination = AnalyticNotificationEmailDestination.builder()
+                .to("[email protected]")
+                .build();
+
+        final Detection detection = new Detection(
+                null,
+                "DetectorName",
+                UUID.randomUUID().toString(),
+                null,
+                null,
+                "Headline",
+                null,
+                null,
+                UUID.randomUUID().toString(),
+                null,
+                null,
+                null,
+                null);
+
+        emailSender.send(destination, detection);
+    }
+}

stroom-app/src/test/java/stroom/db/migration/TestListDbMigrations.java

@@ -8,6 +8,7 @@
 import com.google.common.base.Strings;
 import jakarta.validation.constraints.NotNull;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +32,8 @@
 import static stroom.util.ConsoleColour.RED;
 import static stroom.util.ConsoleColour.YELLOW;
 
+@Isolated // This is walking the file tree so doesn't like it if another test is mutating
+// the file tree at the same time.
 public class TestListDbMigrations {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TestListDbMigrations.class);

stroom-core-client-widget/src/main/java/stroom/widget/popup/client/event/ShowPopupEvent.java

@@ -21,6 +21,7 @@
 import stroom.widget.popup.client.presenter.PopupSize;
 import stroom.widget.popup.client.presenter.PopupType;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.shared.EventHandler;
 import com.google.gwt.event.shared.GwtEvent;
@@ -199,7 +200,6 @@ public Builder modeless() {
         }
 
         public Builder addAutoHidePartner(final Element... autoHidePartner) {
-
             this.autoHidePartners.addAll(GwtNullSafe.asList(autoHidePartner));
             return this;
         }
@@ -222,17 +222,21 @@ public Builder onHide(final HidePopupEvent.Handler handler) {
         public void fire() {
             // By default, we will automatically hide popups unless they have a handler that alters the behaviour.
             if (hideRequestHandler == null) {
-                hideRequestHandler = e -> HidePopupEvent.builder(presenterWidget)
-                        .autoClose(e.isAutoClose())
-                        .ok(e.isOk())
-                        .fire();
+                hideRequestHandler = e -> {
+                    GWT.log("isOk: " + e.isOk());
+                    HidePopupEvent.builder(presenterWidget)
+                            .autoClose(e.isAutoClose())
+                            .ok(e.isOk())
+                            .fire();
+                };
             }
 
             Element[] elements = null;
             if (GwtNullSafe.hasItems(autoHidePartners)) {
                 elements = autoHidePartners.toArray(new Element[0]);
             }
 
+//            if (!presenterWidget.getView().asWidget().isVisible()) {
             presenterWidget.fireEvent(new ShowPopupEvent(
                     presenterWidget,
                     popupType,
@@ -244,6 +248,7 @@ public void fire() {
                     hideHandler,
                     modal,
                     elements));
+//            }
         }
     }
 }

stroom-core-client/src/main/java/stroom/dashboard/client/main/SearchModel.java

@@ -49,6 +49,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public class SearchModel {
 
@@ -400,15 +401,12 @@ private void poll(Fetch fetch, final boolean storeHistory) {
      * @return A result component map.
      */
     private Map<String, ComponentSettings> createComponentSettingsMap() {
-        if (componentMap.size() > 0) {
-            final Map<String, ComponentSettings> resultComponentMap = new HashMap<>();
-            for (final Entry<String, ResultComponent> entry : componentMap.entrySet()) {
-                final String componentId = entry.getKey();
-                final ResultComponent resultComponent = entry.getValue();
-                final ComponentSettings componentSettings = resultComponent.getSettings();
-                resultComponentMap.put(componentId, componentSettings);
-            }
-            return resultComponentMap;
+        if (!componentMap.isEmpty()) {
+            return componentMap.entrySet()
+                    .stream()
+                    .collect(Collectors.toMap(
+                            Entry::getKey,
+                            entry -> entry.getValue().getSettings()));
         }
         return null;
     }

stroom-core-client/src/main/java/stroom/entity/client/presenter/InfoDocumentPresenter.java

@@ -50,6 +50,7 @@ public class InfoDocumentPresenter
         implements ShowInfoDocumentDialogEvent.Handler {
 
     private final DateTimeFormatter dateTimeFormatter;
+    private boolean isShowing = false;
 
     @Inject
     public InfoDocumentPresenter(final EventBus eventBus,
@@ -68,13 +69,23 @@ protected void onBind() {
 
     @Override
     protected void revealInParent() {
-        final PopupSize popupSize = PopupSize.resizable(500, 500);
-        ShowPopupEvent.builder(this)
-                .popupType(PopupType.CLOSE_DIALOG)
-                .popupSize(popupSize)
-                .caption("Info")
-                .onShow(e -> getView().focus())
-                .fire();
+        // Popup is not modal so, allow the user to click Info for another doc
+        // which will just update the view and not need a new show event.
+        if (!isShowing) {
+            final PopupSize popupSize = PopupSize.resizable(500, 500);
+            ShowPopupEvent.builder(this)
+                    .popupType(PopupType.CLOSE_DIALOG)
+                    .popupSize(popupSize)
+                    .caption("Info")
+                    .onShow(e -> {
+                        getView().focus();
+                        isShowing = true;
+                    })
+                    .onHide(e -> {
+                        isShowing = false;
+                    })
+                    .fire();
+        }
     }
 
     @ProxyEvent
@@ -135,8 +146,6 @@ public void onCreate(final ShowInfoDocumentDialogEvent event) {
                     .sorted()
                     .forEach(tag ->
                             appendLine("\t", tag, sb));
-
-
 //            sb.append(CopyTextUtil.div("infoLine", sbInner.toSafeHtml()));
         }
 
@@ -156,11 +165,12 @@ private void appendKey(final String key, final SafeHtmlBuilder sb) {
         sb.appendHtmlConstant("<b>");
         sb.appendEscaped(key);
         sb.appendHtmlConstant("</b>");
-        if (key.trim().length() > 0) {
+        if (!GwtNullSafe.isBlankString(key)) {
             sb.appendEscaped(": ");
         }
     }
 
+
     // --------------------------------------------------------------------------------
 
 
@@ -169,6 +179,10 @@ public interface InfoDocumentView extends View, Focus {
         void setInfo(SafeHtml info);
     }
 
+
+    // --------------------------------------------------------------------------------
+
+
     @ProxyCodeSplit
     public interface InfoDocumentProxy extends Proxy<InfoDocumentPresenter> {
 

stroom-core-client/src/main/java/stroom/query/client/presenter/QueryEditPresenter.java

@@ -38,6 +38,7 @@
 import stroom.query.client.presenter.QueryEditPresenter.QueryEditView;
 import stroom.query.client.view.QueryResultTabsView;
 import stroom.util.shared.DefaultLocation;
+import stroom.util.shared.GwtNullSafe;
 import stroom.util.shared.Indicators;
 import stroom.util.shared.Severity;
 import stroom.util.shared.StoredError;
@@ -60,6 +61,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import javax.inject.Provider;
@@ -154,7 +156,7 @@ public void setData(final Result componentResult) {
                     }
 
                     final QLVisResult visResult = (QLVisResult) componentResult;
-                    if (visResult.getJsonData() != null && visResult.getJsonData().length() > 0) {
+                    if (!GwtNullSafe.isBlankString(visResult.getJsonData())) {
                         hasData = true;
                         setVisHidden(false);
                     }
@@ -339,7 +341,10 @@ private void stop() {
 
     private void run(final boolean incremental,
                      final boolean storeHistory) {
-        queryInfo.prompt(() -> run(incremental, storeHistory, Function.identity()));
+        // No point running the search if there is no query
+        if (!GwtNullSafe.isBlankString(editorPresenter.getText())) {
+            queryInfo.prompt(() -> run(incremental, storeHistory, Function.identity()));
+        }
     }
 
     private void run(final boolean incremental,
@@ -361,7 +366,6 @@ private void run(final boolean incremental,
                 incremental,
                 storeHistory,
                 queryInfo.getMessage());
-//        }
     }
 
     public TimeRange getTimeRange() {
@@ -378,7 +382,8 @@ public void setQuery(final DocRef docRef, final String query, final boolean read
         queryModel.init(docRef.getUuid());
         if (query != null) {
             reading = true;
-            if (editorPresenter.getText().length() == 0 || !editorPresenter.getText().equals(query)) {
+            if (GwtNullSafe.isBlankString(editorPresenter.getText())
+                    || !Objects.equals(editorPresenter.getText(), query)) {
                 editorPresenter.setText(query);
                 queryHelpPresenter.setQuery(query);
             }