From 0cdbbd49b536a0268cea8607d2ce0651d4ca8e61 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 21 Sep 2016 17:34:54 +0100 Subject: [PATCH] Address warnings caused by deprecations in Spring Framework 5 See gh-6977 --- .../cassandra/CassandraAutoConfiguration.java | 2 +- .../data/mongo/MongoDataAutoConfiguration.java | 2 +- .../boot/autoconfigure/jdbc/DataSourceBuilder.java | 2 +- .../jdbc/XADataSourceAutoConfiguration.java | 2 +- .../EnableAutoConfigurationImportSelectorTests.java | 4 ++-- .../boot/test/context/SpringBootContextLoader.java | 2 +- .../web/client/MockServerRestTemplateCustomizer.java | 2 +- .../org/springframework/boot/SpringApplication.java | 2 +- .../boot/bind/PropertiesConfigurationFactory.java | 8 ++++---- .../boot/context/embedded/tomcat/TomcatErrorPage.java | 7 ++++--- .../boot/web/client/RestTemplateBuilder.java | 7 ++++--- .../boot/web/client/RestTemplateBuilderTests.java | 11 +++++++---- 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java index 00a13a7305..1c3b150ea5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java @@ -86,7 +86,7 @@ public class CassandraAutoConfiguration { } public static T instantiate(Class type) { - return BeanUtils.instantiate(type); + return BeanUtils.instantiateClass(type); } private QueryOptions getQueryOptions() { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java index 46fd223d59..465d391b51 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java @@ -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; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java index 7628136038..ee965f4db4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java @@ -67,7 +67,7 @@ public class DataSourceBuilder { public DataSource build() { Class type = getType(); - DataSource result = BeanUtils.instantiate(type); + DataSource result = BeanUtils.instantiateClass(type); maybeGetDriverClassName(); bind(result); return result; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java index 95dad6c436..810b440a42 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfiguration.java @@ -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; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java index 80e8cd07bb..7465f83af9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelectorTests.java @@ -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); diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java index fe5445b3f6..d4b8615644 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java @@ -162,7 +162,7 @@ public class SpringBootContextLoader extends AbstractContextLoader { initializers.addAll(application.getInitializers()); for (Class> initializerClass : config .getContextInitializerClasses()) { - initializers.add(BeanUtils.instantiate(initializerClass)); + initializers.add(BeanUtils.instantiateClass(initializerClass)); } return initializers; } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java index 056ff52300..427cc955f0 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java @@ -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() { diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 4ef5b8819c..33886817c5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -571,7 +571,7 @@ public class SpringApplication { ex); } } - return (ConfigurableApplicationContext) BeanUtils.instantiate(contextClass); + return (ConfigurableApplicationContext) BeanUtils.instantiateClass(contextClass); } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java index e94d012156..ecc7e8efd6 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java @@ -102,7 +102,7 @@ public class PropertiesConfigurationFactory @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 } 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 customizeBinder(dataBinder); Iterable relaxedTargetNames = getRelaxedTargetNames(); Set names = getNames(relaxedTargetNames); - PropertyValues propertyValues = getPropertySourcesPropertyValues(names, relaxedTargetNames); + PropertyValues propertyValues = getPropertySourcesPropertyValues(names, + relaxedTargetNames); dataBinder.bind(propertyValues); if (this.validator != null) { validate(dataBinder); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatErrorPage.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatErrorPage.java index aec6a27877..3c50794603 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatErrorPage.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatErrorPage.java @@ -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) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java index a53902dd84..a471f60b20 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java @@ -317,7 +317,7 @@ public class RestTemplateBuilder { public RestTemplateBuilder requestFactory( Class 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 build(Class 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(); diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java index 6cabe7810a..32e3f5a811 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java @@ -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); }