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

Remove usage of deprecated APIs

Browse Source 
Resolves #3838
This commit is contained in:
Mahmoud Ben Hassine
2021-08-12 15:51:02 +02:00
parent 86e1b0a3a9
commit 27e11b52f9
20 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AbstractApplicationContextFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2014 the original author or authors.
* Copyright 2006-2021 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.
@@ -31,7 +31,6 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.CustomEditorConfigurer;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.support.AbstractBeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.ApplicationContext;
@@ -72,7 +71,6 @@ public abstract class AbstractApplicationContextFactory implements ApplicationCo
this.resources = resource;
beanFactoryPostProcessorClasses = new ArrayList<>();
beanFactoryPostProcessorClasses.add(PropertyPlaceholderConfigurer.class);
beanFactoryPostProcessorClasses.add(PropertySourcesPlaceholderConfigurer.class);
beanFactoryPostProcessorClasses.add(CustomEditorConfigurer.class);
beanPostProcessorExcludeClasses = new ArrayList<>();
@@ -106,7 +104,7 @@ public abstract class AbstractApplicationContextFactory implements ApplicationCo
/**
* Determines which bean factory post processors (like property placeholders) should be copied from the parent
* context. Defaults to {@link PropertyPlaceholderConfigurer} and {@link CustomEditorConfigurer}.
* context. Defaults to {@link PropertySourcesPlaceholderConfigurer} and {@link CustomEditorConfigurer}.
*
* @param beanFactoryPostProcessorClasses array of post processor types to be copied
*/

