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

Update TaskLaunchRequest to use URI

Browse Source 
Update examples to use apps instead of modules

resolves spring-cloud/spring-cloud-task#146
This commit is contained in:
Glenn Renfro
2016-05-23 17:32:09 -04:00
parent a55970fe77
commit 7f53c7d9f7
11 changed files with 141 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-task-samples/taskprocessor/src/main/java/io/spring/TaskProcessor.java
View File

@@ -58,9 +58,7 @@ public class TaskProcessor {
}
properties.put("payload", message);
TaskLaunchRequest request = new TaskLaunchRequest(processorProperties.getArtifact(),
processorProperties.getGroup(), processorProperties.getVersion(), processorProperties.getExtension(),
processorProperties.getClassifiers(), properties);
TaskLaunchRequest request = new TaskLaunchRequest(processorProperties.getUri(), null, properties);
return new GenericMessage<TaskLaunchRequest>(request);
}

58
spring-cloud-task-samples/taskprocessor/src/main/java/io/spring/TaskProcessorProperties.java
View File

@@ -24,24 +24,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties
public class TaskProcessorProperties {
private static final String DEFAULT_GROUP = "io.spring.cloud";
private static final String DEFAULT_ARTIFACT = "timestamp-task";
private static final String DEFAULT_VERSION = "1.0.0.BUILD-SNAPSHOT";
private static final String DEFAULT_EXTENSION = "jar";
private static final String DEFAULT_URI = "maven://org.springframework.cloud.task.app:"
+ "timestamp-task:jar:1.0.0.BUILD-SNAPSHOT";
private String group = DEFAULT_GROUP;
private String artifact = DEFAULT_ARTIFACT;
private String version = DEFAULT_VERSION;
private String extension = DEFAULT_EXTENSION;
private String classifiers;
private String uri = DEFAULT_URI;
private String dataSourceUrl;
@@ -52,21 +39,6 @@ public class TaskProcessorProperties {
private String dataSourcePassword;
public String getExtension() {
return extension;
}
public void setExtension(String extension) {
this.extension = extension;
}
public String getClassifiers() {
return classifiers;
}
public void setClassifiers(String classifiers) {
this.classifiers = classifiers;
}
public String getDataSourceUrl() {
return dataSourceUrl;
@@ -100,27 +72,11 @@ public class TaskProcessorProperties {
this.dataSourcePassword = dataSourcePassword;
}
public void setGroup(String group) {
this.group = group;
public String getUri() {
return uri;
}
public String getGroup() {
return group;
}
public String getArtifact() {
return artifact;
}
public void setArtifact(String artifact) {
this.artifact = artifact;
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
public void setUri(String uri) {
this.uri = uri;
}
}

4
spring-cloud-task-samples/taskprocessor/src/test/java/io/spring/TaskProcessorApplicationTests.java
View File

@@ -55,8 +55,8 @@ public class TaskProcessorApplicationTests {
channels.input().send(new GenericMessage<Object>(DEFAULT_PAYLOAD));
Map<String, String> properties = new HashMap();
properties.put("payload", DEFAULT_PAYLOAD);
TaskLaunchRequest expectedRequest = new TaskLaunchRequest("timestamp-task",
"io.spring.cloud", "1.0.0.BUILD-SNAPSHOT", "jar", null, properties);
TaskLaunchRequest expectedRequest = new TaskLaunchRequest("maven://org.springframework.cloud.task.app:"
+ "timestamp-task:jar:1.0.0.BUILD-SNAPSHOT", null, properties);
assertThat(collector.forChannel(channels.output()), receivesPayloadThat(is(expectedRequest)));
}