diff --git a/spring-cloud-stream-samples/double/pom.xml b/spring-cloud-stream-samples/double/pom.xml index 427892faf..a1d3cf996 100644 --- a/spring-cloud-stream-samples/double/pom.xml +++ b/spring-cloud-stream-samples/double/pom.xml @@ -7,7 +7,7 @@ jar spring-cloud-stream-sample-double - Demo project for Spring XD module + Demo project for Aggregate Builder org.springframework.cloud @@ -16,9 +16,7 @@ - UTF-8 - demo.SinkApplication - 1.8 + demo.DoubleApplication diff --git a/spring-cloud-stream-samples/extended/pom.xml b/spring-cloud-stream-samples/extended/pom.xml index a2adaf4be..b5eeba2fe 100644 --- a/spring-cloud-stream-samples/extended/pom.xml +++ b/spring-cloud-stream-samples/extended/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-sample-extended jar spring-cloud-stream-sample-extended - Demo project for Spring XD module + Demo project for extended module using aggregate builder org.springframework.cloud @@ -15,9 +15,7 @@ - UTF-8 - demo.SinkApplication - 1.8 + extended.ExtendedApplication diff --git a/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java b/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java index d6221243d..b4c5e3d2f 100644 --- a/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java +++ b/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java @@ -21,9 +21,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.stream.aggregate.AggregateBuilder; import org.springframework.cloud.stream.aggregate.AggregateConfigurer; -import sink.LogSink; -import source.TimeSource; -import transform.LoggingTransformer; +import demo.LogSink; +import demo.LoggingTransformer; +import demo.TimeSource; @SpringBootApplication public class ExtendedApplication implements AggregateConfigurer { diff --git a/spring-cloud-stream-samples/pom.xml b/spring-cloud-stream-samples/pom.xml index cae1b34fe..4d208c965 100644 --- a/spring-cloud-stream-samples/pom.xml +++ b/spring-cloud-stream-samples/pom.xml @@ -14,6 +14,10 @@ spring-cloud-stream-parent 1.0.0.BUILD-SNAPSHOT + + UTF-8 + 1.8 + source sink diff --git a/spring-cloud-stream-samples/sink/pom.xml b/spring-cloud-stream-samples/sink/pom.xml index 25c05a4d4..482a5b48e 100644 --- a/spring-cloud-stream-samples/sink/pom.xml +++ b/spring-cloud-stream-samples/sink/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-sample-sink jar spring-cloud-stream-sample-sink - Demo project for Spring XD module + Demo project for Sink module org.springframework.cloud @@ -15,9 +15,7 @@ - UTF-8 demo.SinkApplication - 1.8 diff --git a/spring-cloud-stream-samples/sink/src/main/java/sink/LogSink.java b/spring-cloud-stream-samples/sink/src/main/java/demo/LogSink.java similarity index 98% rename from spring-cloud-stream-samples/sink/src/main/java/sink/LogSink.java rename to spring-cloud-stream-samples/sink/src/main/java/demo/LogSink.java index 1db4dad0a..bd605ac72 100644 --- a/spring-cloud-stream-samples/sink/src/main/java/sink/LogSink.java +++ b/spring-cloud-stream-samples/sink/src/main/java/demo/LogSink.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package sink; +package demo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java b/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java index 5aff11711..8e2c3a120 100644 --- a/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java +++ b/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java @@ -18,12 +18,8 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; - -import sink.LogSink; @SpringBootApplication -@ComponentScan(basePackageClasses=LogSink.class) public class SinkApplication { public static void main(String[] args) { diff --git a/spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java b/spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java index b639ff666..472e8bf62 100644 --- a/spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java +++ b/spring-cloud-stream-samples/sink/src/test/java/demo/ModuleApplicationTests.java @@ -31,8 +31,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; -import sink.LogSink; - @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = SinkApplication.class) @WebAppConfiguration diff --git a/spring-cloud-stream-samples/source/pom.xml b/spring-cloud-stream-samples/source/pom.xml index 30bb3ac0e..057ca70a3 100644 --- a/spring-cloud-stream-samples/source/pom.xml +++ b/spring-cloud-stream-samples/source/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-sample-source jar spring-cloud-stream-sample-source - Demo project for Spring XD module + Demo project for source module org.springframework.cloud @@ -15,9 +15,7 @@ - UTF-8 demo.SourceApplication - 1.8 diff --git a/spring-cloud-stream-samples/source/src/main/java/source/DateFormat.java b/spring-cloud-stream-samples/source/src/main/java/demo/DateFormat.java similarity index 99% rename from spring-cloud-stream-samples/source/src/main/java/source/DateFormat.java rename to spring-cloud-stream-samples/source/src/main/java/demo/DateFormat.java index 3a49a3aa2..17e134cd5 100644 --- a/spring-cloud-stream-samples/source/src/main/java/source/DateFormat.java +++ b/spring-cloud-stream-samples/source/src/main/java/demo/DateFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package source; +package demo; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; diff --git a/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java b/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java index 48e907b21..277052040 100644 --- a/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java +++ b/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java @@ -18,12 +18,8 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; - -import source.TimeSource; @SpringBootApplication -@ComponentScan(basePackageClasses=TimeSource.class) public class SourceApplication { public static void main(String[] args) { diff --git a/spring-cloud-stream-samples/source/src/main/java/source/TimeSource.java b/spring-cloud-stream-samples/source/src/main/java/demo/TimeSource.java similarity index 99% rename from spring-cloud-stream-samples/source/src/main/java/source/TimeSource.java rename to spring-cloud-stream-samples/source/src/main/java/demo/TimeSource.java index 11c81b407..30da08a90 100644 --- a/spring-cloud-stream-samples/source/src/main/java/source/TimeSource.java +++ b/spring-cloud-stream-samples/source/src/main/java/demo/TimeSource.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package source; +package demo; + +import java.text.SimpleDateFormat; +import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -26,9 +29,6 @@ import org.springframework.integration.annotation.Poller; import org.springframework.integration.core.MessageSource; import org.springframework.messaging.support.GenericMessage; -import java.text.SimpleDateFormat; -import java.util.Date; - /** * @author Dave Syer * @author Glenn Renfro diff --git a/spring-cloud-stream-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java b/spring-cloud-stream-samples/source/src/main/java/demo/TimeSourceOptionsMetadata.java similarity index 99% rename from spring-cloud-stream-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java rename to spring-cloud-stream-samples/source/src/main/java/demo/TimeSourceOptionsMetadata.java index ab2fb3937..ceabf8c9c 100644 --- a/spring-cloud-stream-samples/source/src/main/java/source/TimeSourceOptionsMetadata.java +++ b/spring-cloud-stream-samples/source/src/main/java/demo/TimeSourceOptionsMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package source; +package demo; import javax.validation.constraints.Min; import javax.validation.constraints.Pattern; diff --git a/spring-cloud-stream-samples/tap/pom.xml b/spring-cloud-stream-samples/tap/pom.xml index 7397be60b..be92c72f8 100644 --- a/spring-cloud-stream-samples/tap/pom.xml +++ b/spring-cloud-stream-samples/tap/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-sample-tap jar spring-cloud-stream-sample-tap - Demo project for Spring XD module + Demo project for tap module org.springframework.cloud @@ -15,9 +15,7 @@ - UTF-8 demo.TapApplication - 1.8 diff --git a/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java b/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java index 09fecd05c..4e4623085 100644 --- a/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java +++ b/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java @@ -18,12 +18,8 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; - -import config.TappingLoggingSink; @SpringBootApplication -@ComponentScan(basePackageClasses= TappingLoggingSink.class) public class TapApplication { public static void main(String[] args) { diff --git a/spring-cloud-stream-samples/tap/src/main/java/config/TappingLoggingSink.java b/spring-cloud-stream-samples/tap/src/main/java/demo/TappingLoggingSink.java similarity index 98% rename from spring-cloud-stream-samples/tap/src/main/java/config/TappingLoggingSink.java rename to spring-cloud-stream-samples/tap/src/main/java/demo/TappingLoggingSink.java index 9167feb09..acb3d208a 100644 --- a/spring-cloud-stream-samples/tap/src/main/java/config/TappingLoggingSink.java +++ b/spring-cloud-stream-samples/tap/src/main/java/demo/TappingLoggingSink.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package config; +package demo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-stream-samples/transform/pom.xml b/spring-cloud-stream-samples/transform/pom.xml index d80b82c4f..b3d7c3d33 100644 --- a/spring-cloud-stream-samples/transform/pom.xml +++ b/spring-cloud-stream-samples/transform/pom.xml @@ -7,7 +7,7 @@ jar spring-cloud-stream-sample-transform - Demo project for Spring XD module + Demo project for transform module org.springframework.cloud @@ -16,9 +16,7 @@ - UTF-8 demo.TransformApplication - 1.8 diff --git a/spring-cloud-stream-samples/transform/src/main/java/transform/LoggingTransformer.java b/spring-cloud-stream-samples/transform/src/main/java/demo/LoggingTransformer.java similarity index 98% rename from spring-cloud-stream-samples/transform/src/main/java/transform/LoggingTransformer.java rename to spring-cloud-stream-samples/transform/src/main/java/demo/LoggingTransformer.java index ae36b0fdf..d6557734d 100644 --- a/spring-cloud-stream-samples/transform/src/main/java/transform/LoggingTransformer.java +++ b/spring-cloud-stream-samples/transform/src/main/java/demo/LoggingTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package transform; +package demo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java b/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java index b59c2a050..48e007b6a 100644 --- a/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java +++ b/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java @@ -18,12 +18,8 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; - -import transform.LoggingTransformer; @SpringBootApplication -@ComponentScan(basePackageClasses=LoggingTransformer.class) public class TransformApplication { public static void main(String[] args) {