Add defensive check for RabbitProperties to prevent NPE

Before this commit, RabbitProperties cannot be copied when addresses is null.

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -233,6 +233,9 @@ public void setAddresses(List<String> addresses) {
 	}
 
 	private List<Address> parseAddresses(List<String> addresses) {
+		if (addresses == null) {
+			return null;
+		}
 		List<Address> parsedAddresses = new ArrayList<>();
 		for (String address : addresses) {
 			parsedAddresses.add(new Address(address, Optional.ofNullable(getSsl().getEnabled()).orElse(false)));

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java

@@ -25,6 +25,7 @@
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
+import org.springframework.beans.BeanUtils;
 import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -38,6 +39,7 @@
  * @author Stephane Nicoll
  * @author Rafael Carvalho
  * @author Scott Frederick
+ * @author Yanming Zhou
  */
 class RabbitPropertiesTests {
 
@@ -381,4 +383,11 @@ void hostPropertyMustBeSingleHost() {
 			.withMessageContaining("spring.rabbitmq.host");
 	}
 
+	@Test
+	void isSafeForCopyProperties() {
+		this.properties.setHost("my-rmq-host.net");
+		RabbitProperties target = new RabbitProperties();
+		BeanUtils.copyProperties(this.properties, target);
+	}
+
 }