Refactoring samples

Restructuring the samples repository
Add more docker support
Add acceptance tests for the apps
Adding sensor average processor sample
Remove aggregate samples

testing-samples/testing-demo/src/main/java/org/springframework/cloud/stream/testing/processor/ToUpperCaseProcessor.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.processor;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.messaging.handler.annotation.SendTo;
+
+/**
+ * The Spring Cloud Stream Processor application,
+ * which convert incoming String to its upper case representation.
+ *
+ * @author Artem Bilan
+ *
+ */
+@SpringBootApplication
+@EnableBinding(Processor.class)
+public class ToUpperCaseProcessor {
+
+	@StreamListener(Processor.INPUT)
+	@SendTo(Processor.OUTPUT)
+	public String transform(String payload) {
+		return payload.toUpperCase();
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(ToUpperCaseProcessor.class, args);
+	}
+
+}

testing-samples/testing-demo/src/main/java/org/springframework/cloud/stream/testing/sink/JdbcSink.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.sink;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.messaging.Sink;
+import org.springframework.context.annotation.Bean;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.jdbc.JdbcMessageHandler;
+import org.springframework.messaging.MessageHandler;
+
+import javax.sql.DataSource;
+
+/**
+ * The Spring Cloud Stream Sink application,
+ * which insert payloads of incoming messages to the FOOBAR table in the RDBMS.
+ *
+ * @author Artem Bilan
+ *
+ */
+@SpringBootApplication
+@EnableBinding(Sink.class)
+public class JdbcSink {
+
+	@Bean
+	@ServiceActivator(inputChannel = Sink.INPUT)
+	public MessageHandler jdbcHandler(DataSource dataSource) {
+		return new JdbcMessageHandler(dataSource, "INSERT INTO foobar (value) VALUES (:payload)");
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(JdbcSink.class, args);
+	}
+
+}

testing-samples/testing-demo/src/main/java/org/springframework/cloud/stream/testing/source/FooBarSource.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.source;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+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;
+import org.springframework.integration.core.MessageSource;
+import org.springframework.messaging.support.GenericMessage;
+
+/**
+ * The Spring Cloud Stream Source application,
+ * which generates each 100 milliseconds "foo" or "bar" string in round-robin manner.
+ *
+ * @author Artem Bilan
+ *
+ */
+@SpringBootApplication
+@EnableBinding(Source.class)
+public class FooBarSource {
+
+	private AtomicBoolean semaphore = new AtomicBoolean(true);
+
+	@Bean
+	@InboundChannelAdapter(channel = Source.OUTPUT, poller = @Poller(fixedDelay = "100"))
+	public MessageSource<String> fooBarStrings() {
+		return () ->
+				new GenericMessage<>(this.semaphore.getAndSet(!this.semaphore.get()) ? "foo" : "bar");
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(FooBarSource.class, args);
+	}
+
+}

testing-samples/testing-demo/src/test/java/org/springframework/cloud/stream/testing/processor/NaiveToUpperCaseTests.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.processor;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * The simple test-case to demonstrate how it is easy to apply unit testing assertion
+ * for te Spring Cloud Stream applications.
+ *
+ * @author Artem Bilan
+ *
+ */
+public class NaiveToUpperCaseTests {
+
+	@Test
+	public void testUpperCase() {
+		assertEquals("FOO", new ToUpperCaseProcessor().transform("foo"));
+	}
+
+}

