diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml index 85793eb2..72aab721 100644 --- a/spring-cloud-task-dependencies/pom.xml +++ b/spring-cloud-task-dependencies/pom.xml @@ -20,7 +20,7 @@ 1.0.0.RC3 1.0.0.M1 1.0.0.M1 - 1.0.0.RC2 + 1.0.0.RC3 @@ -72,8 +72,8 @@ org.springframework.cloud - spring-cloud-stream-binder-redis - ${spring-cloud-stream-binder-redis.version} + spring-cloud-starter-stream-rabbit + ${spring-cloud-stream-binder-rabbit.version} test diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 090f1eee..87c91238 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud - spring-cloud-stream-binder-redis + spring-cloud-starter-stream-rabbit test 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 9ab2c14c..9780051b 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 @@ -32,9 +32,9 @@ import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.binder.redis.config.RedisServiceAutoConfiguration; +import org.springframework.cloud.stream.binder.rabbit.config.RabbitServiceAutoConfiguration; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.redis.RedisTestSupport; +import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration; import org.springframework.cloud.task.batch.listener.BatchEventAutoConfiguration; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue; */ public class BatchExecutionEventTests { @ClassRule - public static RedisTestSupport redisTestSupport = new RedisTestSupport(); + public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); // Count for two job execution events per job static CountDownLatch jobExecutionLatch = new CountDownLatch(2); @@ -94,7 +94,7 @@ public class BatchExecutionEventTests { public void testContext() { applicationContext = new SpringApplicationBuilder() .sources(this.getConfigurations(BatchExecutionEventTests.ListenerBinding.class, JobConfiguration.class)) - .build().run(new String[]{ "--spring.cloud.task.closecontext.enable=false" }); + .build().run(getCommandLineParams("--spring.cloud.stream.bindings.job-execution-events.destination=bazbar")); assertNotNull(applicationContext.getBean("jobExecutionEventsListener")); assertNotNull(applicationContext.getBean("stepExecutionEventsListener")); @@ -258,7 +258,7 @@ public class BatchExecutionEventTests { TaskBatchAutoConfiguration.class, TaskEventAutoConfiguration.class, BatchEventAutoConfiguration.class, - RedisServiceAutoConfiguration.class, + RabbitServiceAutoConfiguration.class, sinkClazz }; } @@ -266,7 +266,7 @@ public class BatchExecutionEventTests { return new String[]{ "--spring.cloud.task.closecontext.enable=false", "--spring.cloud.task.name=" + TASK_NAME, "--spring.main.web-environment=false", - "--spring.cloud.stream.defaultBinder=redis", + "--spring.cloud.stream.defaultBinder=rabbit", "--spring.cloud.stream.bindings.task-events.destination=test", sinkChannelParam }; } diff --git a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java index b1b3f0f5..bd0b0e93 100644 --- a/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java +++ b/spring-cloud-task-integration-tests/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java @@ -31,16 +31,14 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.binder.redis.config.RedisServiceAutoConfiguration; +import org.springframework.cloud.stream.binder.rabbit.config.RabbitServiceAutoConfiguration; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.redis.RedisTestSupport; +import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -52,7 +50,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class TaskEventTests { @ClassRule - public static RedisTestSupport redisTestSupport = new RedisTestSupport(); + public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); // Count for two task execution events per task static CountDownLatch latch = new CountDownLatch(2); @@ -64,10 +62,10 @@ public class TaskEventTests { ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder().sources(new Object[] {TaskEventsConfiguration.class, TaskEventAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - RedisServiceAutoConfiguration.class}).build().run(new String[] {"--spring.cloud.task.closecontext.enable=false", + RabbitServiceAutoConfiguration.class}).build().run(new String[] {"--spring.cloud.task.closecontext.enable=false", "--spring.cloud.task.name=" + TASK_NAME, "--spring.main.web-environment=false", - "--spring.cloud.stream.defaultBinder=redis", + "--spring.cloud.stream.defaultBinder=rabbit", "--spring.cloud.stream.bindings.task-events.destination=test"}); assertNotNull(applicationContext.getBean("taskEventListener")); assertNotNull(applicationContext.getBean(TaskEventAutoConfiguration.TaskEventChannels.class)); @@ -89,10 +87,5 @@ public class TaskEventTests { assertTrue(String.format("Task name should be '%s'", TASK_NAME), execution.getTaskName().equals(TASK_NAME)); latch.countDown(); } - - @Bean - public RedisConnectionFactory redisConnectionFactory() { - return redisTestSupport.getResource(); - } } } diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index 27887a72..cc3e346a 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -46,7 +46,7 @@ org.springframework.cloud - spring-cloud-stream-binder-redis + spring-cloud-starter-stream-rabbit compile diff --git a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java index 3ae91cb9..f4a75172 100644 --- a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java +++ b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java @@ -30,14 +30,14 @@ import org.springframework.boot.test.OutputCapture; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.test.junit.redis.RedisTestSupport; +import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.context.annotation.PropertySource; public class BatchEventsApplicationTests { @ClassRule - public static RedisTestSupport redisTestSupport = new RedisTestSupport(); + public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); @Rule public OutputCapture outputCapture = new OutputCapture(); diff --git a/spring-cloud-task-samples/task-events/README.adoc b/spring-cloud-task-samples/task-events/README.adoc index a9d4118f..b2b471b3 100644 --- a/spring-cloud-task-samples/task-events/README.adoc +++ b/spring-cloud-task-samples/task-events/README.adoc @@ -30,4 +30,4 @@ $ java -jar /log-sink-1.0.0.BUILD-SNAPSHOT-exec.jar --serv == Dependencies: -The task processor requires an instance of Redis to be running. +The task processor requires an instance of RabbitMQ to be running. diff --git a/spring-cloud-task-samples/task-events/pom.xml b/spring-cloud-task-samples/task-events/pom.xml index 383487e9..0574c8ac 100644 --- a/spring-cloud-task-samples/task-events/pom.xml +++ b/spring-cloud-task-samples/task-events/pom.xml @@ -38,14 +38,9 @@ spring-cloud-task-stream - - org.springframework.boot - spring-boot-starter-redis - - org.springframework.cloud - spring-cloud-stream-binder-redis + spring-cloud-starter-stream-rabbit compile diff --git a/spring-cloud-task-samples/taskprocessor/README.adoc b/spring-cloud-task-samples/taskprocessor/README.adoc index 53f619e9..d7cc341d 100644 --- a/spring-cloud-task-samples/taskprocessor/README.adoc +++ b/spring-cloud-task-samples/taskprocessor/README.adoc @@ -39,4 +39,4 @@ $ ./mvnw clean install == Dependencies: -The task processor requires an instance of Redis to be running. +The task processor requires an instance of RabbitMQ to be running. diff --git a/spring-cloud-task-samples/taskprocessor/pom.xml b/spring-cloud-task-samples/taskprocessor/pom.xml index d58c2803..421b5066 100644 --- a/spring-cloud-task-samples/taskprocessor/pom.xml +++ b/spring-cloud-task-samples/taskprocessor/pom.xml @@ -38,13 +38,9 @@ org.springframework.cloud - spring-cloud-stream-binder-redis + spring-cloud-starter-stream-rabbit compile - - org.springframework.boot - spring-boot-starter-redis - org.springframework.boot spring-boot-configuration-processor diff --git a/spring-cloud-task-samples/tasksink/README.adoc b/spring-cloud-task-samples/tasksink/README.adoc index 5e81cd19..3856a95a 100644 --- a/spring-cloud-task-samples/tasksink/README.adoc +++ b/spring-cloud-task-samples/tasksink/README.adoc @@ -16,4 +16,4 @@ $ ./mvnw clean install == Dependencies: -The task processor requires an instance of Redis to be running. +The task processor requires an instance of RabbitMQ to be running. diff --git a/spring-cloud-task-samples/tasksink/pom.xml b/spring-cloud-task-samples/tasksink/pom.xml index 9fc7cef6..8eee826f 100644 --- a/spring-cloud-task-samples/tasksink/pom.xml +++ b/spring-cloud-task-samples/tasksink/pom.xml @@ -37,14 +37,9 @@ org.springframework.cloud - spring-cloud-stream-binder-redis + spring-cloud-starter-stream-rabbit compile - - org.springframework.boot - spring-boot-starter-redis - - org.springframework.cloud spring-cloud-stream-test-support diff --git a/spring-cloud-task-stream/pom.xml b/spring-cloud-task-stream/pom.xml index c3720cc0..cfc5a2d0 100644 --- a/spring-cloud-task-stream/pom.xml +++ b/spring-cloud-task-stream/pom.xml @@ -49,12 +49,7 @@ org.springframework.cloud - spring-cloud-stream-binder-redis - test - - - org.springframework.boot - spring-boot-starter-redis + spring-cloud-starter-stream-rabbit test diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java index 1bebc702..69bae067 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/batch/listener/EventJobExecutionTests.java @@ -35,7 +35,7 @@ import org.springframework.batch.core.StepExecution; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.cloud.stream.test.junit.redis.RedisTestSupport; +import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.batch.listener.support.JobExecutionEvent; import org.springframework.cloud.task.batch.listener.support.StepExecutionEvent; import org.springframework.cloud.task.configuration.EnableTask; @@ -64,7 +64,7 @@ public class EventJobExecutionTests { private JobInstance jobInstance; @ClassRule - public static RedisTestSupport redisTestSupport = new RedisTestSupport(); + public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); @Before public void setup() { diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java index 7704dcba..aa1fdf17 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/launcher/TaskLauncherSinkTests.java @@ -28,7 +28,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration; 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.stream.test.junit.redis.RedisTestSupport; +import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.launcher.configuration.TaskConfiguration; import org.springframework.cloud.task.launcher.util.TaskLauncherSinkApplication; import org.springframework.context.ApplicationContext; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; public class TaskLauncherSinkTests { @ClassRule - public static RedisTestSupport redisTestSupport = new RedisTestSupport(); + public static RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); private final static String DEFAULT_STATUS = "test_status"; diff --git a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java index c7f348a1..fa18843e 100644 --- a/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java +++ b/spring-cloud-task-stream/src/test/java/org/springframework/cloud/task/listener/TaskEventTests.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.cloud.stream.test.junit.redis.RedisTestSupport; +import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull; public class TaskEventTests { @Rule - public RedisTestSupport redisTestSupport = new RedisTestSupport(); + public RabbitTestSupport rabbitTestSupport = new RabbitTestSupport(); private static final String TASK_NAME = "taskEventTest";