diff --git a/spring-cloud-launcher/spring-cloud-launcher-configserver/src/test/java/org/springframework/cloud/launcher/configserver/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-configserver/src/test/java/org/springframework/cloud/launcher/configserver/DeployerApplicationTests.java new file mode 100644 index 0000000..ae43f51 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-configserver/src/test/java/org/springframework/cloud/launcher/configserver/DeployerApplicationTests.java @@ -0,0 +1,18 @@ +package org.springframework.cloud.launcher.configserver; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest({ "spring.cloud.config.server.git.uri=file:./target", + "spring.cloud.bus.enabled=false" }) +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml index e441f9a..aa70ef9 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/pom.xml @@ -17,11 +17,19 @@ - 1.1.0.RELEASE + 1.1.4.RELEASE + 1.4.4.RELEASE + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.springframework.cloud spring-cloud-dataflow-dependencies diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java index 441ea12..eb3616c 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/main/java/org/springframework/cloud/launcher/dataflow/DataFlowApplication.java @@ -16,26 +16,10 @@ package org.springframework.cloud.launcher.dataflow; -import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.batch.BatchDatabaseInitializer; -import org.springframework.boot.autoconfigure.batch.BatchProperties; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.dataflow.server.EnableDataFlowServer; -import org.springframework.cloud.dataflow.server.config.features.FeaturesProperties; -import org.springframework.cloud.dataflow.server.repository.RdbmsTaskDefinitionRepository; -import org.springframework.cloud.dataflow.server.repository.TaskDefinitionRepository; -import org.springframework.cloud.dataflow.server.repository.support.DataflowRdbmsInitializer; -import org.springframework.cloud.task.repository.support.TaskRepositoryInitializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ResourceLoader; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; - -import javax.sql.DataSource; /** * @author Spencer Gibb @@ -49,58 +33,4 @@ public class DataFlowApplication { SpringApplication.run(DataFlowApplication.class, args); } - /* - * Special case for local H2 with tcp, but not in memory. Create a load of beans that - * dataflow doesn't in this case, but probably should (see - * https://github.com/spring-cloud/spring-cloud-dataflow/issues/926). - */ - @Configuration - @ConditionalOnExpression("#{'${spring.datasource.url:}'.startsWith('jdbc:h2:tcp://localhost:') && !'${spring.datasource.url:}'.contains('/mem:')}") - public static class H2ServerConfiguration { - - @Bean - public JobRepositoryFactoryBean jobRepositoryFactoryBean(DataSource dataSource, - DataSourceTransactionManager dataSourceTransactionManager) { - JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); - repositoryFactoryBean.setDataSource(dataSource); - repositoryFactoryBean.setTransactionManager(dataSourceTransactionManager); - return repositoryFactoryBean; - } - - @Bean - public BatchDatabaseInitializer batchRepositoryInitializer( - DataSource dataSource, ResourceLoader resourceLoader, BatchProperties batchProperties) { - return new BatchDatabaseInitializer(dataSource, resourceLoader, batchProperties); - } - - @Bean - public TaskRepositoryInitializer taskRepositoryInitializer( - DataSource dataSource) { - TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer(); - taskRepositoryInitializer.setDataSource(dataSource); - return taskRepositoryInitializer; - } - - @Bean - @ConditionalOnMissingBean - public TaskDefinitionRepository taskDefinitionRepository(DataSource dataSource) - throws Exception { - return new RdbmsTaskDefinitionRepository(dataSource); - } - - @Bean - public DataSourceTransactionManager transactionManager(DataSource dataSource) { - return new DataSourceTransactionManager(dataSource); - } - - @Bean - public DataflowRdbmsInitializer dataflowRdbmsInitializer(DataSource dataSource, - FeaturesProperties featuresProperties) { - DataflowRdbmsInitializer dataflowRdbmsInitializer = new DataflowRdbmsInitializer( - featuresProperties); - dataflowRdbmsInitializer.setDataSource(dataSource); - return dataflowRdbmsInitializer; - } - } - } diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java new file mode 100644 index 0000000..a7c5fdc --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java @@ -0,0 +1,18 @@ +package org.springframework.cloud.launcher.dataflow; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest({ "spring.datasource.url=jdbc:h2:tcp://localhost:9096/./target/test", + "spring.cloud.bus.enabled=false", "eureka.client.enabled=false" }) +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-eureka/src/test/java/org/springframework/cloud/launcher/eureka/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-eureka/src/test/java/org/springframework/cloud/launcher/eureka/DeployerApplicationTests.java new file mode 100644 index 0000000..53630ee --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-eureka/src/test/java/org/springframework/cloud/launcher/eureka/DeployerApplicationTests.java @@ -0,0 +1,17 @@ +package org.springframework.cloud.launcher.eureka; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest("spring.cloud.bus.enabled=false") +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-h2/src/test/java/org/springframework/cloud/launcher/h2/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-h2/src/test/java/org/springframework/cloud/launcher/h2/DeployerApplicationTests.java new file mode 100644 index 0000000..1280bc3 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-h2/src/test/java/org/springframework/cloud/launcher/h2/DeployerApplicationTests.java @@ -0,0 +1,17 @@ +package org.springframework.cloud.launcher.h2; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest("spring.cloud.bus.enabled=false") +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/src/test/java/org/springframework/cloud/launcher/hystrixdashboard/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/src/test/java/org/springframework/cloud/launcher/hystrixdashboard/DeployerApplicationTests.java new file mode 100644 index 0000000..b7d434c --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-hystrixdashboard/src/test/java/org/springframework/cloud/launcher/hystrixdashboard/DeployerApplicationTests.java @@ -0,0 +1,17 @@ +package org.springframework.cloud.launcher.hystrixdashboard; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest({ "spring.cloud.bus.enabled=false", "eureka.client.enabled=false" }) +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-kafka/src/test/java/org/springframework/cloud/launcher/kafka/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-kafka/src/test/java/org/springframework/cloud/launcher/kafka/DeployerApplicationTests.java new file mode 100644 index 0000000..c6d16bd --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-kafka/src/test/java/org/springframework/cloud/launcher/kafka/DeployerApplicationTests.java @@ -0,0 +1,16 @@ +package org.springframework.cloud.launcher.kafka; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/test/java/org/springframework/cloud/launcher/zipkin/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/test/java/org/springframework/cloud/launcher/zipkin/DeployerApplicationTests.java new file mode 100644 index 0000000..9fd4037 --- /dev/null +++ b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/test/java/org/springframework/cloud/launcher/zipkin/DeployerApplicationTests.java @@ -0,0 +1,17 @@ +package org.springframework.cloud.launcher.zipkin; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest({ "spring.cloud.bus.enabled=false", "eureka.client.enabled=false" }) +public class DeployerApplicationTests { + + @Test + public void contextLoads() { + } + +}