Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6a4d945

Browse files
Patrick Schwizerfmbenhassine
Patrick Schwizer
authored andcommitted
remove JobRegistrySmartInitializingSingleton usage
Signed-off-by: Patrick Schwizer <schwizer.p@proton.me>
1 parent 3eaf8d9 commit 6a4d945

File tree

7 files changed

+8
-49
lines changed

7 files changed

+8
-49
lines changed

‎spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/test-context.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:aop="http://www.springframework.org/schema/aop"
4-
xmlns:tx="http://www.springframework.org/schema/tx"
53
xmlns:p="http://www.springframework.org/schema/p"
64
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
75
xsi:schemaLocation="
8-
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
9-
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
10-
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
11-
12-
<bean
13-
class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
14-
<property name="jobRegistry" ref="registry" />
15-
</bean>
6+
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
167

178
<bean id="registry"
189
class="org.springframework.batch.core.configuration.support.MapJobRegistry" />

‎spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/support/trivial-context-autoregister.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
</property>
1212
</bean>
1313

14-
<bean class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
15-
<property name="jobRegistry" ref="jobRegistry" />
16-
</bean>
17-
1814
<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry"/>
1915

2016
</beans>
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:aop="http://www.springframework.org/schema/aop"
4-
xmlns:tx="http://www.springframework.org/schema/tx"
5-
xmlns:p="http://www.springframework.org/schema/p"
63
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
74
xsi:schemaLocation="
8-
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
9-
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
10-
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
5+
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
116

127
<import resource="test-environment.xml" />
138
<import resource="job.xml" />
149
<import resource="job2.xml" />
15-
10+
1611
<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry"/>
17-
18-
<bean class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
19-
<property name="jobRegistry" ref="jobRegistry"/>
20-
</bean>
2112

2213
</beans>
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
3-
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
2+
<beans xmlns="http://www.springframework.org/schema/beans"
43
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
54
xsi:schemaLocation="
6-
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
7-
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
8-
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
5+
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
96

107
<import resource="test-environment-with-registry.xml" />
118

12-
<bean class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
13-
<property name="jobRegistry" ref="jobRegistry"/>
14-
</bean>
15-
169
</beans>

‎spring-batch-core/src/test/resources/simple-job-launcher-context.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66

77
<import resource="classpath:data-source-context.xml" />
88

9-
<bean class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
10-
<property name="jobRegistry" ref="jobRegistry"/>
11-
</bean>
12-
139
<bean id="jobRepository"
1410
class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean"
1511
p:dataSource-ref="dataSource" p:transactionManager-ref="transactionManager" />

‎spring-batch-samples/src/main/resources/org/springframework/batch/samples/restart/stop/stopRestartSample.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
<import resource="classpath:data-source-context.xml" />
77

8-
<bean class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
9-
<property name="jobRegistry" ref="jobRegistry"/>
10-
</bean>
11-
128
<bean id="jobRepository"
139
class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean"
1410
p:dataSource-ref="dataSource" p:transactionManager-ref="transactionManager"/>
@@ -34,21 +30,21 @@
3430
<property name="jobRepository" ref="jobRepository" />
3531
<property name="restartable" value="true" />
3632
</bean>
37-
33+
3834
<bean id="taskletStep" class="org.springframework.batch.core.step.tasklet.TaskletStep" abstract="true">
3935
<property name="transactionManager" ref="transactionManager" />
4036
<property name="jobRepository" ref="jobRepository" />
4137
<property name="allowStartIfComplete" value="true" />
4238
</bean>
43-
39+
4440
<bean id="simpleStep" class="org.springframework.batch.core.step.factory.FaultTolerantStepFactoryBean" abstract="true">
4541
<property name="transactionManager" ref="transactionManager" />
4642
<property name="jobRepository" ref="jobRepository" />
4743
</bean>
4844

4945
<bean id="infiniteLoopJob" parent="simpleJob">
5046
<property name="jobParametersIncrementer">
51-
<bean class="org.springframework.batch.core.launch.support.RunIdIncrementer" />
47+
<bean class="org.springframework.batch.core.launch.support.RunIdIncrementer" />
5248
</property>
5349
<property name="steps">
5450
<bean id="infiniteStep" parent="simpleStep">

‎spring-batch-samples/src/main/resources/simple-job-launcher-context.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66

77
<import resource="data-source-context.xml" />
88

9-
<bean class="org.springframework.batch.core.configuration.support.JobRegistrySmartInitializingSingleton">
10-
<property name="jobRegistry" ref="jobRegistry"/>
11-
</bean>
12-
139
<bean id="jobRepository"
1410
class="org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean"
1511
p:dataSource-ref="dataSource" p:transactionManager-ref="transactionManager"/>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /