GH-3192: Fix RabbitAdmin to avoid eager beans loading

Fixes: #3192

The `RabbitAdmin.initialize()` method calls
`applicationContext.getBeansOfType(Declarable.class, false, true);`
The third parameter `allowEagerInit = true` causes Spring to eagerly
instantiate all `FactoryBean` instances in the application context —
even those marked with `lazy-init="true"` — in order to determine their types.

* Fix `RabbitAdmin` and `RabbitListenerAnnotationBeanPostProcessor`
to use `getBeansOfType(AClass.class, false, false)` to avoid eagerness for lazy-init

Author: artembilan

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

@@ -261,7 +261,7 @@ public void afterSingletonsInstantiated() {
 
 		if (this.beanFactory instanceof ListableBeanFactory lbf) {
 			Map<String, RabbitListenerConfigurer> instances =
-					lbf.getBeansOfType(RabbitListenerConfigurer.class);
+					lbf.getBeansOfType(RabbitListenerConfigurer.class, false, false);
 			for (RabbitListenerConfigurer configurer : instances.values()) {
 				configurer.configureRabbitListeners(this.registrar);
 			}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java

@@ -663,13 +663,13 @@ private void redeclareBeanDeclarables() {
 
 		this.logger.debug("Initializing declarations");
 		Collection<Exchange> contextExchanges = new LinkedList<>(
-				this.applicationContext.getBeansOfType(Exchange.class).values());
+				this.applicationContext.getBeansOfType(Exchange.class, false, false).values());
 		Collection<Queue> contextQueues = new LinkedList<>(
-				this.applicationContext.getBeansOfType(Queue.class).values());
+				this.applicationContext.getBeansOfType(Queue.class, false, false).values());
 		Collection<Binding> contextBindings = new LinkedList<>(
-				this.applicationContext.getBeansOfType(Binding.class).values());
+				this.applicationContext.getBeansOfType(Binding.class, false, false).values());
 		Collection<DeclarableCustomizer> customizers =
-				this.applicationContext.getBeansOfType(DeclarableCustomizer.class).values();
+				this.applicationContext.getBeansOfType(DeclarableCustomizer.class, false, false).values();
 
 		processDeclarables(contextExchanges, contextQueues, contextBindings);
 
