fix (dispatcher): deactivate publisher confirms (keep only publisher returns)

Author: bou3108

hub/dispatcher/src/main/resources/application-local.yaml

@@ -2,7 +2,6 @@ spring:
   rabbitmq:
     host: localhost
     port: 5671
-    publisher-confirm-type: correlated
     publisher-returns: true
     template:
       mandatory: true

hub/dispatcher/src/main/resources/application.properties

@@ -12,7 +12,6 @@ spring.rabbitmq.ssl.trust-store=file:/certs/trustStore
 # https://docs.spring.io/spring-amqp/reference/html/#cf-pub-conf-ret
 # https://docs.spring.io/spring-amqp/reference/html/#template-confirms
 # https://github.com/spring-projects/spring-amqp-samples/tree/main/spring-rabbit-confirms-returns
-spring.rabbitmq.publisher-confirm-type=correlated
 spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 

hub/dispatcher/src/test/java/com/hubsante/hub/service/RabbitIntegrationAbstract.java

@@ -102,6 +102,16 @@ public void cleanUp() throws IOException, InterruptedException {
 
     protected RabbitTemplate getCustomRabbitTemplate(String p12Path, String p12Passphrase)
             throws Exception {
+        return getCustomRabbitTemplate(
+                p12Path, p12Passphrase, CachingConnectionFactory.ConfirmType.NONE);
+    }
+
+    // overload for tests needing setConfirmCallback (e.g.
+    // publishWithAuthorizedButInconsistentRoutingKeyFails) to observe a broker-side nack,
+    // independently of the Dispatcher's own publisher-confirm-type setting
+    protected RabbitTemplate getCustomRabbitTemplate(
+            String p12Path, String p12Passphrase, CachingConnectionFactory.ConfirmType confirmType)
+            throws Exception {
         com.rabbitmq.client.ConnectionFactory cf = new com.rabbitmq.client.ConnectionFactory();
         cf.setHost(rabbitMQContainer.getHost());
         cf.setPort(rabbitMQContainer.getAmqpsPort());
@@ -112,7 +122,7 @@ protected RabbitTemplate getCustomRabbitTemplate(String p12Path, String p12Passp
 
         cf.setSaslConfig(DefaultSaslConfig.EXTERNAL);
         CachingConnectionFactory ccf = new CachingConnectionFactory(cf);
-        ccf.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED);
+        ccf.setPublisherConfirmType(confirmType);
         ccf.setPublisherReturns(true);
 
         return new RabbitTemplate(ccf);
@@ -152,7 +162,6 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
 
                             // must be set to handle PublisherConfirms in other RabbitTemplates,
                             // even if we don't use it in Dispatcher
-                            "spring.rabbitmq.publisher-confirm-type=correlated",
                             "spring.rabbitmq.publisher-returns=true",
                             "spring.rabbitmq.template.mandatory=true",
                             "spring.rabbitmq.virtual-host=15-15_v2.1",

hub/dispatcher/src/test/java/com/hubsante/hub/service/RabbitIntegrationTest.java

@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.*;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -72,7 +73,9 @@ public void shouldDeliverToRecipientQueue() throws Exception {
     @DisplayName("publish with authorized but inconsistent routing key fails")
     public void publishWithAuthorizedButInconsistentRoutingKeyFails() throws Exception {
         String p12Path = classLoader.getResource("config/certs/samuA/samuA.p12").getPath();
-        RabbitTemplate samuA_publisher = getCustomRabbitTemplate(p12Path, "samuA");
+        RabbitTemplate samuA_publisher =
+                getCustomRabbitTemplate(
+                        p12Path, "samuA", CachingConnectionFactory.ConfirmType.CORRELATED);
 
         samuA_publisher.setConfirmCallback(
                 (correlationData, ack, cause) -> {