From b71b46c3337fe6324106d0c1953d78fbff398a50 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Wed, 23 Sep 2020 15:57:40 -0400
Subject: [PATCH] Removed the Queue object from autoconfiguration

---
 .../AmqpItemReaderAutoConfiguration.java      | 15 -----------
 .../AmqpItemReaderAutoConfigurationTests.java | 27 -------------------
 2 files changed, 42 deletions(-)

diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java
index 90482a1e..864cfd7e 100644
--- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java
+++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java
@@ -19,7 +19,6 @@ package org.springframework.cloud.task.batch.autoconfigure.rabbit;
 import java.util.Map;
 
 import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.batch.item.amqp.AmqpItemReader;
@@ -28,12 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
 
 /**
  * Autconfiguration for a {@code AmqpItemReader}.
@@ -56,18 +53,6 @@ public class AmqpItemReaderAutoConfiguration {
 		return new AmqpItemReaderProperties();
 	}
 
-	@ConditionalOnBean(RabbitProperties.class)
-	@Bean
-	public Queue defaultQueue() {
-		if (!StringUtils
-				.hasText(this.rabbitProperties.getTemplate().getDefaultReceiveQueue())) {
-			throw new IllegalArgumentException(
-					"DefaultReceiveQueue must not be empty nor null");
-		}
-		return new Queue(this.rabbitProperties.getTemplate().getDefaultReceiveQueue(),
-				true);
-	}
-
 	@Bean
 	public AmqpItemReader<Map<Object, Object>> amqpItemReader(AmqpTemplate amqpTemplate,
 			@Autowired(required = false) Class itemType) {
diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java
index c28486a9..30107e5d 100644
--- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java
+++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java
@@ -52,7 +52,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class AmqpItemReaderAutoConfigurationTests {
 
@@ -158,32 +157,6 @@ public class AmqpItemReaderAutoConfigurationTests {
 		});
 	}
 
-	@Test
-	void missingDefaultQueueTest() {
-		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
-				.withUserConfiguration(BaseConfiguration.class)
-				.withConfiguration(
-						AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
-								BatchAutoConfiguration.class,
-								SingleStepJobAutoConfiguration.class,
-								AmqpItemReaderAutoConfiguration.class,
-								RabbitAutoConfiguration.class))
-				.withPropertyValues("spring.batch.job.jobName=integrationJob",
-						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.amqpitemreader.enabled=true",
-						"spring.batch.job.amqpitemreader.jsonConverterEnabled=false",
-						"spring.rabbitmq.host=" + host,
-						"spring.rabbitmq.port=" + amqpPort);
-
-		assertThatThrownBy(() -> {
-			applicationContextRunner.run((context) -> {
-				context.getBean(JobLauncher.class);
-			});
-		}).isInstanceOf(IllegalStateException.class).getRootCause()
-				.isInstanceOf(IllegalArgumentException.class)
-				.hasMessageContaining("DefaultReceiveQueue must not be empty nor null");
-	}
-
 	@Test
 	void useAmqpTemplateTest() {
 		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()