Merge branch '1.4.x' into 1.5.x

spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

@@ -276,6 +276,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
 			return (obj != null && getClass().equals(obj.getClass())
 					&& this.annotations.equals(((ContextCustomizerKey) obj).annotations));
 		}
+
 	}
 
 	/**

spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java

@@ -100,4 +100,5 @@ final class SpringBootConfigurationFinder {
 		}
 
 	}
+
 }

spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java

@@ -38,8 +38,8 @@ import org.springframework.web.context.WebApplicationContext;
 
 /**
  * Annotation that can be specified on a test class that runs Spring Boot based tests.
- * Provides the following features over and above the regular
- * <em>Spring TestContext Framework</em>:
+ * Provides the following features over and above the regular <em>Spring TestContext
+ * Framework</em>:
  * <ul>
  * <li>Uses {@link SpringBootContextLoader} as the default {@link ContextLoader} when no
  * specific {@link ContextConfiguration#loader() @ContextConfiguration(loader=...)} is

spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java

@@ -345,6 +345,7 @@ public abstract class AbstractJsonMarshalTester<T> {
 	/**
 	 * Utility class used to support field initialization. Used by subclasses to support
 	 * {@code initFields}.
+	 *
 	 * @param <M> The marshaller type
 	 */
 	protected static abstract class FieldInitializer<M> {

spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java

@@ -125,4 +125,5 @@ public class GsonTester<T> extends AbstractJsonMarshalTester<T> {
 		}
 
 	}
+
 }

spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java

@@ -110,4 +110,5 @@ public class SpringBootMockServletContext extends MockServletContext {
 		}
 		return resource;
 	}
+
 }

spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java

@@ -50,4 +50,5 @@ public class ConfigFileApplicationContextInitializerTests {
 	public static class Config {
 
 	}
+
 }

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java

@@ -78,6 +78,7 @@ public class MockBeanWithAsyncInterfaceMethodIntegrationTests {
 		public MyService myService(Transformer transformer) {
 			return new MyService(transformer);
 		}
+
 	}
 
 }

spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

@@ -201,4 +201,5 @@ public class TestRestTemplateTests {
 				.isEqualTo(password);
 
 	}
+
 }