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);

2
spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@@ -162,7 +162,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
initializers.addAll(application.getInitializers());
for (Class<? extends ApplicationContextInitializer<?>> initializerClass : config
.getContextInitializerClasses()) {
initializers.add(BeanUtils.instantiate(initializerClass));
initializers.add(BeanUtils.instantiateClass(initializerClass));
}
return initializers;
}

2
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java
View File

@@ -94,7 +94,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer
}
protected RequestExpectationManager createExpectationManager() {
return BeanUtils.instantiate(this.expectationManager);
return BeanUtils.instantiateClass(this.expectationManager);
}
public MockRestServiceServer getServer() {

2
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@@ -571,7 +571,7 @@ public class SpringApplication {
ex);
}
}
return (ConfigurableApplicationContext) BeanUtils.instantiate(contextClass);
return (ConfigurableApplicationContext) BeanUtils.instantiateClass(contextClass);
}
/**

8
spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
View File

@@ -102,7 +102,7 @@ public class PropertiesConfigurationFactory<T>
@SuppressWarnings("unchecked")
public PropertiesConfigurationFactory(Class<?> type) {
Assert.notNull(type);
this.target = (T) BeanUtils.instantiate(type);
this.target = (T) BeanUtils.instantiateClass(type);
}
/**
@@ -226,8 +226,7 @@ public class PropertiesConfigurationFactory<T>
}
public void bindPropertiesToTarget() throws BindException {
Assert.state(this.propertySources != null,
"PropertySources should not be null");
Assert.state(this.propertySources != null, "PropertySources should not be null");
try {
if (this.logger.isTraceEnabled()) {
this.logger.trace("Property Sources: " + this.propertySources);
@@ -262,7 +261,8 @@ public class PropertiesConfigurationFactory<T>
customizeBinder(dataBinder);
Iterable<String> relaxedTargetNames = getRelaxedTargetNames();
Set<String> names = getNames(relaxedTargetNames);
PropertyValues propertyValues = getPropertySourcesPropertyValues(names, relaxedTargetNames);
PropertyValues propertyValues = getPropertySourcesPropertyValues(names,
relaxedTargetNames);
dataBinder.bind(propertyValues);
if (this.validator != null) {
validate(dataBinder);

7
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatErrorPage.java
View File

@@ -56,11 +56,12 @@ class TomcatErrorPage {
private Object createNativePage(ErrorPage errorPage) {
try {
if (ClassUtils.isPresent(ERROR_PAGE_CLASS, null)) {
return BeanUtils.instantiate(ClassUtils.forName(ERROR_PAGE_CLASS, null));
return BeanUtils
.instantiateClass(ClassUtils.forName(ERROR_PAGE_CLASS, null));
}
if (ClassUtils.isPresent(LEGACY_ERROR_PAGE_CLASS, null)) {
return BeanUtils
.instantiate(ClassUtils.forName(LEGACY_ERROR_PAGE_CLASS, null));
return BeanUtils.instantiateClass(
ClassUtils.forName(LEGACY_ERROR_PAGE_CLASS, null));
}
}
catch (ClassNotFoundException ex) {

7
spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
View File

@@ -317,7 +317,7 @@ public class RestTemplateBuilder {
public RestTemplateBuilder requestFactory(
Class<? extends ClientHttpRequestFactory> requestFactory) {
Assert.notNull(requestFactory, "RequestFactory must not be null");
return requestFactory(BeanUtils.instantiate(requestFactory));
return requestFactory(BeanUtils.instantiateClass(requestFactory));
}
/**
@@ -500,7 +500,7 @@ public class RestTemplateBuilder {
*/
public <T extends RestTemplate> T build(Class<T> restTemplateClass) {
return configure(BeanUtils.instantiate(restTemplateClass));
return configure(BeanUtils.instantiateClass(restTemplateClass));
}
/**
@@ -580,7 +580,8 @@ public class RestTemplateBuilder {
if (ClassUtils.isPresent(candidate.getKey(), classLoader)) {
Class<?> factoryClass = ClassUtils.resolveClassName(candidate.getValue(),
classLoader);
return (ClientHttpRequestFactory) BeanUtils.instantiate(factoryClass);
return (ClientHttpRequestFactory) BeanUtils
.instantiateClass(factoryClass);
}
}
return new SimpleClientHttpRequestFactory();

11
spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
View File

@@ -34,7 +34,6 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.client.Netty4ClientHttpRequestFactory;
import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
import org.springframework.http.client.OkHttpClientHttpRequestFactory;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.client.support.BasicAuthorizationInterceptor;
import org.springframework.http.converter.HttpMessageConverter;
@@ -478,19 +477,23 @@ public class RestTemplateBuilderTests {
}
@Test
@Deprecated
public void connectTimeoutCanBeConfiguredOnOkHttp2RequestFactory() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(OkHttpClientHttpRequestFactory.class)
.requestFactory(
org.springframework.http.client.OkHttpClientHttpRequestFactory.class)
.setConnectTimeout(1234).build().getRequestFactory();
assertThat(((OkHttpClient) ReflectionTestUtils.getField(requestFactory, "client"))
.getConnectTimeout()).isEqualTo(1234);
}
@Test
@Deprecated
public void readTimeoutCanBeConfiguredOnOkHttp2RequestFactory() {
ClientHttpRequestFactory requestFactory = this.builder
.requestFactory(OkHttpClientHttpRequestFactory.class).setReadTimeout(1234)
.build().getRequestFactory();
.requestFactory(
org.springframework.http.client.OkHttpClientHttpRequestFactory.class)
.setReadTimeout(1234).build().getRequestFactory();
assertThat(((OkHttpClient) ReflectionTestUtils.getField(requestFactory, "client"))
.getReadTimeout()).isEqualTo(1234);
}