minor improvements

- Remove `Configuration` annotation for `LifecycleConfiguration` and `EnableModuleConfiguration` as these aren't configuration classes
 - Rename the above classes after their functionality
This commit is contained in:
Ilayaperumal Gopinathan
2015-07-20 11:28:00 -07:00
committed by Mark Fisher
parent 37204febe2
commit 47c880d9fc
4 changed files with 6 additions and 12 deletions

View File

@@ -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 {};

View File

@@ -46,5 +46,4 @@ public class AggregateBuilderConfiguration implements CommandLineRunner {
}
aggregateBuilder().build();
}
}

View File

@@ -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();
}
}
}

View File

@@ -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,