From 3b2b388d7648c8a9d0d5aeac082bac3c4d91aa79 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 13 Sep 2018 15:42:26 +0200 Subject: [PATCH] GH-1457 fixed property names in conditionals --- .../rabbit/config/RabbitServiceAutoConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java index 50336573b..3b8bd9151 100644 --- a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java +++ b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java @@ -82,11 +82,11 @@ public class RabbitServiceAutoConfiguration { } /** - * Active only if {@code spring.cloud.stream.overrideCloudConnectors} is not set to + * Active only if {@code spring.cloud.stream.override-cloud-connectors} is not set to * {@code true}. */ @Configuration - @ConditionalOnProperty(value = "spring.cloud.stream.overrideCloudConnectors", havingValue = "false", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.stream.override-cloud-connectors", havingValue = "false", matchIfMissing = true) // Required to parse Rabbit properties which are passed to the binder for // clustering. We need to enable it here explicitly as the default Rabbit // configuration is not triggered. @@ -124,11 +124,11 @@ public class RabbitServiceAutoConfiguration { } /** - * Configuration to be used if {@code spring.cloud.stream.overrideCloudConnectors} is set + * Configuration to be used if {@code spring.cloud.stream.override-cloud-connectors} is set * to {@code true}. Defers to Spring Boot auto-configuration. */ @Configuration - @ConditionalOnProperty("spring.cloud.stream.overrideCloudConnectors") + @ConditionalOnProperty("spring.cloud.stream.override-cloud-connectors") @Import(RabbitAutoConfiguration.class) protected static class OverrideCloudConnectors {