GH-27 Fixed compatibility with SpringBoot 2.2.13

Author: rwanderc

pom.xml

@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <springboot.version>2.2.0.RELEASE</springboot.version>
+        <springboot.version>2.2.13.RELEASE</springboot.version>
     </properties>
 
     <scm>

spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.2.13.RELEASE</version>
         <relativePath />
     </parent>
 

spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.2.13.RELEASE</version>
         <relativePath />
     </parent>
 

spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.2.13.RELEASE</version>
         <relativePath />
     </parent>
 

spring-multirabbit-lib-integration/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.2.13.RELEASE</version>
         <relativePath />
     </parent>
 

spring-multirabbit-lib/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitAutoConfiguration.java

@@ -132,16 +132,20 @@ public MultiRabbitConnectionFactoryWrapper externalEmptyWrapper() {
         public ConnectionFactory routingConnectionFactory(
                 final RabbitProperties rabbitProperties,
                 final MultiRabbitProperties multiRabbitProperties,
-                final MultiRabbitConnectionFactoryWrapper externalWrapper) {
+                final MultiRabbitConnectionFactoryWrapper externalWrapper) throws Exception {
             final MultiRabbitConnectionFactoryWrapper internalWrapper
                     = instantiateConnectionFactories(rabbitProperties, multiRabbitProperties);
             final MultiRabbitConnectionFactoryWrapper aggregatedWrapper
                     = aggregateConnectionFactoryWrappers(internalWrapper, externalWrapper);
 
+            if (aggregatedWrapper.getDefaultConnectionFactory() == null) {
+                throw new IllegalArgumentException("A default ConnectionFactory must be provided.");
+            }
+
             aggregatedWrapper.getContainerFactories().forEach(this::registerContainerFactoryBean);
             aggregatedWrapper.getRabbitAdmins().forEach(this::registerRabbitAdminBean);
 
-            SimpleRoutingConnectionFactory connectionFactory = new SimpleRoutingConnectionFactory();
+            final SimpleRoutingConnectionFactory connectionFactory = new SimpleRoutingConnectionFactory();
             connectionFactory.setTargetConnectionFactories(aggregatedWrapper.getConnectionFactories());
             connectionFactory.setDefaultTargetConnectionFactory(aggregatedWrapper.getDefaultConnectionFactory());
             return connectionFactory;
@@ -183,19 +187,20 @@ private void copyConnectionSets(
          */
         private MultiRabbitConnectionFactoryWrapper instantiateConnectionFactories(
                 final RabbitProperties rabbitProperties,
-                final MultiRabbitProperties multiRabbitProperties) {
+                final MultiRabbitProperties multiRabbitProperties) throws Exception {
             final MultiRabbitConnectionFactoryWrapper wrapper = new MultiRabbitConnectionFactoryWrapper();
 
             final Map<String, RabbitProperties> propertiesMap = multiRabbitProperties != null
                     ? multiRabbitProperties.getConnections()
                     : Collections.emptyMap();
 
-            propertiesMap.forEach((key, value) -> {
-                CachingConnectionFactory connectionFactory = instantiateConnectionFactory(value);
-                SimpleRabbitListenerContainerFactory containerFactory = newContainerFactory(connectionFactory);
-                RabbitAdmin rabbitAdmin = newRabbitAdmin(connectionFactory);
-                wrapper.addConnectionFactory(key, connectionFactory, containerFactory, rabbitAdmin);
-            });
+            for (Map.Entry<String, RabbitProperties> entry : propertiesMap.entrySet()) {
+                final CachingConnectionFactory connectionFactory
+                        = springFactoryCreator.rabbitConnectionFactory(entry.getValue(), connectionNameStrategy);
+                final SimpleRabbitListenerContainerFactory containerFactory = newContainerFactory(connectionFactory);
+                final RabbitAdmin rabbitAdmin = newRabbitAdmin(connectionFactory);
+                wrapper.addConnectionFactory(entry.getKey(), connectionFactory, containerFactory, rabbitAdmin);
+            }
 
             final String defaultConnectionFactoryKey = multiRabbitProperties != null
                     ? multiRabbitProperties.getDefaultConnection()
@@ -211,7 +216,7 @@ private MultiRabbitConnectionFactoryWrapper instantiateConnectionFactories(
 
             final ConnectionFactory defaultConnectionFactory = StringUtils.hasText(defaultConnectionFactoryKey)
                     ? wrapper.getConnectionFactories().get(defaultConnectionFactoryKey)
-                    : instantiateConnectionFactory(rabbitProperties);
+                    : springFactoryCreator.rabbitConnectionFactory(rabbitProperties, connectionNameStrategy);
             wrapper.setDefaultConnectionFactory(defaultConnectionFactory);
 
             return wrapper;
@@ -236,19 +241,6 @@ private RabbitAdmin newRabbitAdmin(final ConnectionFactory connectionFactory) {
             return rabbitAdmin;
         }
 
-        /**
-         * Method to call default Spring factory creator and suppress a possible Exception into a RuntimeException. The
-         * suppression of the Exception will not affect the flow, since Spring will still stop its initialization in the
-         * event of any RuntimeException.
-         */
-        private CachingConnectionFactory instantiateConnectionFactory(final RabbitProperties rabbitProperties) {
-            try {
-                return springFactoryCreator.rabbitConnectionFactory(rabbitProperties, connectionNameStrategy);
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-
         /**
          * Registers the ContainerFactory bean.
          */

spring-multirabbit-lib/src/test/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitConnectionFactoryCreatorTest.java

@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -89,13 +90,16 @@ public void shouldInstantiateExternalEmptyWrapper() {
     }
 
     @Test
-    public void shouldInstantiateRoutingConnectionFactory() {
+    public void shouldInstantiateRoutingConnectionFactory() throws Exception {
+        when(springFactoryCreator.rabbitConnectionFactory(rabbitProperties, connectionNameStrategy))
+                .thenReturn(new CachingConnectionFactory());
+
         assertTrue(creator().routingConnectionFactory(rabbitProperties, multiRabbitProperties, wrapper)
                 instanceof RoutingConnectionFactory);
     }
 
     @Test
-    public void shouldInstantiateRoutingConnectionFactoryWithDefaultAndMultipleConnections() {
+    public void shouldInstantiateRoutingConnectionFactoryWithDefaultAndMultipleConnections() throws Exception {
         when(wrapper.getDefaultConnectionFactory()).thenReturn(connectionFactory0);
         when(wrapper.getConnectionFactories()).thenReturn(singletonMap(DUMMY_KEY, connectionFactory1));
         when(wrapper.getContainerFactories()).thenReturn(singletonMap(DUMMY_KEY, containerFactory));
@@ -112,7 +116,7 @@ public void shouldInstantiateRoutingConnectionFactoryWithDefaultAndMultipleConne
     }
 
     @Test
-    public void shouldInstantiateRoutingConnectionFactoryWithOnlyDefaultConnectionFactory() {
+    public void shouldInstantiateRoutingConnectionFactoryWithOnlyDefaultConnectionFactory() throws Exception {
         when(wrapper.getDefaultConnectionFactory()).thenReturn(connectionFactory0);
 
         ConnectionFactory routingConnectionFactory = creator().routingConnectionFactory(rabbitProperties,
@@ -123,10 +127,12 @@ public void shouldInstantiateRoutingConnectionFactoryWithOnlyDefaultConnectionFa
     }
 
     @Test
-    public void shouldInstantiateRoutingConnectionFactoryWithOnlyMultipleConnectionFactories() {
+    public void shouldInstantiateRoutingConnectionFactoryWithOnlyMultipleConnectionFactories() throws Exception {
         when(wrapper.getConnectionFactories()).thenReturn(singletonMap(DUMMY_KEY, connectionFactory0));
         when(wrapper.getContainerFactories()).thenReturn(singletonMap(DUMMY_KEY, containerFactory));
         when(wrapper.getRabbitAdmins()).thenReturn(singletonMap(DUMMY_KEY, rabbitAdmin));
+        when(springFactoryCreator.rabbitConnectionFactory(rabbitProperties, connectionNameStrategy))
+                .thenReturn(new CachingConnectionFactory());
 
         ConnectionFactory routingConnectionFactory = creator().routingConnectionFactory(rabbitProperties,
                 multiRabbitProperties, wrapper);
@@ -139,7 +145,7 @@ public void shouldInstantiateRoutingConnectionFactoryWithOnlyMultipleConnectionF
     }
 
     @Test
-    public void shouldReachDefaultConnectionFactoryWhenNotBound() {
+    public void shouldReachDefaultConnectionFactoryWhenNotBound() throws Exception {
         when(wrapper.getDefaultConnectionFactory()).thenReturn(connectionFactory0);
         when(wrapper.getConnectionFactories()).thenReturn(singletonMap(DUMMY_KEY, connectionFactory1));
         when(wrapper.getContainerFactories()).thenReturn(singletonMap(DUMMY_KEY, containerFactory));
@@ -148,11 +154,11 @@ public void shouldReachDefaultConnectionFactoryWhenNotBound() {
         creator().routingConnectionFactory(rabbitProperties, multiRabbitProperties, wrapper).getVirtualHost();
 
         verify(connectionFactory0).getVirtualHost();
-        verifyNoMoreInteractions(connectionFactory1);
+        verify(connectionFactory1, never()).getVirtualHost();
     }
 
     @Test
-    public void shouldBindAndReachMultiConnectionFactory() {
+    public void shouldBindAndReachMultiConnectionFactory() throws Exception {
         when(wrapper.getDefaultConnectionFactory()).thenReturn(connectionFactory0);
         when(wrapper.getConnectionFactories()).thenReturn(singletonMap(DUMMY_KEY, connectionFactory1));
         when(wrapper.getContainerFactories()).thenReturn(singletonMap(DUMMY_KEY, containerFactory));
@@ -165,12 +171,15 @@ public void shouldBindAndReachMultiConnectionFactory() {
         routingConnectionFactory.getVirtualHost();
         SimpleResourceHolder.unbind(routingConnectionFactory);
 
-        verifyNoMoreInteractions(connectionFactory0);
+        verify(connectionFactory0, never()).getVirtualHost();
         verify(connectionFactory1).getVirtualHost();
     }
 
     @Test
-    public void shouldInstantiateMultiRabbitConnectionFactoryWrapperWithDefaultConnection() {
+    public void shouldInstantiateMultiRabbitConnectionFactoryWrapperWithDefaultConnection() throws Exception {
+        when(springFactoryCreator.rabbitConnectionFactory(rabbitProperties, connectionNameStrategy))
+                .thenReturn(new CachingConnectionFactory());
+
         assertNotNull(creator().routingConnectionFactory(rabbitProperties, null, wrapper));
     }
 
@@ -181,6 +190,7 @@ public void shouldInstantiateMultiRabbitConnectionFactoryWrapperWithMultipleConn
 
         MultiRabbitProperties multiRabbitProperties = new MultiRabbitProperties();
         multiRabbitProperties.getConnections().put(DUMMY_KEY, secondaryRabbitProperties);
+        multiRabbitProperties.setDefaultConnection(DUMMY_KEY);
 
         creator().routingConnectionFactory(null, multiRabbitProperties, wrapper);
 
@@ -204,7 +214,7 @@ public void shouldInstantiateMultiRabbitConnectionFactoryWrapperWithDefaultAndMu
 
     @Test
     public void shouldEncapsulateExceptionWhenFailingToCreateBean() throws Exception {
-        exception.expect(RuntimeException.class);
+        exception.expect(Exception.class);
         exception.expectMessage("mocked-exception");
 
         when(springFactoryCreator.rabbitConnectionFactory(any(RabbitProperties.class), eq(connectionNameStrategy)))