[release] - patch to fix the missing beans on MultiRabbitAnnotationPostProcessor. (#66)

* Fixed missing bean on MultiRabbitAnnotationPostProcessor

Author: ocristian

spring-multirabbit/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>

spring-multirabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitListenerAnnotationBeanPostProcessor.java

@@ -6,8 +6,10 @@
 import java.lang.reflect.Proxy;
 import org.springframework.amqp.core.AbstractDeclarable;
 import org.springframework.amqp.core.Declarable;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -27,6 +29,20 @@ public final class MultiRabbitListenerAnnotationBeanPostProcessor
 
     private ApplicationContext applicationContext;
 
+    /**
+     * Injecting multiRabbitConnectionFactory bean to make sure
+     * {@link org.springframework.boot.autoconfigure.amqp.MultiRabbitAutoConfiguration} is completely initialized
+     * before start the post processor processAmqpListener.
+     *
+     * @param multiRabbitConnectionFactory Routing connection factory populated with the connection factories provided
+     *  from {@link org.springframework.boot.autoconfigure.amqp.MultiRabbitAutoConfiguration}.
+     */
+    public MultiRabbitListenerAnnotationBeanPostProcessor(
+        final ConnectionFactory multiRabbitConnectionFactory) {
+        super();
+        Assert.state(multiRabbitConnectionFactory != null, "multiRabbitConnectionFactory must be available");
+    }
+
     @Override
     protected void processAmqpListener(final RabbitListener rabbitListener,
                                        final Method method,

spring-multirabbit/src/main/java/org/springframework/amqp/rabbit/annotation/MultiRabbitListenerConfigurationSelector.java

@@ -0,0 +1,18 @@
+package org.springframework.amqp.rabbit.annotation;
+
+import org.springframework.context.annotation.DeferredImportSelector;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.type.AnnotationMetadata;
+
+/**
+ * A {@link DeferredImportSelector} implementation with the lowest order to import a
+ * {@link MultiRabbitBootstrapConfiguration} as late as possible.
+ */
+@Order
+public class MultiRabbitListenerConfigurationSelector implements DeferredImportSelector {
+
+    @Override
+    public String[] selectImports(final AnnotationMetadata importingClassMetadata) {
+        return new String[] {MultiRabbitBootstrapConfiguration.class.getName()};
+    }
+}

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

@@ -3,7 +3,7 @@
 import com.rabbitmq.client.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.amqp.rabbit.annotation.MultiRabbitBootstrapConfiguration;
+import org.springframework.amqp.rabbit.annotation.MultiRabbitListenerConfigurationSelector;
 import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
@@ -39,7 +39,7 @@
 @Configuration
 @ConditionalOnClass({RabbitTemplate.class, Channel.class})
 @EnableConfigurationProperties({RabbitProperties.class, MultiRabbitProperties.class})
-@Import({MultiRabbitBootstrapConfiguration.class, RabbitAutoConfiguration.class})
+@Import({MultiRabbitListenerConfigurationSelector.class, RabbitAutoConfiguration.class})
 public class MultiRabbitAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MultiRabbitAutoConfiguration.class);