Merge pull request #204 from freenowtech/UP-4637-remove-spring-config-bus-and-multirabbit

feat(UP-4637): migrate from spring-multirabbit to standard spring-boot-starter-amqp and removes spring-cloud-starter-bus-amqp

Author: ocristian

sauron-service/docker/config/sauron-service.yml

@@ -36,27 +36,12 @@ management:
 # Spring configuration
 #################################################################
 spring:
-  #################################################################
-  # SpringConfigBus configuration
-  # Rabbitmq used to enable hot reloading of your configuration[1]
-  # Comment the block below and uncomment rabbitmq configuration
-  # to enable SpringConfigBus
-  #
-  # [1] https://www.baeldung.com/spring-cloud-bus
-  #################################################################
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
-  cloud:
-    stream:
-      default:
-        consumer:
-          autoStartup: false
-#  rabbitmq:
-#    requested-heartbeat: 5
-#    host: configbus.hostname
-#    port: 5672
-#    username: sauron-service
-#    password: iamasecret
+  rabbitmq:
+    enabled: true
+    host: eventsbus.hostname
+    port: 5672
+    username: sauron-service
+    password: iamasecret
 
      #################################################################
      # Sauron Rabbitmq Request Handler
@@ -68,20 +53,6 @@ spring:
      # [1] src/main/java/com/freenow/sauron/handler/impl/RabbitmqRequestHandler.java
      #################################################################
 #    enabled: true
-  #################################################################
-  # When using Sauron Request Handler another Rabbitmq host can be used,
-  # different from the SpringConfigBus. In order to allow that, Sauron
-  # make usage of freenowtech/spring-multirabbit [1]
-  #
-  # [1] https://github.com/freenowtech/spring-multirabbit
-  #################################################################
-#  multirabbitmq:
-#    connections:
-#      eventBus:
-#        host: eventsbus.hostname
-#        port: 5672
-#        username: sauron-service
-#        password: iamasecret
 
 #################################################################
 # Sauron configuration

sauron-service/pom.xml

@@ -103,27 +103,27 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
 
-        <!-- SPRING CLOUD CONFIG -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
 
+        <!-- SPRING CLOUD CONFIG -->
         <dependency>
-            <groupId>com.free-now.multirabbit</groupId>
-            <artifactId>spring-multirabbit</artifactId>
-            <version>${multirabbit.version}</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
 
+
         <!-- SAURON CORE -->
         <dependency>
             <groupId>com.free-now.sauron</groupId>

sauron-service/src/main/java/com/freenow/sauron/config/RabbitmqConfig.java

@@ -5,7 +5,7 @@
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -24,22 +24,24 @@ public Queue sauronQueue()
 
 
     @Bean
-    public SimpleRabbitListenerContainerFactory eventBusPrefetchCount(
-        @Qualifier("eventBus") SimpleRabbitListenerContainerFactory eventBus,
+    public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory(
+        final ConnectionFactory connectionFactory,
         final Jackson2JsonMessageConverter converter)
     {
-        eventBus.setPrefetchCount(1);
-        eventBus.setMessageConverter(converter);
-        return eventBus;
+        final var factory = new SimpleRabbitListenerContainerFactory();
+        factory.setConnectionFactory(connectionFactory);
+        factory.setPrefetchCount(1);
+        factory.setMessageConverter(converter);
+        return factory;
     }
 
 
     @Bean
     public RabbitTemplate rabbitTemplate(
-        final ConnectionFactory multiRabbitConnectionFactory,
+        final ConnectionFactory connectionFactory,
         final Jackson2JsonMessageConverter converter)
     {
-        final var rabbitTemplate = new RabbitTemplate(multiRabbitConnectionFactory);
+        final var rabbitTemplate = new RabbitTemplate(connectionFactory);
         rabbitTemplate.setMessageConverter(converter);
         return rabbitTemplate;
     }

sauron-service/src/main/java/com/freenow/sauron/handler/impl/RabbitmqRequestHandler.java

@@ -18,7 +18,7 @@
 @Setter
 public class RabbitmqRequestHandler implements RequestHandler
 {
-    private static final String ASYNC_CONTAINER_FACTORY = "eventBus";
+    private static final String ASYNC_CONTAINER_FACTORY = "rabbitListenerContainerFactory";
 
     private static final String LISTENER_ID = "sauron-consumer";