@@ -757,7 +757,7 @@ public Set<Declarable> getManualDeclarableSet() {
 	private void processDeclarables(Collection<Exchange> contextExchanges, Collection<Queue> contextQueues,
 			Collection<Binding> contextBindings) {
 
-		Collection<Declarables> declarables = this.applicationContext.getBeansOfType(Declarables.class, false, true)
+		Collection<Declarables> declarables = this.applicationContext.getBeansOfType(Declarables.class, false, false)
 				.values();
 		declarables.forEach(d -> {
 			d.getDeclarables().forEach(declarable -> {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminTests.java

@@ -134,7 +134,7 @@ public void testFailOnFirstUseWithMissingBroker() {
 		rabbitAdmin.setApplicationContext(applicationContext);
 		rabbitAdmin.setAutoStartup(true);
 		rabbitAdmin.afterPropertiesSet();
-		assertThatIllegalArgumentException().isThrownBy(() -> rabbitAdmin.declareQueue());
+		assertThatIllegalArgumentException().isThrownBy(rabbitAdmin::declareQueue);
 		connectionFactory.destroy();
 	}
 
@@ -153,8 +153,7 @@ public void testProperties() throws Exception {
 			channel.basicConsume(queueName, true, consumer);
 			await("Message count > 0").until(() -> messageCount(rabbitAdmin, queueName) == 0);
 			Properties props = rabbitAdmin.getQueueProperties(queueName);
-			assertThat(props.get(RabbitAdmin.QUEUE_CONSUMER_COUNT)).isNotNull();
-			assertThat(props.get(RabbitAdmin.QUEUE_CONSUMER_COUNT)).isEqualTo(1);
+			assertThat(props).containsEntry(RabbitAdmin.QUEUE_CONSUMER_COUNT, 1);
 			channel.close();
 		}
 		finally {
@@ -170,23 +169,23 @@ private int messageCount(RabbitAdmin rabbitAdmin, String queueName) {
 	}
 
 	@Test
-	public void testTemporaryLogs() throws Exception {
+	public void testTemporaryLogs() {
 		SingleConnectionFactory connectionFactory = new SingleConnectionFactory();
 		connectionFactory.setHost("localhost");
 		RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
 		try {
-			ApplicationContext ctx = mock(ApplicationContext.class);
-			Map<String, Queue> queues = new HashMap<String, Queue>();
+			ApplicationContext ctx = mock();
+			Map<String, Queue> queues = new HashMap<>();
 			queues.put("nonDurQ", new Queue("testq.nonDur", false, false, false));
 			queues.put("adQ", new Queue("testq.ad", true, false, true));
 			queues.put("exclQ", new Queue("testq.excl", true, true, false));
 			queues.put("allQ", new Queue("testq.all", false, true, true));
-			given(ctx.getBeansOfType(Queue.class)).willReturn(queues);
-			Map<String, Exchange> exchanges = new HashMap<String, Exchange>();
+			given(ctx.getBeansOfType(Queue.class, false, false)).willReturn(queues);
+			Map<String, Exchange> exchanges = new HashMap<>();
 			exchanges.put("nonDurEx", new DirectExchange("testex.nonDur", false, false));
 			exchanges.put("adEx", new DirectExchange("testex.ad", true, true));
 			exchanges.put("allEx", new DirectExchange("testex.all", false, true));
-			given(ctx.getBeansOfType(Exchange.class)).willReturn(exchanges);
+			given(ctx.getBeansOfType(Exchange.class, false, false)).willReturn(exchanges);
 			rabbitAdmin.setApplicationContext(ctx);
 			rabbitAdmin.afterPropertiesSet();
 			Log logger = spy(TestUtils.getPropertyValue(rabbitAdmin, "logger", Log.class));
@@ -247,17 +246,17 @@ public void testMultiEntities() {
 		assertThat(admin.getQueueProperties(ctx.getBean(Config.class).prototypeQueueName)).isNull();
 		Declarables mixedDeclarables = ctx.getBean("ds", Declarables.class);
 		assertThat(mixedDeclarables.getDeclarablesByType(Queue.class))
-			.hasSize(1)
-			.extracting(Queue::getName)
-			.contains("q4");
+				.hasSize(1)
+				.extracting(Queue::getName)
+				.contains("q4");
 		assertThat(mixedDeclarables.getDeclarablesByType(Exchange.class))
-			.hasSize(1)
-			.extracting(Exchange::getName)
-			.contains("e4");
+				.hasSize(1)
+				.extracting(Exchange::getName)
+				.contains("e4");
 		assertThat(mixedDeclarables.getDeclarablesByType(Binding.class))
-			.hasSize(1)
-			.extracting(Binding::getDestination)
-			.contains("q4");
+				.hasSize(1)
+				.extracting(Binding::getDestination)
+				.contains("q4");
 		ctx.close();
 	}
 
@@ -283,14 +282,13 @@ public void testAvoidHangAMQP_508() {
 
 	@Test
 	public void testIgnoreDeclarationExceptionsTimeout() throws Exception {
-		com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = mock(
-				com.rabbitmq.client.ConnectionFactory.class);
+		com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = mock();
 		TimeoutException toBeThrown = new TimeoutException("test");
 		willThrow(toBeThrown).given(rabbitConnectionFactory).newConnection(any(ExecutorService.class), anyString());
 		CachingConnectionFactory ccf = new CachingConnectionFactory(rabbitConnectionFactory);
 		ccf.setExecutor(mock(ExecutorService.class));
 		RabbitAdmin admin = new RabbitAdmin(ccf);
-		List<DeclarationExceptionEvent> events = new ArrayList<DeclarationExceptionEvent>();
+		List<DeclarationExceptionEvent> events = new ArrayList<>();
 		admin.setApplicationEventPublisher(new EventPublisher(events));
 		admin.setIgnoreDeclarationExceptions(true);
 		admin.declareQueue(new AnonymousQueue());
@@ -313,13 +311,13 @@ public void testIgnoreDeclarationExceptionsTimeout() throws Exception {
 
 	@Test
 	public void testWithinInvoke() throws Exception {
-		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
-		Connection connection = mock(Connection.class);
+		ConnectionFactory connectionFactory = mock();
+		Connection connection = mock();
 		given(connectionFactory.createConnection()).willReturn(connection);
-		Channel channel1 = mock(Channel.class);
-		Channel channel2 = mock(Channel.class);
+		Channel channel1 = mock();
+		Channel channel2 = mock();
 		given(connection.createChannel(false)).willReturn(channel1, channel2);
-		DeclareOk declareOk = mock(DeclareOk.class);
+		DeclareOk declareOk = mock();
 		given(channel1.queueDeclare()).willReturn(declareOk);
 		given(declareOk.getQueue()).willReturn("foo");
 		RabbitTemplate template = new RabbitTemplate(connectionFactory);
@@ -339,14 +337,14 @@ public void testWithinInvoke() throws Exception {
 
 	@Test
 	public void testRetry() throws Exception {
-		com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = mock(com.rabbitmq.client.ConnectionFactory.class);
-		com.rabbitmq.client.Connection connection = mock(com.rabbitmq.client.Connection.class);
+		com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = mock();
+		com.rabbitmq.client.Connection connection = mock();
 		given(rabbitConnectionFactory.newConnection((ExecutorService) isNull(), anyString())).willReturn(connection);
-		Channel channel = mock(Channel.class);
+		Channel channel = mock();
 		given(connection.createChannel()).willReturn(channel);
 		given(channel.isOpen()).willReturn(true);
 		willThrow(new RuntimeException()).given(channel)
-			.queueDeclare(anyString(), anyBoolean(), anyBoolean(), anyBoolean(), any());
+				.queueDeclare(anyString(), anyBoolean(), anyBoolean(), anyBoolean(), any());
 		CachingConnectionFactory ccf = new CachingConnectionFactory(rabbitConnectionFactory);
 		RabbitAdmin admin = new RabbitAdmin(ccf);
 		RetryTemplate rtt = new RetryTemplate();
@@ -359,13 +357,13 @@ public void testRetry() throws Exception {
 		ctx.getBeanFactory().initializeBean(admin, "admin");
 		ctx.refresh();
 		assertThatThrownBy(() -> ccf.createConnection())
-			.isInstanceOf(UncategorizedAmqpException.class);
+				.isInstanceOf(UncategorizedAmqpException.class);
 		ctx.close();
 		verify(channel, times(3)).queueDeclare(anyString(), anyBoolean(), anyBoolean(), anyBoolean(), any());
 	}
 
 	@Test
-	public void testLeaderLocator() throws Exception {
+	public void testLeaderLocator() {
 		CachingConnectionFactory cf = new CachingConnectionFactory(
 				RabbitAvailableCondition.getBrokerRunning().getConnectionFactory());
 		RabbitAdmin admin = new RabbitAdmin(cf);

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateTests.java

@@ -444,7 +444,7 @@ public void testNestedTxBinding() throws Exception {
 		rabbitTemplate.setChannelTransacted(true);
 		RabbitAdmin admin = new RabbitAdmin(rabbitTemplate);
 		ApplicationContext ac = mock(ApplicationContext.class);
-		willReturn(Collections.singletonMap("foo", new Queue("foo"))).given(ac).getBeansOfType(Queue.class);
+		willReturn(Collections.singletonMap("foo", new Queue("foo"))).given(ac).getBeansOfType(Queue.class, false, false);
 		admin.setApplicationContext(ac);
 		admin.afterPropertiesSet();
 		AtomicReference<Channel> templateChannel = new AtomicReference<>();