From 47c880d9fc13668a03603ba2b04e8c8171e5ab2f Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Mon, 20 Jul 2015 11:28:00 -0700
Subject: [PATCH] minor improvements

 - Remove `Configuration` annotation for `LifecycleConfiguration` and `EnableModuleConfiguration` as these aren't configuration classes
 - Rename the above classes after their functionality
---
 .../cloud/stream/annotation/EnableModule.java             | 8 ++++----
 .../stream/config/AggregateBuilderConfiguration.java      | 1 -
 ...onfiguration.java => ChannelBindingAdapterRunner.java} | 5 +----
 ...nableModuleConfiguration.java => ModuleRegistrar.java} | 4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)
 rename spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/{LifecycleConfiguration.java => ChannelBindingAdapterRunner.java} (88%)
 rename spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/{EnableModuleConfiguration.java => ModuleRegistrar.java} (93%)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java
index b2450819c..b5af638c1 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java
@@ -26,8 +26,8 @@ import java.lang.annotation.Target;
 import org.springframework.cloud.stream.config.AggregateBuilderConfiguration;
 import org.springframework.cloud.stream.config.ChannelBindingAdapterConfiguration;
 import org.springframework.cloud.stream.config.CodecConfiguration;
-import org.springframework.cloud.stream.config.EnableModuleConfiguration;
-import org.springframework.cloud.stream.config.LifecycleConfiguration;
+import org.springframework.cloud.stream.config.ModuleRegistrar;
+import org.springframework.cloud.stream.config.ChannelBindingAdapterRunner;
 import org.springframework.cloud.stream.config.RabbitServiceConfiguration;
 import org.springframework.cloud.stream.config.RedisServiceConfiguration;
 import org.springframework.context.annotation.Configuration;
@@ -47,8 +47,8 @@ import org.springframework.integration.annotation.MessageEndpoint;
 @Configuration
 @MessageEndpoint
 @Import({RedisServiceConfiguration.class, RabbitServiceConfiguration.class,
-	ChannelBindingAdapterConfiguration.class, CodecConfiguration.class, LifecycleConfiguration.class,
-	AggregateBuilderConfiguration.class, EnableModuleConfiguration.class})
+	ChannelBindingAdapterConfiguration.class, CodecConfiguration.class, ChannelBindingAdapterRunner.class,
+	AggregateBuilderConfiguration.class, ModuleRegistrar.class})
 public @interface EnableModule {
 
 	Class<?>[] value() default {};
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java
index e57980854..e59602ea3 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/AggregateBuilderConfiguration.java
@@ -46,5 +46,4 @@ public class AggregateBuilderConfiguration implements CommandLineRunner {
 		}
 		aggregateBuilder().build();
 	}
-
 }
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/LifecycleConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterRunner.java
similarity index 88%
rename from spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/LifecycleConfiguration.java
rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterRunner.java
index 72dea6ffa..3f25d14e2 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/LifecycleConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterRunner.java
@@ -19,14 +19,12 @@ package org.springframework.cloud.stream.config;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.cloud.stream.adapter.ChannelBindingAdapter;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * @author Dave Syer
  *
  */
-@Configuration
-public class LifecycleConfiguration implements CommandLineRunner {
+public class ChannelBindingAdapterRunner implements CommandLineRunner {
 
 	@Autowired
 	private ChannelBindingProperties module;
@@ -40,5 +38,4 @@ public class LifecycleConfiguration implements CommandLineRunner {
 			adapter.start();
 		}
 	}
-
 }
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnableModuleConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ModuleRegistrar.java
similarity index 93%
rename from spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnableModuleConfiguration.java
rename to spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ModuleRegistrar.java
index ea77f6665..5f81ad5af 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/EnableModuleConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ModuleRegistrar.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.cloud.stream.annotation.EnableModule;
 import org.springframework.cloud.stream.utils.MessageChannelBeanDefinitionRegistryUtils;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.ClassUtils;
@@ -32,8 +31,7 @@ import org.springframework.util.MultiValueMap;
  * @author Marius Bogoevici
  * @author Dave Syer
  */
-@Configuration
-public class EnableModuleConfiguration implements ImportBeanDefinitionRegistrar {
+public class ModuleRegistrar implements ImportBeanDefinitionRegistrar {
 
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata metadata,