Polish RabbitMQ Changes

Fix the formatting which was messed up in commit ad1636fd. Also
simplify the RabbitProperties.setVirtualHost logic a little

See gh-1128

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

@@ -110,15 +110,11 @@ public class RabbitProperties {
 	}
 
 	public void setVirtualHost(String virtualHost) {
-        if ("".equals(virtualHost) || virtualHost.equals("/")) {
-            this.virtualHost = "/";
-        } else {
-//            remove all trailing /
 		while (virtualHost.startsWith("/") && virtualHost.length() > 0) {
 			virtualHost = virtualHost.substring(1);
 		}
-            this.virtualHost = virtualHost;
-        }
+		this.virtualHost = ("".equals(virtualHost) ? "/" : virtualHost);
+
 	}
 
 }

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

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.autoconfigure.amqp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -33,6 +30,9 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 /**
  * Tests for {@link RabbitAutoConfiguration}.
  * 

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

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.autoconfigure.amqp;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.junit.Test;
-
 /**
  * Tests for {@link RabbitProperties}.
  *