root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Adapt to spring-jdbc being required by Spring Batch 

Closes gh-29487
This commit is contained in:
Madhura Bhave 2022-07-26 14:00:27 -07:00
parent 94ca5b5b53
commit 2804c84648
2 changed files with 0 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
View File

@ -41,7 +41,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.jdbc.datasource.init.DatabasePopulator;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@ -101,7 +100,6 @@ public class BatchAutoConfiguration {
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnClass(DatabasePopulator.class)
@Conditional(OnBatchDatasourceInitializationCondition.class) @Conditional(OnBatchDatasourceInitializationCondition.class)
static class DataSourceInitializerConfiguration { static class DataSourceInitializerConfiguration {

93
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJdbcTests.java
View File

@ -1,93 +0,0 @@
/*
* Copyright 2012-2022 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.boot.autoconfigure.batch;
import javax.sql.DataSource;
import com.zaxxer.hikari.HikariDataSource;
import org.junit.jupiter.api.Test;
import org.springframework.batch.core.configuration.annotation.BatchConfigurer;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.support.SimpleJobOperator;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.PlatformTransactionManager;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
/**
* Tests for {@link BatchAutoConfiguration} when Spring JDBC is not on the classpath.
*
* @author Andy Wilkinson
*/
@ClassPathExclusions("spring-jdbc-*.jar")
class BatchAutoConfigurationWithoutJdbcTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(BatchAutoConfiguration.class, TransactionAutoConfiguration.class))
.withUserConfiguration(BatchConfiguration.class);
@Test
void whenThereIsNoJdbcOnTheClasspathThenComponentsAreStillAutoConfigured() {
this.contextRunner.run((context) -> {
assertThat(context).hasSingleBean(JobLauncherApplicationRunner.class);
assertThat(context).hasSingleBean(JobExecutionExitCodeGenerator.class);
assertThat(context).hasSingleBean(SimpleJobOperator.class);
});
}
@Configuration
@EnableBatchProcessing
static class BatchConfiguration implements BatchConfigurer {
@Bean
DataSource dataSource() {
return new HikariDataSource();
}
@Override
public JobRepository getJobRepository() {
return mock(JobRepository.class);
}
@Override
public PlatformTransactionManager getTransactionManager() {
return mock(PlatformTransactionManager.class);
}
@Override
public JobLauncher getJobLauncher() {
return mock(JobLauncher.class);
}
@Override
public JobExplorer getJobExplorer() {
return mock(JobExplorer.class);
}
}
}