Merge branch '2.7.x'

Closes gh-33753

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

@@ -1127,17 +1127,20 @@ public class RabbitProperties {
 		}
 
 		private String parseUsernameAndPassword(String input) {
-			if (input.contains("@")) {
+			String[] splitInput = StringUtils.split(input, "@");
-				String[] split = StringUtils.split(input, "@");
+			if (splitInput == null) {
-				String creds = split[0];
+				return input;
-				input = split[1];
-				split = StringUtils.split(creds, ":");
-				this.username = split[0];
-				if (split.length > 0) {
-					this.password = split[1];
 			}
+			String credentials = splitInput[0];
+			String[] splitCredentials = StringUtils.split(credentials, ":");
+			if (splitCredentials == null) {
+				this.username = credentials;
 			}
-			return input;
+			else {
+				this.username = splitCredentials[0];
+				this.password = splitCredentials[1];
+			}
+			return splitInput[1];
 		}
 
 		private String parseVirtualHost(String input) {

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

@@ -331,4 +331,11 @@ class RabbitPropertiesTests {
 		assertThat(container).hasFieldOrPropertyWithValue("deBatchingEnabled", direct.isDeBatchingEnabled());
 	}
 
+	@Test
+	void determineUsernameWithoutPassword() {
+		this.properties.setAddresses("user@rabbit1.example.com:1234/alpha");
+		assertThat(this.properties.determineUsername()).isEqualTo("user");
+		assertThat(this.properties.determinePassword()).isEqualTo("guest");
+	}
+
 }