Make Boot Rqueue auto-start delay explicit

Author: sonus21

rqueue-spring-boot-starter/src/main/java/com/github/sonus21/rqueue/spring/boot/RqueueAutoStartupLifecycle.java

@@ -34,14 +34,18 @@ public class RqueueAutoStartupLifecycle
   private final Set<RqueueMessageListenerContainer> delayedContainers =
       ConcurrentHashMap.newKeySet();
 
+  public void delayAutoStartup(RqueueMessageListenerContainer container) {
+    container.setAutoStartup(false);
+    delayedContainers.add(container);
+  }
+
   @Override
   public Object postProcessBeforeInitialization(Object bean, String beanName)
       throws BeansException {
     if (bean instanceof RqueueMessageListenerContainer) {
       RqueueMessageListenerContainer container = (RqueueMessageListenerContainer) bean;
       if (container.isAutoStartup()) {
-        container.setAutoStartup(false);
-        delayedContainers.add(container);
+        delayAutoStartup(container);
       }
     }
     return bean;

rqueue-spring-boot-starter/src/main/java/com/github/sonus21/rqueue/spring/boot/RqueueListenerAutoConfig.java

@@ -33,6 +33,7 @@
 import com.github.sonus21.rqueue.listener.RqueueMessageListenerContainer;
 import com.github.sonus21.rqueue.utils.condition.ReactiveEnabled;
 import com.github.sonus21.rqueue.utils.condition.RqueueEnabled;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -57,6 +58,9 @@
 @Import(RqueueRedisConfigImportSelector.class)
 public class RqueueListenerAutoConfig extends RqueueListenerBaseConfig {
 
+  @Autowired(required = false)
+  private RqueueAutoStartupLifecycle rqueueAutoStartupLifecycle;
+
   @Bean
   @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
   @ConditionalOnWebApplication
@@ -83,7 +87,23 @@ public RqueueMessageListenerContainer rqueueMessageListenerContainer(
     if (simpleRqueueListenerContainerFactory.getMessageBroker() == null) {
       simpleRqueueListenerContainerFactory.setMessageBroker(messageBroker);
     }
-    return simpleRqueueListenerContainerFactory.createMessageListenerContainer();
+    boolean delayAutoStartup =
+        rqueueAutoStartupLifecycle != null && simpleRqueueListenerContainerFactory.getAutoStartup();
+    if (delayAutoStartup) {
+      simpleRqueueListenerContainerFactory.setAutoStartup(false);
+    }
+    RqueueMessageListenerContainer container;
+    try {
+      container = simpleRqueueListenerContainerFactory.createMessageListenerContainer();
+    } finally {
+      if (delayAutoStartup) {
+        simpleRqueueListenerContainerFactory.setAutoStartup(true);
+      }
+    }
+    if (delayAutoStartup) {
+      rqueueAutoStartupLifecycle.delayAutoStartup(container);
+    }
+    return container;
   }
 
   @Bean

rqueue-spring-boot-starter/src/test/java/com/github/sonus21/rqueue/spring/boot/tests/unit/RqueueListenerAutoConfigTest.java

@@ -122,10 +122,15 @@ void rqueueMessageListenerContainer()
         "com.github.sonus21.rqueue.converter.DefaultMessageConverterProvider",
         true);
     FieldUtils.writeField(messageAutoConfig, "simpleRqueueListenerContainerFactory", factory, true);
-    messageAutoConfig.rqueueMessageListenerContainer(rqueueMessageHandler, messageBroker);
+    FieldUtils.writeField(
+        messageAutoConfig, "rqueueAutoStartupLifecycle", new RqueueAutoStartupLifecycle(), true);
+    RqueueMessageListenerContainer container =
+        messageAutoConfig.rqueueMessageListenerContainer(rqueueMessageHandler, messageBroker);
     assertEquals(factory.getRqueueMessageHandler(null).hashCode(), rqueueMessageHandler.hashCode());
     // The broker must be propagated onto the factory so the container picks it up.
     assertSame(messageBroker, factory.getMessageBroker());
+    assertFalse(container.isAutoStartup());
+    assertTrue(factory.getAutoStartup());
   }
 
   @Test