Add binding for modern routing key

Author: olle

ui/src/main/java/com/studiomediatech/queryresponse/ui/messaging/MessagingConfig.java

@@ -14,31 +14,39 @@
 import com.studiomediatech.queryresponse.QueryResponseTopicExchange;
 
 /**
- * Configuration for ports that enable messaging, specifically AMQP including Query/Response.
+ * Configuration for ports that enable messaging, specifically AMQP including
+ * Query/Response.
  */
 @Configuration
 @EnableQueryResponse
 @ComponentScan(basePackageClasses = MessagingConfig.class)
 public class MessagingConfig {
 
-    static final String QUERY_RESPONSE_STATS_QUEUE_BEAN = "queryResponseStatsQueue";
-    static final String QUERY_RESPONSE_QUERIES_QUEUE_BEAN = "queryResponseQueriesQueue";
-    static final String QUERY_RESPONSE_STATS_QUEUE_BINDING_BEAN = "queryResponseQueriesQueueBinding";
-    static final String QUERY_RESPONSE_INTERNAL_STATS_ROUTING_KEY = "query-response/internal/stats";
-
-    @Bean
-    ConnectionNameStrategy connectionNameStrategy(Environment env) {
-        return connectionFactory -> env.getProperty("spring.application.name", "query-response-ui");
-    }
-
-    @Bean(QUERY_RESPONSE_STATS_QUEUE_BEAN)
-    Queue queryResponseStatsQueue() {
-        return new AnonymousQueue();
-    }
-
-    @Bean(QUERY_RESPONSE_STATS_QUEUE_BINDING_BEAN)
-    Binding queryResponseStatsQueueBinding(QueryResponseTopicExchange queryResponseTopicExchange) {
-        return BindingBuilder.bind(queryResponseStatsQueue()).to(queryResponseTopicExchange)
-                .with(QUERY_RESPONSE_INTERNAL_STATS_ROUTING_KEY);
-    }
+	static final String QUERY_RESPONSE_STATS_QUEUE_BEAN = "queryResponseStatsQueue";
+	static final String QUERY_RESPONSE_QUERIES_QUEUE_BEAN = "queryResponseQueriesQueue";
+
+	protected static final String QUERY_RESPONSE_STATS_BINDING = "queryResponseStatsBinding";
+	protected static final String QUERY_RESPONSE_TELEMETRY_BINDING = "queryResponseTelemetryBinding";
+
+	@Bean
+	ConnectionNameStrategy connectionNameStrategy(Environment env) {
+		return connectionFactory -> env.getProperty("spring.application.name", "query-response-ui");
+	}
+
+	@Bean(QUERY_RESPONSE_STATS_QUEUE_BEAN)
+	Queue queryResponseStatsQueue() {
+		return new AnonymousQueue();
+	}
+
+	@Bean(QUERY_RESPONSE_STATS_BINDING)
+	Binding queryResponseStatsQueueBinding(QueryResponseTopicExchange queryResponseTopicExchange) {
+		return BindingBuilder.bind(queryResponseStatsQueue()).to(queryResponseTopicExchange)
+				.with("query-response/internal/stats");
+	}
+
+	@Bean(QUERY_RESPONSE_TELEMETRY_BINDING)
+	Binding queryResponseTelemetryQueueBinding(QueryResponseTopicExchange queryResponseTopicExchange) {
+		return BindingBuilder.bind(queryResponseStatsQueue()).to(queryResponseTopicExchange)
+				.with("query-response/internal/telemetry");
+	}
 }

ui/src/test/java/com/studiomediatech/queryresponse/ui/messaging/MessagingConfigIT.java

@@ -21,10 +21,23 @@ void ensure_has_telemetry_queue_with_binding() {
         Queue queue = (Queue) ctx.getBean(MessagingConfig.QUERY_RESPONSE_STATS_QUEUE_BEAN);
         assertThat(queue).isNotNull();
 
-        Binding binding = (Binding) ctx.getBean(MessagingConfig.QUERY_RESPONSE_STATS_QUEUE_BINDING_BEAN);
+        Binding binding = (Binding) ctx.getBean(MessagingConfig.QUERY_RESPONSE_STATS_BINDING);
         assertThat(binding).isNotNull();
         assertThat(binding.getDestination()).isEqualTo(queue.getName());
         assertThat(binding.getRoutingKey()).isEqualTo("query-response/internal/stats");
         assertThat(binding.getExchange()).isEqualTo("query-response");
     }
+    
+    @Test
+	void ensure_has_telemetry_queue_with_modernised_binding() throws Exception {
+    	
+        Queue queue = (Queue) ctx.getBean(MessagingConfig.QUERY_RESPONSE_STATS_QUEUE_BEAN);
+        assertThat(queue).isNotNull();
+
+        Binding binding = (Binding) ctx.getBean(MessagingConfig.QUERY_RESPONSE_TELEMETRY_BINDING);
+        assertThat(binding).isNotNull();
+        assertThat(binding.getDestination()).isEqualTo(queue.getName());
+        assertThat(binding.getRoutingKey()).isEqualTo("query-response/internal/telemetry");
+        assertThat(binding.getExchange()).isEqualTo("query-response");
+	}
 }