SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed TaskLauncherConfiguration

Browse Source 
Added spi and boot log starter to pom for streams
Changed deployer-local on main project pom to be test scope
This commit is contained in:
Glenn Renfro
2016-11-21 16:04:37 -05:00
parent dd5963e464
commit 986a2a098d
6 changed files with 11 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@@ -70,6 +70,7 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-local</artifactId>
<version>${spring-cloud-deployer-local.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

8
spring-cloud-task-stream/pom.xml
View File

@@ -34,6 +34,14 @@
<artifactId>spring-cloud-deployer-local</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-spi</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-core</artifactId>

46
spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/TaskLauncherConfiguration.java
View File

@@ -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());
}
}
}

3
spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/launcher/annotation/EnableTaskLauncher.java
View File

@@ -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 {
}

3
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationExistingTests.java
View File

@@ -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

48
spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLaunchConfigurationTests.java
View File

@@ -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);
}
}