Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address warnings caused by deprecations in Spring Framework 5

Browse Source 
See gh-6977
This commit is contained in:
Andy Wilkinson
2016-09-21 17:34:54 +01:00
parent 312292b93e
commit 0cdbbd49b5
12 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
View File

@@ -86,7 +86,7 @@ public class CassandraAutoConfiguration {
}
public static <T> T instantiate(Class<T> type) {
return BeanUtils.instantiate(type);
return BeanUtils.instantiateClass(type);
}
private QueryOptions getQueryOptions() {

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

@@ -122,7 +122,7 @@ public class MongoDataAutoConfiguration {
Class<?> strategyClass = this.properties.getFieldNamingStrategy();
if (strategyClass != null) {
context.setFieldNamingStrategy(
(FieldNamingStrategy) BeanUtils.instantiate(strategyClass));
(FieldNamingStrategy) BeanUtils.instantiateClass(strategyClass));
}
context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
return context;

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
View File

@@ -67,7 +67,7 @@ public class DataSourceBuilder {
public DataSource build() {
Class<? extends DataSource> type = getType();
DataSource result = BeanUtils.instantiate(type);
DataSource result = BeanUtils.instantiateClass(type);
maybeGetDriverClassName();
bind(result);
return result;

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java
View File

@@ -95,7 +95,7 @@ public class XADataSourceAutoConfiguration implements BeanClassLoaderAware {
private XADataSource createXaDataSourceInstance(String className) {
try {
Class<?> dataSourceClass = ClassUtils.forName(className, this.classLoader);
Object instance = BeanUtils.instantiate(dataSourceClass);
Object instance = BeanUtils.instantiateClass(dataSourceClass);
Assert.isInstanceOf(XADataSource.class, instance);
return (XADataSource) instance;
}

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java
View File

@@ -46,7 +46,6 @@ import static org.mockito.BDDMockito.given;
* @author Stephane Nicoll
*
*/
@SuppressWarnings("deprecation")
public class EnableAutoConfigurationImportSelectorTests {
private final EnableAutoConfigurationImportSelector importSelector = new EnableAutoConfigurationImportSelector();
@@ -138,7 +137,8 @@ public class EnableAutoConfigurationImportSelectorTests {
@Test
public void combinedExclusionsAreApplied() {
configureExclusions(new String[] { GroovyTemplateAutoConfiguration.class.getName() },
configureExclusions(
new String[] { GroovyTemplateAutoConfiguration.class.getName() },
new String[] { FreeMarkerAutoConfiguration.class.getName() },
new String[] { ThymeleafAutoConfiguration.class.getName() });
String[] imports = this.importSelector.selectImports(this.annotationMetadata);