diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java index 6f71eb7c..5ae8b8f7 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/BatchExecutionEventTests.java @@ -27,6 +27,7 @@ import org.junit.After; import org.junit.ClassRule; import org.junit.Test; +import org.springframework.batch.core.scope.context.ChunkContext; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -189,7 +190,7 @@ public class BatchExecutionEventTests { public static class ItemProcessListenerBinding { @StreamListener(Sink.INPUT) - public void receive(Object object) { + public void receive(String object) { itemProcessLatch.countDown(); } } @@ -200,7 +201,7 @@ public class BatchExecutionEventTests { public static class ChunkEventsListenerBinding { @StreamListener(Sink.INPUT) - public void receive(Object chunkContext) { + public void receive(ChunkContext chunkContext) { chunkEventsLatch.countDown(); } } @@ -223,7 +224,7 @@ public class BatchExecutionEventTests { private static final String SKIPPING_READ_MESSAGE = "Skipped when reading."; private static final String SKIPPING_WRITE_CONTENT = "-1"; @StreamListener(Sink.INPUT) - public void receive(Object exceptionMessage) { + public void receive(String exceptionMessage) { if(exceptionMessage.toString().equals(SKIPPING_READ_MESSAGE)){ readSkipCount++; } @@ -240,7 +241,7 @@ public class BatchExecutionEventTests { public static class ItemWriteEventsListenerBinding { @StreamListener(Sink.INPUT) - public void receive(Object itemWrite) { + public void receive(String itemWrite) { assertTrue("Message should start with '3 items'", itemWrite.toString().startsWith("3 items ")); assertTrue("Message should end with ' written.'", itemWrite.toString().endsWith(" written.")); itemWriteEventsLatch.countDown(); diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 1d55ed36..ff66c11e 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/batch-job/pom.xml b/spring-cloud-task-samples/batch-job/pom.xml index c7f6426c..1b077697 100644 --- a/spring-cloud-task-samples/batch-job/pom.xml +++ b/spring-cloud-task-samples/batch-job/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/partitioned-batch-job/pom.xml b/spring-cloud-task-samples/partitioned-batch-job/pom.xml index f8ef81f5..0dcda5c7 100644 --- a/spring-cloud-task-samples/partitioned-batch-job/pom.xml +++ b/spring-cloud-task-samples/partitioned-batch-job/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 24441c2a..fbd48367 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index 36f206f5..c5dd4d23 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/taskprocessor/src/test/java/io/spring/TaskProcessorApplicationTests.java b/spring-cloud-task-samples/taskprocessor/src/test/java/io/spring/TaskProcessorApplicationTests.java index 61131409..3825089e 100644 --- a/spring-cloud-task-samples/taskprocessor/src/test/java/io/spring/TaskProcessorApplicationTests.java +++ b/spring-cloud-task-samples/taskprocessor/src/test/java/io/spring/TaskProcessorApplicationTests.java @@ -23,14 +23,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.stream.annotation.Bindings; import org.springframework.cloud.stream.messaging.Processor; import org.springframework.cloud.stream.test.binder.MessageCollector; import org.springframework.cloud.task.launcher.TaskLaunchRequest; import org.springframework.messaging.support.GenericMessage; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringRunner; import static org.hamcrest.CoreMatchers.is; @@ -47,7 +44,6 @@ public class TaskProcessorApplicationTests { private static final String DEFAULT_PAYLOAD = "hello"; @Autowired - @Bindings(TaskProcessor.class) protected Processor channels; @Autowired diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 597beec2..e15b8bc8 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java index 06f52a0e..8e900bb7 100644 --- a/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java +++ b/spring-cloud-task-samples/tasksink/src/test/java/io/spring/TaskSinkApplicationTests.java @@ -24,16 +24,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.deployer.spi.task.LaunchState; -import org.springframework.cloud.stream.annotation.Bindings; import org.springframework.cloud.stream.messaging.Sink; import org.springframework.cloud.task.launcher.TaskLaunchRequest; -import org.springframework.cloud.task.launcher.TaskLauncherSink; import org.springframework.context.ApplicationContext; import org.springframework.messaging.support.GenericMessage; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.assertEquals; @@ -50,7 +46,6 @@ public class TaskSinkApplicationTests { ApplicationContext context; @Autowired - @Bindings(TaskLauncherSink.class) private Sink sink; @Test @@ -58,7 +53,7 @@ public class TaskSinkApplicationTests { assertNotNull(this.sink.input()); TaskSinkConfiguration.TestTaskLauncher testTaskLauncher = - (TaskSinkConfiguration.TestTaskLauncher) context.getBean(TaskSinkConfiguration.TestTaskLauncher.class); + context.getBean(TaskSinkConfiguration.TestTaskLauncher.class); Map properties = new HashMap(); properties.put("server.port", "0"); diff --git a/spring-cloud-task-samples/timestamp/pom.xml b/spring-cloud-task-samples/timestamp/pom.xml index 4974da8f..5198f39a 100644 --- a/spring-cloud-task-samples/timestamp/pom.xml +++ b/spring-cloud-task-samples/timestamp/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 1.5.2.RELEASE diff --git a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java index ca173764..7a47f8bf 100644 --- a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java +++ b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java @@ -23,7 +23,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.test.OutputCapture; +import org.springframework.boot.test.rule.OutputCapture; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java index 40b34643..ec4cb6a1 100644 --- a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java +++ b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TimestampTaskPropertiesTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.EnvironmentTestUtils; +import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java index 5861c250..c4a89cec 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/configuration/TaskConfiguration.java @@ -19,6 +19,7 @@ package org.springframework.cloud.task.launcher.configuration; import java.util.List; import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest; +import org.springframework.cloud.deployer.spi.core.RuntimeEnvironmentInfo; import org.springframework.cloud.deployer.spi.task.LaunchState; import org.springframework.cloud.deployer.spi.task.TaskLauncher; import org.springframework.cloud.deployer.spi.task.TaskStatus; @@ -75,6 +76,11 @@ public class TaskConfiguration { throw new UnsupportedOperationException("Destroy is not supported"); } + @Override + public RuntimeEnvironmentInfo environmentInfo() { + throw new UnsupportedOperationException("environmentInfo is not supported"); + } + public List getCommandlineArguments() { return commandlineArguments; }