testing-samples/testing-demo/src/test/java/org/springframework/cloud/stream/testing/processor/ToUpperCaseProcessorTests.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.processor;
+
+import org.hamcrest.Matcher;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.cloud.stream.test.binder.MessageCollector;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.SubscribableChannel;
+import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.concurrent.BlockingQueue;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesMessageThat;
+import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesPayloadThat;
+import static org.springframework.integration.test.matcher.PayloadAndHeaderMatcher.sameExceptIgnorableHeaders;
+
+/**
+ * The Spring Boot-base test-case to demonstrate how can we test Spring Cloud Stream applications
+ * with available testing tools.
+ *
+ * @author Artem Bilan
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@DirtiesContext
+@Ignore
+public class ToUpperCaseProcessorTests {
+
+	@Autowired
+	private Processor channels;
+
+	@Autowired
+	private MessageCollector collector;
+
+	@SpyBean
+	private ToUpperCaseProcessor toUpperCaseProcessor;
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void testMessages() {
+		SubscribableChannel input = this.channels.input();
+
+		input.send(new GenericMessage<>("foo"));
+		input.send(new GenericMessage<>("bar"));
+		input.send(new GenericMessage<>("foo meets bar"));
+		input.send(new GenericMessage<>("nothing but the best test"));
+
+		BlockingQueue<Message<?>> messages = this.collector.forChannel(channels.output());
+
+		assertThat(messages, receivesPayloadThat(is("FOO")));
+		assertThat(messages, receivesPayloadThat(is("BAR")));
+		assertThat(messages, receivesPayloadThat(is("FOO MEETS BAR")));
+		assertThat(messages, receivesPayloadThat(not("nothing but the best test")));
+
+		Message<String> testMessage =
+				MessageBuilder.withPayload("headers")
+						.setHeader("foo", "bar")
+						.build();
+
+		input.send(testMessage);
+
+		Message<String> expected =
+				MessageBuilder.withPayload("HEADERS")
+						.copyHeaders(testMessage.getHeaders())
+						.build();
+
+		Matcher<Message<Object>> sameExceptIgnorableHeaders =
+				(Matcher<Message<Object>>) (Matcher<?>) sameExceptIgnorableHeaders(expected);
+
+		assertThat(messages, receivesMessageThat(sameExceptIgnorableHeaders));
+
+		verify(this.toUpperCaseProcessor, times(5)).transform(anyString());
+	}
+
+}

testing-samples/testing-demo/src/test/java/org/springframework/cloud/stream/testing/processor/integration/ToUpperCaseProcessorIntTests.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.processor.integration;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.stream.testing.processor.ToUpperCaseProcessor;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.test.rule.KafkaEmbedded;
+import org.springframework.kafka.test.utils.KafkaTestUtils;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Iterator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * A Spring Boot integration test for the Spring Cloud Stream Processor application
+ * based on the Embedded Kafka.
+ *
+ * @author Artem Bilan
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+		properties = {
+				"spring.autoconfigure.exclude=org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration",
+				"spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer",
+				"spring.cloud.stream.bindings.output.producer.headerMode=raw",
+				"spring.cloud.stream.bindings.input.consumer.headerMode=raw",
+				"spring.cloud.stream.bindings.input.group=embeddedKafkaApplication",
+				"spring.kafka.consumer.group-id=EmbeddedKafkaIntTest"
+		},
+		classes = ToUpperCaseProcessor.class,
+		webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@DirtiesContext
+@Ignore
+public class ToUpperCaseProcessorIntTests {
+
+	@ClassRule
+	public static KafkaEmbedded kafkaEmbedded = new KafkaEmbedded(1, true, "output");
+
+	@Autowired
+	private KafkaTemplate<byte[], byte[]> template;
+
+	@Autowired
+	private DefaultKafkaConsumerFactory<byte[], String> consumerFactory;
+
+	@BeforeClass
+	public static void setup() {
+		System.setProperty("spring.kafka.bootstrap-servers", kafkaEmbedded.getBrokersAsString());
+		System.setProperty("spring.cloud.stream.kafka.binder.zkNodes", kafkaEmbedded.getZookeeperConnectionString());
+	}
+
+	@Test
+	public void testMessagesOverKafka() throws Exception {
+		this.template.send("input", "bar".getBytes());
+
+		Consumer<byte[], String> consumer = this.consumerFactory.createConsumer();
+
+		kafkaEmbedded.consumeFromAnEmbeddedTopic(consumer, "output");
+
+		ConsumerRecords<byte[], String> replies = KafkaTestUtils.getRecords(consumer);
+		assertThat(replies.count()).isEqualTo(1);
+
+		Iterator<ConsumerRecord<byte[], String>> iterator = replies.iterator();
+		assertThat(iterator.next().value()).isEqualTo("BAR");
+	}
+
+}

testing-samples/testing-demo/src/test/java/org/springframework/cloud/stream/testing/sink/JdbcSinkTests.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.sink;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.cloud.stream.messaging.Sink;
+import org.springframework.integration.channel.AbstractMessageChannel;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.support.ChannelInterceptorAdapter;
+import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * The Spring Boot-base test-case to demonstrate how can we test Spring Cloud Stream applications
+ * with available testing tools.
+ *
+ * @author Artem Bilan
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@DirtiesContext
+public class JdbcSinkTests {
+
+	@Autowired
+	private Sink channels;
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	@SpyBean(name = "jdbcHandler")
+	private MessageHandler jdbcMessageHandler;
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void testMessages() {
+		AbstractMessageChannel input = (AbstractMessageChannel) this.channels.input();
+
+		final AtomicReference<Message<?>> messageAtomicReference = new AtomicReference<>();
+
+		ChannelInterceptorAdapter assertionInterceptor = new ChannelInterceptorAdapter() {
+
+			@Override
+			public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, Exception ex) {
+				messageAtomicReference.set(message);
+				super.afterSendCompletion(message, channel, sent, ex);
+			}
+
+		};
+
+		input.addInterceptor(assertionInterceptor);
+
+		input.send(new GenericMessage<>("foo"));
+
+		input.removeInterceptor(assertionInterceptor);
+
+		input.send(new GenericMessage<>("bar"));
+
+		List<Map<String, Object>> data = this.jdbcTemplate.queryForList("SELECT * FROM foobar");
+
+		assertThat(data.size()).isEqualTo(2);
+		assertThat(data.get(0).get("value")).isEqualTo("foo");
+		assertThat(data.get(1).get("value")).isEqualTo("bar");
+
+		Message<?> message1 = messageAtomicReference.get();
+		assertThat(message1).isNotNull();
+		assertThat(message1).hasFieldOrPropertyWithValue("payload", "foo");
+
+		ArgumentCaptor<Message<?>> messageArgumentCaptor =
+				(ArgumentCaptor<Message<?>>) (ArgumentCaptor<?>) ArgumentCaptor.forClass(Message.class);
+
+		verify(this.jdbcMessageHandler, times(2)).handleMessage(messageArgumentCaptor.capture());
+
+		Message<?> message = messageArgumentCaptor.getValue();
+		assertThat(message).hasFieldOrPropertyWithValue("payload", "bar");
+	}
+
+}

testing-samples/testing-demo/src/test/java/org/springframework/cloud/stream/testing/source/FooBarSourceTests.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.testing.source;
+
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.springframework.cloud.stream.test.matcher.MessageQueueMatcher.receivesPayloadThat;
+
+import java.util.concurrent.BlockingQueue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.stream.messaging.Source;
+import org.springframework.cloud.stream.test.binder.MessageCollector;
+import org.springframework.messaging.Message;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * The Spring Boot-base test-case to demonstrate how can we test Spring Cloud Stream applications
+ * with available testing tools.
+ *
+ * @author Artem Bilan
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@DirtiesContext
+public class FooBarSourceTests {
+
+	@Autowired
+	private Source channels;
+
+	@Autowired
+	private MessageCollector collector;
+
+	@Test
+	public void testMessages() {
+		BlockingQueue<Message<?>> messages = this.collector.forChannel(channels.output());
+
+		assertThat(messages, receivesPayloadThat(is("foo")));
+		assertThat(messages, receivesPayloadThat(is("bar")));
+		assertThat(messages, receivesPayloadThat(is("foo")));
+		assertThat(messages, receivesPayloadThat(is("bar")));
+	}
+
+}

testing-samples/testing-demo/src/test/resources/schema.sql

@@ -0,0 +1,3 @@
+CREATE TABLE FOOBAR (
+  value VARCHAR(256),
+);