Rebased on main

olle · olle · commit 6719e1e9f24c · 2025-05-25T10:16:16.000+02:00
diff --git a/ui/src/main/java/com/studiomediatech/QueryPublisher.java b/ui/src/main/java/com/studiomediatech/QueryPublisher.java
@@ -1,5 +1,6 @@
 package com.studiomediatech;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -16,22 +17,29 @@
 import java.util.function.ToLongFunction;
 import java.util.stream.Collectors;
 
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.context.event.EventListener;
 import org.springframework.util.StringUtils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.studiomediatech.events.QueryRecordedEvent;
 import com.studiomediatech.queryresponse.QueryBuilder;
 import com.studiomediatech.queryresponse.ui.api.WebSocketApiHandlerPort;
+import com.studiomediatech.queryresponse.ui.app.QueryResponseUIApp;
 import com.studiomediatech.queryresponse.ui.app.adapter.RestApiAdapter;
 import com.studiomediatech.queryresponse.ui.messaging.Stat;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.ui.messaging.Stats;
+import com.studiomediatech.queryresponse.util.Loggable;
 
 public class QueryPublisher implements Loggable, RestApiAdapter {
 
     // This is a Fib!
     private static final int MAX_SIZE = 2584;
     private static final int SLIDING_WINDOW = 40;
 
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
     static ToLongFunction<Stat> statToLong = s -> ((Number) s.value()).longValue();
 
     private List<Stat> queries = new LinkedList<>();
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/api/RestApiControllerPort.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/api/RestApiControllerPort.java
@@ -36,12 +36,6 @@ public Map<String, Object> nodes() {
         return adapter.nodes();
     }
 
-    @GetMapping("/api/v1")
-    public Map<String, Object> v1() {
-        return Response.from(Map.of("version", "v1", "now", Instant.now())).withLinks("query-response",
-                "/api/v1?q=query");
-    }
-
     @GetMapping(path = "/api/v1", params = "q")
     public Map<String, Object> query(String q, // NOSONAR
             @RequestParam(name = "timeout", required = false, defaultValue = "0") int timeout,
@@ -55,6 +49,12 @@ public Map<String, Object> query(String q, // NOSONAR
         return adapter.query(q, normalizedTimeout, normalizedLimit);
     }
 
+    @GetMapping(path = "/api/v1", params = "!q")
+    public Map<String, Object> v1() {
+        return Response.from(Map.of("version", "v1", "now", Instant.now())).withLinks("query-response",
+                "/api/v1?q=query");
+    }
+
     protected interface Response {
         public static ResponseBuilder from(Map<String, Object> map) {
             return new ResponseBuilder(map);
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/api/WebSocketApiHandlerPort.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/api/WebSocketApiHandlerPort.java
@@ -19,15 +19,13 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.studiomediatech.events.QueryRecordedEvent;
-import com.studiomediatech.queryresponse.stats.Stat;
-import com.studiomediatech.queryresponse.util.Loggable;
 import com.studiomediatech.queryresponse.ui.app.adapter.EventEmitterAdapter;
 import com.studiomediatech.queryresponse.ui.app.adapter.WebSocketApiAdapter;
 import com.studiomediatech.queryresponse.ui.messaging.Stat;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
 @Component
-public class WebSocketApiHandlerPort extends TextWebSocketHandler implements WebSocketApiAdapter, Logging {
+public class WebSocketApiHandlerPort extends TextWebSocketHandler implements WebSocketApiAdapter, Loggable {
 
     private static final int SEND_TIME_LIMIT = 6 * 1000;
     private static final int SEND_BUFFER_SIZE_LIMIT = 512 * 1024;
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/QueryResponseUIApp.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/QueryResponseUIApp.java
@@ -14,6 +14,8 @@
 @SpringBootApplication
 public class QueryResponseUIApp {
 
+    public static final String QUERY_RESPONSE_STATS_QUEUE_BEAN = "queryResponseStatsBean";
+
     public static void main(String[] args) {
         SpringApplication.run(QueryResponseUIApp.class);
     }
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/adapter/TelemetryHandlerAdapter.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/adapter/TelemetryHandlerAdapter.java
@@ -1,12 +1,12 @@
 package com.studiomediatech.queryresponse.ui.app.adapter;
 
 import com.studiomediatech.queryresponse.ui.messaging.Stats;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
 /**
  * Declares the capabilities of the incoming side for statistics to aggregate.
  */
-public interface TelemetryHandlerAdapter extends Logging {
+public interface TelemetryHandlerAdapter extends Loggable {
 
     static TelemetryHandlerAdapter empty() {
         return new TelemetryHandlerAdapter() {
@@ -15,6 +15,6 @@ static TelemetryHandlerAdapter empty() {
     }
 
     default void handleConsumed(Stats stats) {
-        log().warn("NOT YET HANDLING {}", stats);
+        logger().warn("NOT YET HANDLING {}", stats);
     }
 }
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/adapter/WebSocketApiAdapter.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/adapter/WebSocketApiAdapter.java
@@ -3,9 +3,9 @@
 import java.util.Collection;
 
 import com.studiomediatech.queryresponse.ui.app.telemetry.Node;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
-public interface WebSocketApiAdapter extends Logging {
+public interface WebSocketApiAdapter extends Loggable {
 
     static WebSocketApiAdapter empty() {
         return new WebSocketApiAdapter() {
@@ -14,6 +14,6 @@ static WebSocketApiAdapter empty() {
     }
 
     default void publishNodes(Collection<Node> nodes) {
-        log().warn("NOT PUBLISHING NODES! {}", nodes);
+        logger().warn("NOT PUBLISHING NODES! {}", nodes);
     }
 }
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/telemetry/Node.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/telemetry/Node.java
@@ -5,9 +5,9 @@
 
 import org.springframework.util.Assert;
 
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
-public class Node implements Logging {
+public class Node implements Loggable {
 
     public static final Comparator<Node> SORT = Comparator.comparing(Node::getName).thenComparing(Node::getUUID);
 
@@ -37,7 +37,7 @@ public Node update(Node other) {
 
         Assert.isTrue(other.uuid.equals(this.uuid), "Must be same node.");
 
-        log().info("Updating {} with {}", this, other);
+        logger().info("Updating {} with {}", this, other);
 
         this.host = other.host;
         this.name = other.name;
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/telemetry/TelemetryService.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/app/telemetry/TelemetryService.java
@@ -6,15 +6,15 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import com.studiomediatech.queryresponse.ui.app.adapter.TelemetryHandlerAdapter;
 import com.studiomediatech.queryresponse.ui.app.adapter.QueryPublisherAdapter;
 import com.studiomediatech.queryresponse.ui.app.adapter.RestApiAdapter;
+import com.studiomediatech.queryresponse.ui.app.adapter.TelemetryHandlerAdapter;
 import com.studiomediatech.queryresponse.ui.app.adapter.WebSocketApiAdapter;
 import com.studiomediatech.queryresponse.ui.messaging.Stat;
 import com.studiomediatech.queryresponse.ui.messaging.Stats;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
-public class TelemetryService implements Logging, TelemetryHandlerAdapter, RestApiAdapter {
+public class TelemetryService implements Loggable, TelemetryHandlerAdapter, RestApiAdapter {
 
     private final WebSocketApiAdapter webSocketApiAdapter;
     private final NodeRepository nodeRepository;
@@ -40,7 +40,7 @@ public Map<String, Object> nodes() {
     @Override
     public void handleConsumed(Stats stats) {
 
-        log().info("Consumed stats with {} elements", stats.elements().size());
+        logger().info("Consumed stats with {} elements", stats.elements().size());
 
         Collection<Node> nodes = parseToNodesCollection(stats);
         updateNodes(nodes);
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/infra/adapter/TelemetryServiceAdapter.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/infra/adapter/TelemetryServiceAdapter.java
@@ -4,10 +4,10 @@
 import org.springframework.stereotype.Component;
 
 import com.studiomediatech.queryresponse.ui.app.telemetry.TelemetryService;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
 @Component
-public class TelemetryServiceAdapter implements Logging {
+public class TelemetryServiceAdapter implements Loggable {
 
     private final TelemetryService service;
 
@@ -17,7 +17,7 @@ public TelemetryServiceAdapter(TelemetryService service) {
 
     @Scheduled(fixedDelayString = "PT3S")
     public void aFewSecondsHasPassed() {
-        log().info("TIC TOC!");
+        logger().info("TIC TOC!");
         service.publishNodes();
     }
 
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/messaging/QueryPublisherPort.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/messaging/QueryPublisherPort.java
@@ -11,10 +11,10 @@
 import com.studiomediatech.events.QueryRecordedEvent;
 import com.studiomediatech.queryresponse.QueryBuilder;
 import com.studiomediatech.queryresponse.ui.app.adapter.QueryPublisherAdapter;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
 @Component
-public class QueryPublisherPort implements Logging, QueryPublisherAdapter {
+public class QueryPublisherPort implements Loggable, QueryPublisherAdapter {
 
     private static final int DEFAULT_QUERY_TIMEOUT = 1500;
 
diff --git a/ui/src/main/java/com/studiomediatech/queryresponse/ui/messaging/TelemetryConsumerPort.java b/ui/src/main/java/com/studiomediatech/queryresponse/ui/messaging/TelemetryConsumerPort.java
@@ -10,14 +10,14 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.studiomediatech.queryresponse.ui.app.adapter.TelemetryHandlerAdapter;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
 /**
  * Consumes Query/Response telemetry messages from the internal topics, and directly delegates for handling via the
  * abstract adapter.
  */
 @Component
-class TelemetryConsumerPort implements Logging {
+class TelemetryConsumerPort implements Loggable {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
@@ -42,7 +42,7 @@ void onQueryResponseStats(Message message) {
             Stats stats = MAPPER.readValue(message.getBody(), Stats.class);
             adapter.handleConsumed(stats);
         } catch (RuntimeException | IOException ex) {
-            log().error("Failed to consumed telemetry message", ex);
+            logger().error("Failed to consumed telemetry message", ex);
         }
     }
 }
diff --git a/ui/src/test/java/com/studiomediatech/queryresponse/ui/api/RestApiControllerPortTest.java b/ui/src/test/java/com/studiomediatech/queryresponse/ui/api/RestApiControllerPortTest.java
@@ -24,7 +24,7 @@ void setup() {
 
     @Test
     void ensureHandlesQueryRequest() throws Exception {
-        mockMvc.perform(get("/api/v1/").param("q", "hello")).andExpect(status().isOk());
+        mockMvc.perform(get("/api/v1").param("q", "hello")).andExpect(status().isOk());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`@SpringBootApplication`
`15`	`15`	`public class QueryResponseUIApp {`
`16`	`16`
	`17`	`+ public static final String QUERY_RESPONSE_STATS_QUEUE_BEAN = "queryResponseStatsBean";`
	`18`	`+`
`17`	`19`	`public static void main(String[] args) {`
`18`	`20`	`SpringApplication.run(QueryResponseUIApp.class);`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`package com.studiomediatech.queryresponse.ui.app.adapter;`
`2`	`2`
`3`	`3`	`import com.studiomediatech.queryresponse.ui.messaging.Stats;`
`4`		`-import com.studiomediatech.queryresponse.util.Logging;`
	`4`	`+import com.studiomediatech.queryresponse.util.Loggable;`
`5`	`5`
`6`	`6`	`/**`
`7`	`7`	`* Declares the capabilities of the incoming side for statistics to aggregate.`
`8`	`8`	`*/`
`9`		`-public interface TelemetryHandlerAdapter extends Logging {`
	`9`	`+public interface TelemetryHandlerAdapter extends Loggable {`
`10`	`10`
`11`	`11`	`static TelemetryHandlerAdapter empty() {`
`12`	`12`	`return new TelemetryHandlerAdapter() {`
`@@ -15,6 +15,6 @@ static TelemetryHandlerAdapter empty() {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`default void handleConsumed(Stats stats) {`
`18`		`- log().warn("NOT YET HANDLING {}", stats);`
	`18`	`+ logger().warn("NOT YET HANDLING {}", stats);`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`import java.util.Collection;`
`4`	`4`
`5`	`5`	`import com.studiomediatech.queryresponse.ui.app.telemetry.Node;`
`6`		`-import com.studiomediatech.queryresponse.util.Logging;`
	`6`	`+import com.studiomediatech.queryresponse.util.Loggable;`
`7`	`7`
`8`		`-public interface WebSocketApiAdapter extends Logging {`
	`8`	`+public interface WebSocketApiAdapter extends Loggable {`
`9`	`9`
`10`	`10`	`static WebSocketApiAdapter empty() {`
`11`	`11`	`return new WebSocketApiAdapter() {`
`@@ -14,6 +14,6 @@ static WebSocketApiAdapter empty() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`default void publishNodes(Collection<Node> nodes) {`
`17`		`- log().warn("NOT PUBLISHING NODES! {}", nodes);`
	`17`	`+ logger().warn("NOT PUBLISHING NODES! {}", nodes);`
`18`	`18`	`}`
`19`	`19`	`}`