HTM-2016: Create a separate SseEventBus bean for the viewer so viewers don't get aministrative braodcasts

Author: mprins

src/main/java/org/tailormap/api/configuration/TailormapConfig.java

@@ -5,8 +5,23 @@
  */
 package org.tailormap.api.configuration;
 
+import ch.rasc.sse.eventbus.DataObjectConverter;
+import ch.rasc.sse.eventbus.DefaultDataObjectConverter;
+import ch.rasc.sse.eventbus.DefaultSubscriptionRegistry;
+import ch.rasc.sse.eventbus.DistributedEventBus;
+import ch.rasc.sse.eventbus.JacksonDataObjectConverter;
+import ch.rasc.sse.eventbus.ReplayStore;
+import ch.rasc.sse.eventbus.SseEventBus;
+import ch.rasc.sse.eventbus.SubscriptionRegistry;
 import ch.rasc.sse.eventbus.config.EnableSseEventBus;
+import ch.rasc.sse.eventbus.config.SseEventBusConfigurer;
+import ch.rasc.sse.eventbus.observation.SseEventBusObservationConvention;
+import io.micrometer.observation.ObservationRegistry;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
+import org.jspecify.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -15,6 +30,7 @@
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
+import tools.jackson.databind.ObjectMapper;
 
 @Configuration
 @EnableConfigurationProperties
@@ -42,4 +58,39 @@ public LocaleResolver localeResolver() {
     resolver.setDefaultLocale(Locale.of(defaultLanguage));
     return resolver;
   }
+
+  // New viewer SseEventBus bean for viewer-specific SSE traffic.
+  @Bean("viewerSseEventBus")
+  public SseEventBus viewerSseEventBus(
+      @Autowired(required = false) @Nullable SseEventBusConfigurer configurer,
+      @Autowired(required = false) @Nullable ObjectMapper objectMapper,
+      @Autowired(required = false) @Nullable List<DataObjectConverter> dataObjectConverters,
+      @Autowired(required = false) @Nullable SubscriptionRegistry subscriptionRegistry,
+      @Autowired(required = false) @Nullable ReplayStore replayStore,
+      @Autowired(required = false) @Nullable ObservationRegistry observationRegistry,
+      @Autowired(required = false) @Nullable SseEventBusObservationConvention observationConvention,
+      @Autowired(required = false) @Nullable DistributedEventBus distributedEventBus) {
+
+    // Apply same defaults as DefaultSseEventBusConfiguration
+    SseEventBusConfigurer config = configurer != null
+        ? configurer
+        : new SseEventBusConfigurer() {
+          /* defaults */
+        };
+
+    SubscriptionRegistry registry =
+        subscriptionRegistry != null ? subscriptionRegistry : new DefaultSubscriptionRegistry();
+
+    ReplayStore store = replayStore != null ? replayStore : config.replayStore();
+
+    List<DataObjectConverter> converters = dataObjectConverters != null ? dataObjectConverters : new ArrayList<>();
+    if (objectMapper != null) {
+      converters.add(new JacksonDataObjectConverter(objectMapper));
+    } else {
+      converters.add(new DefaultDataObjectConverter());
+    }
+
+    return new SseEventBus(
+        config, registry, converters, store, observationRegistry, observationConvention, distributedEventBus);
+  }
 }

src/main/java/org/tailormap/api/controller/ServerSentEventsController.java

@@ -12,6 +12,7 @@
 import java.lang.invoke.MethodHandles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +34,7 @@ public class ServerSentEventsController {
 
   private final JsonMapper jsonMapper;
 
-  public ServerSentEventsController(SseEventBus eventBus, JsonMapper jsonMapper) {
+  public ServerSentEventsController(@Qualifier("viewerSseEventBus") SseEventBus eventBus, JsonMapper jsonMapper) {
     this.eventBus = eventBus;
     // force unindented/single line output for SSE messages, because we may have set
     // spring.jackson.serialization.indent_output=true for debugging/development/test

src/main/java/org/tailormap/api/service/CreateLayerExtractService.java

@@ -48,6 +48,7 @@
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -89,7 +90,9 @@ public class CreateLayerExtractService {
   private boolean exactWfsCounts;
 
   public CreateLayerExtractService(
-      SseEventBus eventBus, JsonMapper jsonMapper, FeatureSourceFactoryHelper featureSourceFactoryHelper) {
+      @Qualifier("viewerSseEventBus") SseEventBus eventBus,
+      JsonMapper jsonMapper,
+      FeatureSourceFactoryHelper featureSourceFactoryHelper) {
     this.eventBus = eventBus;
     this.featureSourceFactoryHelper = featureSourceFactoryHelper;
     // force unindented/single line output for SSE messages, because we may have set