SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed EnableModule to EnableBinding

Browse Source 
* renamed @ModuleChannels to @Bindings
* moved Source, Sink, and Processor to the `org.springframework.cloud.stream.messaging` package
* updated documentation
This commit is contained in:
Marius Bogoevici
2015-09-02 16:33:03 -04:00
committed by Mark Fisher
parent 0fd1e37a8f
commit 86e457fac4
30 changed files with 137 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-stream-samples/double/src/main/java/config/sink/SinkModuleDefinition.java
View File

@@ -18,15 +18,15 @@ package config.sink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.stream.annotation.EnableModule;
import org.springframework.cloud.stream.annotation.Sink;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.integration.annotation.ServiceActivator;
/**
* @author Dave Syer
* @author Marius Bogoevici
*/
@EnableModule(Sink.class)
@EnableBinding(Sink.class)
public class SinkModuleDefinition {
private static Logger logger = LoggerFactory.getLogger(SinkModuleDefinition.class);

7
spring-cloud-stream-samples/double/src/main/java/config/source/SourceModuleDefinition.java
View File

@@ -19,9 +19,8 @@ package config.source;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.stream.annotation.EnableModule;
import org.springframework.cloud.stream.annotation.Source;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.context.annotation.Bean;
import org.springframework.integration.annotation.InboundChannelAdapter;
import org.springframework.integration.annotation.Poller;
@@ -32,7 +31,7 @@ import org.springframework.messaging.support.GenericMessage;
* @author Dave Syer
* @author Marius Bogoevici
*/
@EnableModule(Source.class)
@EnableBinding(Source.class)
public class SourceModuleDefinition {
private String format = "yyyy-MM-dd HH:mm:ss";

6
spring-cloud-stream-samples/sink/src/main/java/demo/LogSink.java
View File

@@ -18,15 +18,15 @@ package demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.stream.annotation.EnableModule;
import org.springframework.cloud.stream.annotation.Sink;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.integration.annotation.ServiceActivator;
/**
* @author Dave Syer
*
*/
@EnableModule(Sink.class)
@EnableBinding(Sink.class)
public class LogSink {
private static Logger logger = LoggerFactory.getLogger(LogSink.class);

8
spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java
View File

@@ -22,10 +22,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.cloud.stream.annotation.ModuleChannels;
import org.springframework.cloud.stream.annotation.Bindings;
import org.springframework.cloud.stream.annotation.Output;
import org.springframework.cloud.stream.annotation.Sink;
import org.springframework.cloud.stream.annotation.Source;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -38,7 +38,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
public class ModuleApplicationTests {
@Autowired
@ModuleChannels(LogSink.class)
@Bindings(LogSink.class)
private Sink sink;
@Autowired

6
spring-cloud-stream-samples/source/src/main/java/demo/TimeSource.java
View File

@@ -21,8 +21,8 @@ import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.stream.annotation.EnableModule;
import org.springframework.cloud.stream.annotation.Source;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.context.annotation.Bean;
import org.springframework.integration.annotation.InboundChannelAdapter;
import org.springframework.integration.annotation.Poller;
@@ -34,7 +34,7 @@ import org.springframework.messaging.support.GenericMessage;
* @author Glenn Renfro
*
*/
@EnableModule(Source.class)
@EnableBinding(Source.class)
@EnableConfigurationProperties(TimeSourceOptionsMetadata.class)
public class TimeSource {

6
spring-cloud-stream-samples/tap/src/main/java/demo/TappingLoggingSink.java
View File

@@ -18,15 +18,15 @@ package demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.stream.annotation.EnableModule;
import org.springframework.cloud.stream.annotation.Sink;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.integration.annotation.ServiceActivator;
/**
* @author Dave Syer
* @author Marius Bogoevici
*/
@EnableModule(Sink.class)
@EnableBinding(Sink.class)
public class TappingLoggingSink {
private static Logger logger = LoggerFactory.getLogger(TappingLoggingSink.class);

6
spring-cloud-stream-samples/transform/src/main/java/demo/LoggingTransformer.java
View File

@@ -19,15 +19,15 @@ package demo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.stream.annotation.EnableModule;
import org.springframework.cloud.stream.annotation.Processor;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Processor;
import org.springframework.integration.annotation.ServiceActivator;
/**
* @author Dave Syer
*
*/
@EnableModule(Processor.class)
@EnableBinding(Processor.class)
@ConfigurationProperties("module.logging")
public class LoggingTransformer {