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

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>