Updates for GraalVM
This commit updates all places where Spring Batch uses an @Configuration annotation to no proxy bean methods. This is needed for GraalVM support.
This commit is contained in:
committed by
Mahmoud Ben Hassine
parent
744d1834fe
commit
b708dfb025
@@ -23,6 +23,7 @@ import org.springframework.batch.integration.chunk.RemoteChunkingWorkerBuilder;
|
||||
import org.springframework.batch.integration.partition.RemotePartitioningMasterStepBuilderFactory;
|
||||
import org.springframework.batch.integration.partition.RemotePartitioningManagerStepBuilderFactory;
|
||||
import org.springframework.batch.integration.partition.RemotePartitioningWorkerStepBuilderFactory;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -34,8 +35,8 @@ import org.springframework.transaction.PlatformTransactionManager;
|
||||
* @since 4.1
|
||||
* @author Mahmoud Ben Hassine
|
||||
*/
|
||||
@Configuration
|
||||
public class BatchIntegrationConfiguration {
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
public class BatchIntegrationConfiguration implements InitializingBean {
|
||||
|
||||
private JobExplorer jobExplorer;
|
||||
|
||||
@@ -43,6 +44,18 @@ public class BatchIntegrationConfiguration {
|
||||
|
||||
private PlatformTransactionManager transactionManager;
|
||||
|
||||
private RemoteChunkingMasterStepBuilderFactory remoteChunkingMasterStepBuilderFactory;
|
||||
|
||||
private RemoteChunkingManagerStepBuilderFactory remoteChunkingManagerStepBuilderFactory;
|
||||
|
||||
private RemoteChunkingWorkerBuilder remoteChunkingWorkerBuilder;
|
||||
|
||||
private RemotePartitioningMasterStepBuilderFactory remotePartitioningMasterStepBuilderFactory;
|
||||
|
||||
private RemotePartitioningManagerStepBuilderFactory remotePartitioningManagerStepBuilderFactory;
|
||||
|
||||
private RemotePartitioningWorkerStepBuilderFactory remotePartitioningWorkerStepBuilderFactory;
|
||||
|
||||
@Autowired
|
||||
public BatchIntegrationConfiguration(
|
||||
JobRepository jobRepository,
|
||||
@@ -57,38 +70,47 @@ public class BatchIntegrationConfiguration {
|
||||
@Deprecated
|
||||
@Bean
|
||||
public RemoteChunkingMasterStepBuilderFactory remoteChunkingMasterStepBuilderFactory() {
|
||||
return new RemoteChunkingMasterStepBuilderFactory(this.jobRepository,
|
||||
this.transactionManager);
|
||||
return this.remoteChunkingMasterStepBuilderFactory;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public RemoteChunkingManagerStepBuilderFactory remoteChunkingManagerStepBuilderFactory() {
|
||||
return new RemoteChunkingManagerStepBuilderFactory(this.jobRepository,
|
||||
this.transactionManager);
|
||||
return this.remoteChunkingManagerStepBuilderFactory;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public <I,O> RemoteChunkingWorkerBuilder<I, O> remoteChunkingWorkerBuilder() {
|
||||
return new RemoteChunkingWorkerBuilder<>();
|
||||
return remoteChunkingWorkerBuilder;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@Bean
|
||||
public RemotePartitioningMasterStepBuilderFactory remotePartitioningMasterStepBuilderFactory() {
|
||||
return new RemotePartitioningMasterStepBuilderFactory(this.jobRepository,
|
||||
this.jobExplorer, this.transactionManager);
|
||||
return remotePartitioningMasterStepBuilderFactory;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public RemotePartitioningManagerStepBuilderFactory remotePartitioningManagerStepBuilderFactory() {
|
||||
return new RemotePartitioningManagerStepBuilderFactory(this.jobRepository,
|
||||
this.jobExplorer, this.transactionManager);
|
||||
return this.remotePartitioningManagerStepBuilderFactory;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public RemotePartitioningWorkerStepBuilderFactory remotePartitioningWorkerStepBuilderFactory() {
|
||||
return new RemotePartitioningWorkerStepBuilderFactory(this.jobRepository,
|
||||
this.jobExplorer, this.transactionManager);
|
||||
return this.remotePartitioningWorkerStepBuilderFactory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterPropertiesSet() throws Exception {
|
||||
this.remoteChunkingMasterStepBuilderFactory = new RemoteChunkingMasterStepBuilderFactory(this.jobRepository,
|
||||
this.transactionManager);
|
||||
this.remoteChunkingManagerStepBuilderFactory = new RemoteChunkingManagerStepBuilderFactory(this.jobRepository,
|
||||
this.transactionManager);
|
||||
this.remoteChunkingWorkerBuilder = new RemoteChunkingWorkerBuilder<>();
|
||||
this.remotePartitioningMasterStepBuilderFactory = new RemotePartitioningMasterStepBuilderFactory(this.jobRepository,
|
||||
this.jobExplorer, this.transactionManager);
|
||||
this.remotePartitioningManagerStepBuilderFactory = new RemotePartitioningManagerStepBuilderFactory(this.jobRepository,
|
||||
this.jobExplorer, this.transactionManager);
|
||||
this.remotePartitioningWorkerStepBuilderFactory = new RemotePartitioningWorkerStepBuilderFactory(this.jobRepository,
|
||||
this.jobExplorer, this.transactionManager);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user