Merge pull request #77 from olle/ui/api-for-frontend

Update Spring Boot

Author: olle

src/main/java/com/studiomediatech/queryresponse/QueryResponseConfiguration.java

@@ -59,12 +59,12 @@ AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
     }
 
     @Bean
-    RabbitFacade rabbitFacade(RabbitAdmin rabbitAdmin, ConnectionFactory connectionFactory,
-            TopicExchange queriesExchange, GenericApplicationContext ctx) {
+    RabbitFacade rabbitFacade(AmqpAdmin amqpAdmin, ConnectionFactory connectionFactory, TopicExchange queriesExchange,
+            GenericApplicationContext ctx) {
 
         RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);
 
-        return new RabbitFacade(rabbitAdmin, rabbitTemplate, connectionFactory, queriesExchange, ctx);
+        return new RabbitFacade(amqpAdmin, rabbitTemplate, connectionFactory, queriesExchange, ctx);
     }
 
     @Bean

src/main/java/com/studiomediatech/queryresponse/RabbitFacade.java

@@ -4,6 +4,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.amqp.core.AcknowledgeMode;
+import org.springframework.amqp.core.AmqpAdmin;
 import org.springframework.amqp.core.AnonymousQueue;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Binding.DestinationType;
@@ -15,7 +16,6 @@
 import org.springframework.amqp.core.NamingStrategy;
 import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.context.support.GenericApplicationContext;
@@ -30,7 +30,7 @@ class RabbitFacade implements Loggable {
 
     public static final String HEADER_X_QR_PUBLISHED = "x-qr-published";
 
-    private final RabbitAdmin admin;
+    private final AmqpAdmin admin;
     private final ConnectionFactory connectionFactory;
     private final RabbitTemplate template;
     private final GenericApplicationContext ctx;
@@ -39,10 +39,10 @@ class RabbitFacade implements Loggable {
 
     protected final Map<String, DirectMessageListenerContainer> containers = new ConcurrentHashMap<>();
 
-    public RabbitFacade(RabbitAdmin admin, RabbitTemplate template, ConnectionFactory connectionFactory,
+    public RabbitFacade(AmqpAdmin amqpAdmin, RabbitTemplate template, ConnectionFactory connectionFactory,
             TopicExchange queriesExchange, GenericApplicationContext ctx) {
 
-        this.admin = admin;
+        this.admin = amqpAdmin;
         this.template = template;
         this.connectionFactory = connectionFactory;
         this.queriesExchange = queriesExchange;

ui/Makefile

@@ -1,18 +1,19 @@
 JAVA_HOME=$(shell unset JAVA_HOME; /usr/libexec/java_home -v 21)
+MVN := ../mvnw
 
-.PHONY: run build test verify clean tidy
+.PHONY: run build test verify v clean tidy
 
 run:
-	mvn spring-boot:run
+	${MVN} spring-boot:run
 
-test verify:
-	mvn clean verify
+test verify v:
+	${MVN} clean verify
 
 build:
-	mvn clean package
+	${MVN} clean package
 
 clean:
 	rm -rf target/
 
 tidy:
-	mvn formatter:format
+	${MVN} formatter:format

ui/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.3</version>
         <relativePath />
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.studiomediatech</groupId>
             <artifactId>query-response-spring-amqp</artifactId>
-            <version>0.9.0-SB3_0_3-SNAPSHOT</version>
+            <version>0.9.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

ui/src/main/java/com/studiomediatech/QueryPublisher.java

@@ -9,14 +9,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.ToLongFunction;
 import java.util.stream.Collectors;
@@ -34,9 +32,9 @@
 import com.studiomediatech.queryresponse.ui.QueryResponseUIApp;
 import com.studiomediatech.queryresponse.ui.api.RestApiAdapter;
 import com.studiomediatech.queryresponse.ui.api.WebSocketApiHandler;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
-public class QueryPublisher implements Logging, RestApiAdapter {
+public class QueryPublisher implements Loggable, RestApiAdapter {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
@@ -119,7 +117,7 @@ private Collection<Object> queryStrict(String q, int timeout, int limit, List<Ob
     @EventListener
     void on(QueryRecordedEvent event) {
 
-        log().info("HANDLING {}", event);
+        logger().info("HANDLING {}", event);
 
         String query = event.getQuery();
         long timeout = event.getTimeout();
@@ -146,13 +144,13 @@ void onQueryResponseStats(Message message) {
         try {
             handle(MAPPER.readValue(message.getBody(), Stats.class).elements);
         } catch (RuntimeException | IOException ex) {
-            log().error("Failed to consumed stats", ex);
+            logger().error("Failed to consumed stats", ex);
         }
     }
 
     protected void handle(Collection<Stat> stats) {
 
-        stats.forEach(stat -> log().debug("GOT STAT: {}", stat));
+        stats.forEach(stat -> logger().debug("GOT STAT: {}", stat));
 
         handleCounts(stats);
         handleLatencies(stats);

ui/src/main/java/com/studiomediatech/queryresponse/ui/api/WebSocketApiHandler.java

@@ -20,9 +20,9 @@
 import com.studiomediatech.Stat;
 import com.studiomediatech.events.EventEmitter;
 import com.studiomediatech.events.QueryRecordedEvent;
-import com.studiomediatech.queryresponse.util.Logging;
+import com.studiomediatech.queryresponse.util.Loggable;
 
-public class WebSocketApiHandler extends TextWebSocketHandler implements Logging {
+public class WebSocketApiHandler extends TextWebSocketHandler implements Loggable {
 
     private static final int SEND_TIME_LIMIT = 6 * 1000;
     private static final int SEND_BUFFER_SIZE_LIMIT = 512 * 1024;
@@ -43,7 +43,7 @@ public WebSocketApiHandler(EventEmitter emitter) {
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
 
-        log().info("CONNECTED {}", session);
+        logger().info("CONNECTED {}", session);
 
         sessionsById.put(session.getId(),
                 new ConcurrentWebSocketSessionDecorator(session, SEND_TIME_LIMIT, SEND_BUFFER_SIZE_LIMIT));
@@ -112,7 +112,7 @@ public void handleNodes(Map<String, List<Stat>> nodes) {
 
             publishTextMessageWithPayload(sb.toString());
         } catch (JsonProcessingException e) {
-            log().error("Failed to create nodes payload", e);
+            logger().error("Failed to create nodes payload", e);
         }
     }
 
@@ -124,7 +124,7 @@ private void publishTextMessageWithPayload(String json) {
             try {
                 s.sendMessage(message);
             } catch (IOException e) {
-                log().error("Could not publish text message to websocket", e);
+                logger().error("Could not publish text message to websocket", e);
             }
         }
     }
@@ -151,15 +151,15 @@ private void publishTextMessageWithPayloadToSession(String id, String json) {
         WebSocketSession s = sessionsById.get(id);
 
         if (s == null) {
-            log().warn("Could not find websocket session for {} in {}", id, sessionsById);
+            logger().warn("Could not find websocket session for {} in {}", id, sessionsById);
 
             return;
         }
 
         try {
             s.sendMessage(message);
         } catch (IOException e) {
-            log().error("Could not publish text message to websocket", e);
+            logger().error("Could not publish text message to websocket", e);
         }
     }
 }