Merge pull request spring-projects#1209 from garyrussell/spring-projectsgh-1206

* spring-projectsgh-1206:
  Restore AMQP vHost leading `/` support

Author: Phillip Webb

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

@@ -143,11 +143,7 @@ public String getVirtualHost() {
 	}
 
 	public void setVirtualHost(String virtualHost) {
-		while (virtualHost.startsWith("/") && virtualHost.length() > 0) {
-			virtualHost = virtualHost.substring(1);
-		}
 		this.virtualHost = ("".equals(virtualHost) ? "/" : virtualHost);
-
 	}
 
 }

…e/amqp/RabbitAutoconfigurationTests.java …e/amqp/RabbitAutoConfigurationTests.javaspring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoconfigurationTests.java renamed to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoconfigurationTests.java renamed to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

@@ -38,7 +38,7 @@
  *
  * @author Greg Turnquist
  */
-public class RabbitAutoconfigurationTests {
+public class RabbitAutoConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 
@@ -74,7 +74,7 @@ public void testRabbitTemplateWithOverrides() {
 				.getBean(CachingConnectionFactory.class);
 		assertEquals("remote-server", connectionFactory.getHost());
 		assertEquals(9000, connectionFactory.getPort());
-		assertEquals("vhost", connectionFactory.getVirtualHost());
+		assertEquals("/vhost", connectionFactory.getVirtualHost());
 	}
 
 	@Test
@@ -89,6 +89,30 @@ public void testRabbitTemplateEmptyVirtualHost() {
 		assertEquals("/", connectionFactory.getVirtualHost());
 	}
 
+	@Test
+	public void testRabbitTemplateVirtualHostNoLeadingSlash() {
+		this.context = new AnnotationConfigApplicationContext();
+		this.context.register(TestConfiguration.class, RabbitAutoConfiguration.class);
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"spring.rabbitmq.virtual_host:foo");
+		this.context.refresh();
+		CachingConnectionFactory connectionFactory = this.context
+				.getBean(CachingConnectionFactory.class);
+		assertEquals("foo", connectionFactory.getVirtualHost());
+	}
+
+	@Test
+	public void testRabbitTemplateVirtualHostMultiLeadingSlashes() {
+		this.context = new AnnotationConfigApplicationContext();
+		this.context.register(TestConfiguration.class, RabbitAutoConfiguration.class);
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"spring.rabbitmq.virtual_host:///foo");
+		this.context.refresh();
+		CachingConnectionFactory connectionFactory = this.context
+				.getBean(CachingConnectionFactory.class);
+		assertEquals("///foo", connectionFactory.getVirtualHost());
+	}
+
 	@Test
 	public void testRabbitTemplateDefaultVirtualHost() {
 		this.context = new AnnotationConfigApplicationContext();

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

@@ -99,7 +99,7 @@ public void testCustomVirtualHost() {
 	@Test
 	public void testCustomFalsyVirtualHost() {
 		this.properties.setVirtualHost("/myvHost");
-		assertEquals("myvHost", this.properties.getVirtualHost());
+		assertEquals("/myvHost", this.properties.getVirtualHost());
 	}
 
 }