Fix compiler warnings and polish

Fix various compiler warnings and apply a little polish.

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

@@ -108,7 +108,6 @@ class ImportsContextCustomizer implements ContextCustomizer {
 		throw new IllegalStateException("Could not locate BeanDefinitionRegistry");
 	}
 
-	@SuppressWarnings("unchecked")
 	private BeanDefinition registerBean(BeanDefinitionRegistry registry,
 			AnnotatedBeanDefinitionReader reader, String beanName, Class<?> type) {
 		reader.registerBean(type, beanName);

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,8 @@ public interface ApplicationContextAssertProvider<C extends ApplicationContext>
 	/**
 	 * Return an assert for AspectJ.
 	 * @return an AspectJ assert
-	 * @deprecated use standard AssertJ {@code assertThat(context)...} calls instead.
+	 * @deprecated to prevent accidental use. Prefer standard AssertJ
+	 * {@code assertThat(context)...} calls instead.
 	 */
 	@Deprecated
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,8 +55,8 @@ public final class JsonContent<T> implements AssertProvider<JsonContentAssert> {
 	/**
 	 * Use AssertJ's {@link org.assertj.core.api.Assertions#assertThat assertThat}
 	 * instead.
-	 * @deprecated in favor of AssertJ's {@link org.assertj.core.api.Assertions#assertThat
-	 * assertThat}
+	 * @deprecated to prevent accidental use. Prefer standard AssertJ
+	 * {@code assertThat(context)...} calls instead.
 	 */
 	@Override
 	@Deprecated

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

@@ -29,6 +29,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Integration tests for {@link TestRestTemplateContextCustomizer} to ensure
  * early-initialization of factory beans doesn't occur.
@@ -47,6 +49,7 @@ public class TestRestTemplateContextCustomizerWithFactoryBeanTests {
 
 	@Test
 	public void test() {
+		assertThat(this.restTemplate).isNotNull();
 	}
 
 	@Configuration

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/scan/SimpleFactoryBean.java

@@ -21,9 +21,13 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
 /**
+ * A simple factory bean with no generics. Used to test early initialization doesn't
+ * occur.
+ *
  * @author Madhura Bhave
  */
 @Component
+@SuppressWarnings("rawtypes")
 public class SimpleFactoryBean implements FactoryBean {
 
 	private static boolean isInitializedEarly = false;
@@ -40,10 +44,12 @@ public class SimpleFactoryBean implements FactoryBean {
 		}
 	}
 
+	@Override
 	public Object getObject() {
 		return new Object();
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return Object.class;
 	}