Polishing

Author: wilkinsona

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java

@@ -67,7 +67,6 @@
  * @see ConditionalOnClass
  * @see AutoConfigureAfter
  */
-@SuppressWarnings("deprecation")
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java

@@ -39,8 +39,7 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Variant of {@link EnableAutoConfigurationImportSelector} for
- * {@link ImportAutoConfiguration}.
+ * Variant of {@link AutoConfigurationImportSelector} for {@link ImportAutoConfiguration}.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java

@@ -44,11 +44,11 @@
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.gridfs.GridFsTemplate;
@@ -106,7 +106,7 @@ public MongoTemplate mongoTemplate(MongoDbFactory mongoDbFactory,
 	@ConditionalOnMissingBean(MongoConverter.class)
 	public MappingMongoConverter mappingMongoConverter(MongoDbFactory factory,
 			MongoMappingContext context, BeanFactory beanFactory,
-			CustomConversions conversions) {
+			MongoCustomConversions conversions) {
 		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
 		MappingMongoConverter mappingConverter = new MappingMongoConverter(dbRefResolver,
 				context);
@@ -117,7 +117,7 @@ public MappingMongoConverter mappingMongoConverter(MongoDbFactory factory,
 	@Bean
 	@ConditionalOnMissingBean
 	public MongoMappingContext mongoMappingContext(BeanFactory beanFactory,
-			CustomConversions conversions) throws ClassNotFoundException {
+			MongoCustomConversions conversions) throws ClassNotFoundException {
 		MongoMappingContext context = new MongoMappingContext();
 		context.setInitialEntitySet(new EntityScanner(this.applicationContext)
 				.scan(Document.class, Persistent.class));
@@ -141,8 +141,8 @@ public GridFsTemplate gridFsTemplate(MongoDbFactory mongoDbFactory,
 
 	@Bean
 	@ConditionalOnMissingBean
-	public CustomConversions mongoCustomConversions() {
-		return new CustomConversions(Collections.emptyList());
+	public MongoCustomConversions mongoCustomConversions() {
+		return new MongoCustomConversions(Collections.emptyList());
 	}
 
 	/**

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java

@@ -39,7 +39,7 @@
 import org.springframework.data.couchbase.config.BeanNames;
 import org.springframework.data.couchbase.config.CouchbaseConfigurer;
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
-import org.springframework.data.couchbase.core.convert.CustomConversions;
+import org.springframework.data.couchbase.core.convert.CouchbaseCustomConversions;
 import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.core.mapping.event.ValidatingCouchbaseEventListener;
 import org.springframework.data.couchbase.core.query.Consistency;
@@ -166,8 +166,9 @@ protected Consistency getDefaultConsistency() {
 	static class CustomConversionsConfig {
 
 		@Bean(BeanNames.COUCHBASE_CUSTOM_CONVERSIONS)
-		public CustomConversions myCustomConversions() {
-			return new CustomConversions(Collections.singletonList(new MyConverter()));
+		public CouchbaseCustomConversions myCustomConversions() {
+			return new CouchbaseCustomConversions(
+					Collections.singletonList(new MyConverter()));
 		}
 
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java

@@ -44,7 +44,7 @@
 import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.CustomConversions;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -205,8 +205,8 @@ private static void assertDomainTypesDiscovered(MongoMappingContext mappingConte
 	static class CustomConversionsConfig {
 
 		@Bean
-		public CustomConversions customConversions() {
-			return new CustomConversions(Arrays.asList(new MyConverter()));
+		public MongoCustomConversions customConversions() {
+			return new MongoCustomConversions(Arrays.asList(new MyConverter()));
 		}
 
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

@@ -162,6 +162,7 @@ public void testEmbeddedTypeDefaultsUsername() throws Exception {
 		this.context.refresh();
 		DataSource bean = this.context.getBean(DataSource.class);
 		assertThat(bean).isNotNull();
+		@SuppressWarnings("resource")
 		HikariDataSource pool = (HikariDataSource) bean;
 		assertThat(pool.getDriverClassName()).isEqualTo("org.hsqldb.jdbcDriver");
 		assertThat(pool.getUsername()).isEqualTo("sa");

spring-boot/src/main/java/org/springframework/boot/context/event/EventPublishingRunListener.java

@@ -62,10 +62,9 @@ public int getOrder() {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void starting() {
-		this.initialMulticaster
-				.multicastEvent(new ApplicationStartingEvent(this.application, this.args));
+		this.initialMulticaster.multicastEvent(
+				new ApplicationStartingEvent(this.application, this.args));
 	}
 
 	@Override

spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@@ -359,7 +359,6 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void eventsOrder() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);