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

Make ScopeConfiguration publicly accessible

Browse Source 
When using a hierarchy of Spring contexts, custom scopes
are not visible in child contexts. With this change, it is
now possible for users to import the configuration class
into child contexts and use job and step scope within them.

Issue #3958
This commit is contained in:
Henning Pöttker
2021-07-02 18:20:53 +02:00
committed by Mahmoud Ben Hassine
parent a6d68138ff
commit fce9a48080
2 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AbstractBatchConfiguration.java
View File

@@ -24,8 +24,6 @@ import org.springframework.batch.core.configuration.support.MapJobRegistry;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.scope.JobScope;
import org.springframework.batch.core.scope.StepScope;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -123,35 +121,3 @@ public abstract class AbstractBatchConfiguration implements ImportAware, Initial
}
}
/**
* Extract job/step scope configuration into a separate unit.
*
* @author Dave Syer
*
*/
@Configuration(proxyBeanMethods = false)
class ScopeConfiguration {
private static StepScope stepScope;
private static JobScope jobScope;
static {
jobScope = new JobScope();
jobScope.setAutoProxy(false);
stepScope = new StepScope();
stepScope.setAutoProxy(false);
}
@Bean
public static StepScope stepScope() {
return stepScope;
}
@Bean
public static JobScope jobScope() {
return jobScope;
}
}

52
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/ScopeConfiguration.java Normal file
View File

@@ -0,0 +1,52 @@
/*
* Copyright 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.core.configuration.annotation;
import org.springframework.batch.core.scope.JobScope;
import org.springframework.batch.core.scope.StepScope;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* {@code Configuration} class that provides {@link StepScope} and {@link JobScope}.
*
* @author Dave Syer
*/
@Configuration(proxyBeanMethods = false)
public class ScopeConfiguration {
private static StepScope stepScope;
private static JobScope jobScope;
static {
jobScope = new JobScope();
jobScope.setAutoProxy(false);
stepScope = new StepScope();
stepScope.setAutoProxy(false);
}
@Bean
public static StepScope stepScope() {
return stepScope;
}
@Bean
public static JobScope jobScope() {
return jobScope;
}
}