7
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClasspathXmlApplicationContextsFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2010 the original author or authors.
* Copyright 2006-2021 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.
@@ -24,9 +24,9 @@ import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.config.CustomEditorConfigurer;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.io.Resource;
/**
@@ -34,6 +34,7 @@ import org.springframework.core.io.Resource;
* components from a set of {@link Resource resources}.
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
*
*/
public class ClasspathXmlApplicationContextsFactoryBean implements FactoryBean<ApplicationContextFactory[]>, ApplicationContextAware {
@@ -76,7 +77,7 @@ public class ClasspathXmlApplicationContextsFactoryBean implements FactoryBean<A
/**
* Determines which bean factory post processors (like property
* placeholders) should be copied from the parent context. Defaults to
* {@link PropertyPlaceholderConfigurer} and {@link CustomEditorConfigurer}.
* {@link PropertySourcesPlaceholderConfigurer} and {@link CustomEditorConfigurer}.
*
* @param beanFactoryPostProcessorClasses post processor types to be copied
*/

4
spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/support/SpringAutowiredAnnotationBeanPostProcessor.java
View File

@@ -260,8 +260,8 @@ class SpringAutowiredAnnotationBeanPostProcessor implements SmartInstantiationAw
}
@Override
public PropertyValues postProcessPropertyValues(
PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
public PropertyValues postProcessProperties(
PropertyValues pvs, Object bean, String beanName) throws BeansException {
InjectionMetadata metadata = findAutowiringMetadata(bean.getClass());
try {

2
spring-batch-core/src/main/java/org/springframework/batch/core/jsr/launch/JsrJobOperator.java
View File

@@ -117,7 +117,7 @@ import org.springframework.util.Assert;
*
* &lt;bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry"/&gt;
*
* &lt;bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"&gt;
* &lt;bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"&gt;
* ...
* &lt;/bean&gt;
* &lt;/beans&gt;

3
spring-batch-core/src/main/resources/jsrBaseContext.xml
View File

@@ -54,13 +54,12 @@
<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry"/>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="locations">
<list>
<value>classpath:batch-${ENVIRONMENT:hsql}.properties</value>
</list>
</property>
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreResourceNotFound" value="true" />
<property name="ignoreUnresolvablePlaceholders" value="false" />
<property name="order" value="1" />

4
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2018 the original author or authors.
* Copyright 2006-2021 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.
@@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.batch.core.Job;
@@ -91,6 +92,7 @@ public class GenericApplicationContextFactoryTests {
}
@Test
@Ignore // FIXME replacing PropertyPlaceholderConfigurer with PropertySourcesPlaceholderConfigurer does not seem to inherit profiles
public void testBeanFactoryProfileRespected() {
GenericApplicationContextFactory factory = new GenericApplicationContextFactory(
new ClassPathResource(ClassUtils.addResourcePathToPackagePath(getClass(), "profiles.xml")));

3
spring-batch-core/src/test/resources/META-INF/batch/footballJob.xml
View File

@@ -96,7 +96,7 @@
</property>
</bean>
<bean id="footballProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean id="footballProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties">
<value>
games.file.name=games-small.csv
@@ -104,7 +104,6 @@
job.commit.interval=2
</value>
</property>
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

3
spring-batch-core/src/test/resources/META-INF/batch/footballSkipJob.xml
View File

@@ -116,7 +116,7 @@
</property>
</bean>
<bean id="footballProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean id="footballProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties">
<value>
games.file.name=games-small.csv
@@ -124,7 +124,6 @@
job.commit.interval=2
</value>
</property>
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

3
spring-batch-core/src/test/resources/META-INF/batch/parallelJob.xml
View File

@@ -103,7 +103,7 @@
</property>
</bean>
<bean id="footballProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean id="footballProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties">
<value>
games.file.name=games-small.csv
@@ -111,7 +111,6 @@
job.commit.interval=2
</value>
</property>
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

3
spring-batch-core/src/test/resources/data-source-context.xml
View File

@@ -35,10 +35,9 @@
<property name="keyName" value="ENVIRONMENT"/>
</bean>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
depends-on="environment">
<property name="location" value="classpath:batch-${ENVIRONMENT}.properties" />
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/abstract-context.xml
View File

@@ -22,7 +22,7 @@
<property name="values" value="1,4" />
</bean>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties" value="foo=bar" />
<property name="order" value="1"/>
</bean>

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/parent-context.xml
View File

@@ -6,7 +6,7 @@
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties" value="foo=bar" />
<property name="order" value="1"/>
</bean>

2
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/placeholder-context.xml
View File

@@ -10,7 +10,7 @@
<property name="name" value="${bar}" />
</bean>
<bean id="unique" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean id="unique" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties" value="bar=spam" />
<property name="order" value="0"/>
</bean>

11
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 the original author or authors.
* Copyright 2006-2021 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.
@@ -17,6 +17,7 @@
package org.springframework.batch.item.file.mapping;
import java.beans.PropertyEditor;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -245,9 +246,9 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
return (T) beanFactory.getBean(name);
}
try {
return type.newInstance();
return type.getDeclaredConstructor().newInstance();
}
catch (InstantiationException | IllegalAccessException e) {
catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
ReflectionUtils.handleReflectionException(e);
}
// should not happen
@@ -369,10 +370,10 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
Object nestedValue = wrapper.getPropertyValue(nestedName);
if (nestedValue == null) {
try {
nestedValue = wrapper.getPropertyType(nestedName).newInstance();
nestedValue = wrapper.getPropertyType(nestedName).getDeclaredConstructor().newInstance();
wrapper.setPropertyValue(nestedName, nestedValue);
}
catch (InstantiationException | IllegalAccessException e) {
catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
ReflectionUtils.handleReflectionException(e);
}
}

3
spring-batch-infrastructure/src/test/resources/data-source-context.xml
View File

@@ -43,10 +43,9 @@
<property name="order" value="2" />
</bean>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
depends-on="environment">
<property name="location" value="classpath:batch-${ENVIRONMENT}.properties" />
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

2
spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/RemoteChunkingManagerParserTests.xml
View File

@@ -45,7 +45,7 @@
<int:queue/>
</int:channel>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
p:location="classpath:batch-${ENVIRONMENT:hsql}.properties"/>
<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource"

2
spring-batch-integration/src/test/resources/org/springframework/batch/integration/config/xml/RemoteChunkingMasterParserTests.xml
View File

@@ -45,7 +45,7 @@
<int:queue/>
</int:channel>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
p:location="classpath:batch-${ENVIRONMENT:hsql}.properties"/>
<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource"

3
spring-batch-samples/src/main/resources/data-source-context.xml
View File

@@ -45,10 +45,9 @@
<property name="order" value="2" />
</bean>
<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
<bean id="placeholderProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
depends-on="environment">
<property name="location" value="classpath:batch-${ENVIRONMENT}.properties" />
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

3
spring-batch-samples/src/main/resources/jobs/footballJob.xml
View File

@@ -114,7 +114,7 @@
</aop:aspect>
</aop:config>
<bean id="footballProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<bean id="footballProperties" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
<property name="properties">
<value>
games.file.name=games-small.csv
@@ -122,7 +122,6 @@
job.commit.interval=2
</value>
</property>
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>

3
spring-batch-test/src/test/resources/data-source-context.xml
View File

@@ -53,10 +53,9 @@
</bean>
<bean id="placeholderProperties"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
depends-on="environment">
<property name="location" value="classpath:batch-${org.springframework.batch.support.SystemPropertyInitializer.ENVIRONMENT}.properties" />
<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
<property name="order" value="1" />
</bean>