Revert "Add @ConditionalOnMissingBean for JobRepository"

This reverts commit 73fc351d71.

See gh-43236
This commit is contained in:
Andy Wilkinson
2024-11-21 13:31:20 +00:00
parent d21952d6a9
commit 109e731c83
2 changed files with 0 additions and 29 deletions

View File

@@ -20,7 +20,6 @@ import java.util.List;
import javax.sql.DataSource;
import org.springframework.batch.core.configuration.BatchConfigurationException;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration;
import org.springframework.batch.core.explore.JobExplorer;
@@ -130,13 +129,6 @@ public class BatchAutoConfiguration {
return this.dataSource;
}
@Bean
@ConditionalOnMissingBean
@Override
public JobRepository jobRepository() throws BatchConfigurationException {
return super.jobRepository();
}
@Override
protected PlatformTransactionManager getTransactionManager() {
return this.transactionManager;

View File

@@ -517,13 +517,6 @@ class BatchAutoConfigurationTests {
});
}
@Test
void defaultJobRepositoryIsNotCreatedWhenUserDefinedJobRepositoryBean() {
this.contextRunner
.withUserConfiguration(TestConfigurationWithJobRepository.class, EmbeddedDataSourceConfiguration.class)
.run((context) -> assertThat(context).hasSingleBean(TestJobRepository.class));
}
private JobLauncherApplicationRunner createInstance(String... registeredJobNames) {
JobLauncherApplicationRunner runner = new JobLauncherApplicationRunner(mock(JobLauncher.class),
mock(JobExplorer.class), mock(JobRepository.class));
@@ -603,16 +596,6 @@ class BatchAutoConfigurationTests {
}
@TestAutoConfigurationPackage(City.class)
static class TestConfigurationWithJobRepository {
@Bean
TestJobRepository jobRepository() {
return mock(TestJobRepository.class);
}
}
@Configuration(proxyBeanMethods = false)
static class EntityManagerFactoryConfiguration {
@@ -897,8 +880,4 @@ class BatchAutoConfigurationTests {
}
interface TestJobRepository extends JobRepository {
}
}