Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ScopeConfiguration publicly accessible #3958

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-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.
Expand All @@ -24,8 +24,6 @@
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;
Expand Down Expand Up @@ -130,35 +128,3 @@ protected BatchConfigurer getConfigurer(Collection<BatchConfigurer> configurers)
}

}

/**
* 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;
}
}
@@ -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;
}
}