From 8aa02da2cd6cc903acceba3d577681e1617046e5 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Mon, 27 Jun 2016 17:20:22 -0500 Subject: [PATCH] Renamed properties to better be grouped in YAML Updated Unit tests to pass --- .../src/main/asciidoc/stream.adoc | 14 +++++++------- .../listener/BatchEventAutoConfiguration.java | 14 +++++++------- .../batch/listener/EventJobExecutionTests.java | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spring-cloud-task-docs/src/main/asciidoc/stream.adoc b/spring-cloud-task-docs/src/main/asciidoc/stream.adoc index 7c059e89..6a787af6 100644 --- a/spring-cloud-task-docs/src/main/asciidoc/stream.adoc +++ b/spring-cloud-task-docs/src/main/asciidoc/stream.adoc @@ -170,11 +170,11 @@ To disable a specific batch event use the following configuration: `spring.cloud.task.events..enabled=false`: ``` -spring.cloud.task.events.job.execution.listener.enabled=false -spring.cloud.task.events.step.execution.listener.enabled=false -spring.cloud.task.events.chunk.listener.enabled=false -spring.cloud.task.events.item.read.listener.enabled=false -spring.cloud.task.events.item.write.listener.enabled=false -spring.cloud.task.events.item.process.listener.enabled=false -spring.cloud.task.events.skip.listener.enabled=false +spring.cloud.task.batch.events.job-execution.enabled=false +spring.cloud.task.batch.events.step-execution.enabled=false +spring.cloud.task.batch.events.chunk.enabled=false +spring.cloud.task.batch.events.item-read.enabled=false +spring.cloud.task.batch.events.item-process.enabled=false +spring.cloud.task.batch.events.item-write.enabled=false +spring.cloud.task.batch.events.skip.enabled=false ``` diff --git a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java index be8761c0..f454063f 100644 --- a/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java +++ b/spring-cloud-task-stream/src/main/java/org/springframework/cloud/task/batch/listener/BatchEventAutoConfiguration.java @@ -82,20 +82,20 @@ public class BatchEventAutoConfiguration { @Bean @Lazy - @ConditionalOnProperty(prefix = "spring.cloud.task.events.job.execution.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.job-execution", name = "enabled", havingValue = "true", matchIfMissing = true) public JobExecutionListener jobExecutionEventsListener() { return new EventEmittingJobExecutionListener(listenerChannels.jobExecutionEvents()); } @Bean - @ConditionalOnProperty(prefix = "spring.cloud.task.events.step.execution.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.step-execution", name = "enabled", havingValue = "true", matchIfMissing = true) public StepExecutionListener stepExecutionEventsListener() { return new EventEmittingStepExecutionListener(listenerChannels.stepExecutionEvents()); } @Bean @Lazy - @ConditionalOnProperty(prefix = "spring.cloud.task.events.chunk.events.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.chunk", name = "enabled", havingValue = "true", matchIfMissing = true) public GatewayProxyFactoryBean chunkEventsListener() { GatewayProxyFactoryBean factoryBean = new GatewayProxyFactoryBean(ChunkListener.class); @@ -106,25 +106,25 @@ public class BatchEventAutoConfiguration { } @Bean - @ConditionalOnProperty(prefix = "spring.cloud.task.events.item.read.events.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-read", name = "enabled", havingValue = "true", matchIfMissing = true) public ItemReadListener itemReadEventsListener() { return new EventEmittingItemReadListener(listenerChannels.itemReadEvents()); } @Bean - @ConditionalOnProperty(prefix = "spring.cloud.task.events.item.write.events.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-write", name = "enabled", havingValue = "true", matchIfMissing = true) public ItemWriteListener itemWriteEventsListener() { return new EventEmittingItemWriteListener(listenerChannels.itemWriteEvents()); } @Bean - @ConditionalOnProperty(prefix = "spring.cloud.task.events.item.process.events.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.item-process", name = "enabled", havingValue = "true", matchIfMissing = true) public ItemProcessListener itemProcessEventsListener() { return new EventEmittingItemProcessListener(listenerChannels.itemProcessEvents()); } @Bean - @ConditionalOnProperty(prefix = "spring.cloud.task.events.skip.events.listener", name = "enabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.cloud.task.batch.events.skip", name = "enabled", havingValue = "true", matchIfMissing = true) public SkipListener skipEventsListener() { return new EventEmittingSkipListener(listenerChannels.skipEvents()); } 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 d77d38d5..100d69e0 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 @@ -138,43 +138,43 @@ public class EventJobExecutionTests { @Test public void testDisabledJobExecutionListener() { - testDisabledConfiguration("spring.cloud.task.events.job.execution.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.job-execution.enabled", BatchEventAutoConfiguration.JOB_EXECUTION_EVENTS_LISTENER); } @Test public void testDisabledStepExecutionListener() { - testDisabledConfiguration("spring.cloud.task.events.step.execution.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.step-execution.enabled", BatchEventAutoConfiguration.STEP_EXECUTION_EVENTS_LISTENER); } @Test public void testDisabledChunkListener() { - testDisabledConfiguration("spring.cloud.task.events.chunk.events.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.chunk.enabled", BatchEventAutoConfiguration.CHUNK_EVENTS_LISTENER); } @Test public void testDisabledItemReadListener() { - testDisabledConfiguration("spring.cloud.task.events.item.read.events.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.item-read.enabled", BatchEventAutoConfiguration.ITEM_READ_EVENTS_LISTENER); } @Test public void testDisabledItemWriteListener() { - testDisabledConfiguration("spring.cloud.task.events.item.write.events.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.item-write.enabled", BatchEventAutoConfiguration.ITEM_WRITE_EVENTS_LISTENER); } @Test public void testDisabledItemProcessListener() { - testDisabledConfiguration("spring.cloud.task.events.item.process.events.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.item-process.enabled", BatchEventAutoConfiguration.ITEM_PROCESS_EVENTS_LISTENER); } @Test public void testDisabledSkipEventListener() { - testDisabledConfiguration("spring.cloud.task.events.skip.events.listener.enabled", + testDisabledConfiguration("spring.cloud.task.batch.events.skip.enabled", BatchEventAutoConfiguration.SKIP_EVENTS_LISTENER); }