Merge branch '2.4.x' into 2.5.x

See gh-28134

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

@@ -1111,14 +1111,15 @@ public class RabbitProperties {
 		}
 
 		private void parseHostAndPort(String input, boolean sslEnabled) {
-			int portIndex = input.lastIndexOf(':');
-			if (portIndex == -1) {
+			int bracketIndex = input.lastIndexOf(']');
+			int colonIndex = input.lastIndexOf(':');
+			if (colonIndex == -1 || colonIndex < bracketIndex) {
 				this.host = input;
 				this.port = (determineSslEnabled(sslEnabled)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
 			}
 			else {
-				this.host = input.substring(0, portIndex);
-				this.port = Integer.parseInt(input.substring(portIndex + 1));
+				this.host = input.substring(0, colonIndex);
+				this.port = Integer.parseInt(input.substring(colonIndex + 1));
 			}
 		}
 

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

@@ -242,7 +242,14 @@ class RabbitPropertiesTests {
 
 	@Test
 	void ipv6Address() {
-		this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]:5672");
+		this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]:1234");
+		assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]");
+		assertThat(this.properties.determinePort()).isEqualTo(1234);
+	}
+
+	@Test
+	void ipv6AddressDefaultPort() {
+		this.properties.setAddresses("amqp://foo:bar@[aaaa:bbbb:cccc::d]");
 		assertThat(this.properties.determineHost()).isEqualTo("[aaaa:bbbb:cccc::d]");
 		assertThat(this.properties.determinePort()).isEqualTo(5672);
 	}