From bd0b3f294fa58d03f136a1e2b866895e2eb71d92 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 21 Aug 2015 11:31:45 -0400 Subject: [PATCH] polishing --- .../cloud/stream/config/ChannelBindingProperties.java | 7 +++---- .../config/ChannelBindingAdapterConfigurationTests.java | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java index f66fac736..2481b654c 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingProperties.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; /** * @author Dave Syer - * + * @author Marius Bogoevici */ @ConfigurationProperties("spring.cloud.stream") @JsonInclude(Include.NON_DEFAULT) @@ -38,7 +38,7 @@ public class ChannelBindingProperties { public static final String PATH = "path"; @Value("${spring.application.name:}") - private String springApplicationName; + private String applicationName; private Properties consumerProperties = new Properties(); @@ -86,8 +86,7 @@ public class ChannelBindingProperties { } } // the default path of the binding is the channel name itself - return (StringUtils.hasText(springApplicationName)? springApplicationName + "." : "") - + channelName; + return (StringUtils.hasText(applicationName) ? applicationName + "." : "") + channelName; } public String getTapChannelName(String channelName) { diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java index 1ac5f893b..af14541e9 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java @@ -36,7 +36,6 @@ import org.springframework.cloud.stream.adapter.OutputChannelBinding; import org.springframework.cloud.stream.binder.local.LocalMessageChannelBinder; import org.springframework.cloud.stream.config.ChannelBindingAdapterConfigurationTests.Empty; import org.springframework.cloud.stream.utils.MessageChannelBeanDefinitionRegistryUtils; -import org.springframework.cloud.stream.utils.MockBinderConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import;