LIBS-807 - endless retries in case of connection problems (#11)

Author: julian-eggers

README.md

@@ -12,7 +12,7 @@
 <dependency>
 	<groupId>com.avides.spring</groupId>
 	<artifactId>spring-rabbit</artifactId>
-	<version>2.3.0</version>
+	<version>2.4.0</version>
 </dependency>
 ```
 

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>com.avides.spring</groupId>
   <artifactId>spring-rabbit</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
 
   <name>spring-rabbit</name>
   <description>Makes configuring RabbitMQ for Spring Boot applications more comfortable</description>

src/main/java/com/avides/spring/rabbit/configuration/IsSpringRabbitEnabled.java

@@ -20,10 +20,12 @@ public IsSpringRabbitEnabled()
     @ConditionalOnProperty("spring.rabbitmq.addresses")
     static class HasSingleConnection
     {
+        // not necessary
     }
 
     @ConditionalOnProperty("spring.rabbitmq.connections[0].addresses")
     static class HasMultipleConnections
     {
+        // not necessary
     }
 }

src/main/java/com/avides/spring/rabbit/listener/container/DefaultMessageListenerContainer.java

@@ -4,6 +4,7 @@
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.amqp.rabbit.connection.Connection;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.listener.BlockingQueueConsumer;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
 import org.springframework.amqp.support.converter.MessageConverter;
@@ -37,6 +38,15 @@ public DefaultMessageListenerContainer(ConnectionFactory connectionFactory)
         setErrorHandler(new ValidationErrorHandler());
         setDefaultRequeueRejected(false);
         setPrefetchCount(500);
+        setMissingQueuesFatal(false);
+    }
+
+    @Override
+    protected BlockingQueueConsumer createBlockingQueueConsumer()
+    {
+        var consumer = super.createBlockingQueueConsumer();
+        consumer.setDeclarationRetries(1000000); // infinity
+        return consumer;
     }
 
     /**

src/test/java/com/avides/spring/rabbit/listener/container/DefaultMessageListenerContainerTest.java

@@ -10,7 +10,9 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.support.converter.MessageConverter;
+import org.springframework.test.util.ReflectionTestUtils;
 
+import com.avides.spring.rabbit.configuration.ValidationErrorHandler;
 import com.avides.spring.rabbit.listener.ContextAwareRabbitListener;
 import com.avides.spring.rabbit.listener.RabbitListener;
 import com.avides.spring.rabbit.listener.SpringRabbitListener;
@@ -41,6 +43,10 @@ public void testConstructor()
     {
         var listenerContainer = new DefaultMessageListenerContainer<>(connectionFactory);
         assertThat(listenerContainer.getConnectionFactory()).isSameAs(connectionFactory);
+        assertThat(ReflectionTestUtils.getField(listenerContainer, "errorHandler")).isInstanceOf(ValidationErrorHandler.class);
+        assertThat(ReflectionTestUtils.getField(listenerContainer, "defaultRequeueRejected")).isEqualTo(Boolean.FALSE);
+        assertThat(ReflectionTestUtils.getField(listenerContainer, "prefetchCount")).isEqualTo(Integer.valueOf(500));
+        assertThat(ReflectionTestUtils.getField(listenerContainer, "missingQueuesFatal")).isEqualTo(Boolean.FALSE);
     }
 
     @Test