diff --git a/pom.xml b/pom.xml index 46eb0512..75dc05a5 100755 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ org.springframework.cloud spring-cloud-deployer-local ${spring-cloud-deployer-local.version} + test org.springframework.cloud diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index 96639ea0..d7a5bacf 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -34,6 +34,14 @@ spring-cloud-deployer-local true + + org.springframework.boot + spring-boot-starter-logging + + + org.springframework.cloud + spring-cloud-deployer-spi + org.springframework.cloud spring-cloud-task-core diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherConfiguration.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherConfiguration.java deleted file mode 100644 index aa9a0eb4..00000000 --- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherConfiguration.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2016 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 - * - * http://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.cloud.task.launcher; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties; -import org.springframework.cloud.deployer.spi.local.LocalTaskLauncher; -import org.springframework.cloud.deployer.spi.task.TaskLauncher; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * Creates the appropriate Task Launcher Configuration based on the TaskLauncher - * that is available in the classpath. - * @author Glenn Renfro - */ - -@Configuration -@ConditionalOnClass({TaskLauncher.class}) -public class TaskLauncherConfiguration { - - @Configuration - @ConditionalOnMissingBean(name = "taskLauncher") - @ConditionalOnClass({LocalTaskLauncher.class}) - protected static class LocalTaskDeployerConfiguration { - @Bean - public TaskLauncher taskLauncher() { - return new LocalTaskLauncher(new LocalDeployerProperties()); - } - } -} diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/annotation/EnableTaskLauncher.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/annotation/EnableTaskLauncher.java index 441fb635..edb044d0 100644 --- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/annotation/EnableTaskLauncher.java +++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/annotation/EnableTaskLauncher.java @@ -25,7 +25,6 @@ import java.lang.annotation.Target; import org.springframework.cloud.deployer.spi.task.TaskLauncher; import org.springframework.cloud.task.launcher.TaskLaunchRequest; -import org.springframework.cloud.task.launcher.TaskLauncherConfiguration; import org.springframework.cloud.task.launcher.TaskLauncherSink; import org.springframework.context.annotation.Import; @@ -56,6 +55,6 @@ import org.springframework.context.annotation.Import; @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited -@Import({TaskLauncherConfiguration.class, TaskLauncherSink.class}) +@Import({TaskLauncherSink.class}) public @interface EnableTaskLauncher { } diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java index 6ae8c128..d801b56b 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java @@ -41,8 +41,7 @@ import static org.junit.Assert.assertNotNull; */ @RunWith(SpringRunner.class) @SpringBootTest(classes = - {TaskLaunchConfigurationExistingTests.TestTaskDeployerConfiguration.class, - TaskLauncherConfiguration.class}) + {TaskLaunchConfigurationExistingTests.TestTaskDeployerConfiguration.class}) public class TaskLaunchConfigurationExistingTests { @Autowired diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationTests.java deleted file mode 100644 index bb18c004..00000000 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationTests.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2016 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 - * - * http://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.cloud.task.launcher; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.deployer.spi.local.LocalTaskLauncher; -import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit4.SpringRunner; - -import static org.junit.Assert.assertNotNull; - -/** - * Tests the TaskLauncherConfiguration in a case where a TaskLauncher is not - * present. - * - * @author Glenn Renfro - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = {TaskLauncherConfiguration.class}) -public class TaskLaunchConfigurationTests { - @Autowired - ApplicationContext context; - - @Test - public void testTaskLauncher() { - LocalTaskLauncher taskLauncher = - context.getBean(LocalTaskLauncher.class); - assertNotNull(taskLauncher); - } -}