From e8979a40336ebacd60aaee3a9363b7ebf7683279 Mon Sep 17 00:00:00 2001
From: Jose Carvajal <josecarvajal@OEL0126.local>
Date: Wed, 11 Oct 2017 12:11:38 +0200
Subject: [PATCH] Pull request changes done

---
 spring-cloud/spring-cloud-stream/pom.xml      | 120 +++++++++---------
 .../spring-cloud-stream-rabbit/pom.xml        |  11 +-
 ...ultipleOutputsServiceApplicationTests.java |   4 +-
 ...WithConditionsServiceApplicationTests.java |   4 +-
 .../rabbit/MyLoggerApplicationTests.java      |   6 +-
 5 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/spring-cloud/spring-cloud-stream/pom.xml b/spring-cloud/spring-cloud-stream/pom.xml
index 352b52cc17..2104ba1827 100644
--- a/spring-cloud/spring-cloud-stream/pom.xml
+++ b/spring-cloud/spring-cloud-stream/pom.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.baeldung</groupId>
-	<artifactId>spring-cloud-stream</artifactId>
-	<modules>
-		<module>spring-cloud-stream-rabbit</module>
-	</modules>
-	<packaging>pom</packaging>
+    <groupId>org.baeldung</groupId>
+    <artifactId>spring-cloud-stream</artifactId>
+    <modules>
+        <module>spring-cloud-stream-rabbit</module>
+    </modules>
+    <packaging>pom</packaging>
 
-	<name>spring-cloud-stream</name>
+    <name>spring-cloud-stream</name>
 
-	<parent>
-		<groupId>com.baeldung.spring.cloud</groupId>
-		<artifactId>spring-cloud</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+    </properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
-		
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+                <version>${spring-cloud-stream.version}</version>
+            </dependency>
+        
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-stream</artifactId>
+                <version>${spring-cloud-stream.version}</version>
+            </dependency>
 
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-test-support</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-stream-test-support</artifactId>
+                <version>${spring-cloud-stream.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>${maven-compiler-plugin.version}</version>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>${spring-boot-maven-plugin.version}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot-maven-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml
index 9eede9e92c..a954a7035e 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml
@@ -17,17 +17,16 @@
     </parent>
 
     <dependencies>
-   
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
         
         <dependency>
-		    <groupId>org.springframework.cloud</groupId>
-		    <artifactId>spring-cloud-stream-test-support</artifactId>
-		    <scope>test</scope>
-		</dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-test-support</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationTests.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationTests.java
index 18dcd8da7c..196d4f0d23 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationTests.java
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationTests.java
@@ -26,13 +26,13 @@ public class MultipleOutputsServiceApplicationTests {
     private MessageCollector messageCollector;
 
     @Test
-    public void shouldReceiveMessageInAnOutput() {
+    public void whenSendMessage_thenResponseIsInAOutput() {
         whenSendMessage(1);
         thenPayloadInChannelIs(pipe.anOutput(), 1);
     }
 
     @Test
-    public void shouldReceiveMessageInAnAnotherOutput() {
+    public void whenSendMessage_thenResponseIsInAnotherOutput() {
         whenSendMessage(11);
         thenPayloadInChannelIs(pipe.anotherOutput(), 11);
     }
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplicationTests.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplicationTests.java
index 02638dea4c..a74ee61be6 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplicationTests.java
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplicationTests.java
@@ -26,13 +26,13 @@ public class MultipleOutputsWithConditionsServiceApplicationTests {
     private MessageCollector messageCollector;
 
     @Test
-    public void shouldReceiveMessageInAnOutput() {
+    public void whenSendMessage_thenResponseIsInAOutput() {
         whenSendMessage(1);
         thenPayloadInChannelIs(pipe.anotherOutput(), 1);
     }
 
     @Test
-    public void shouldReceiveMessageInAnAnotherOutput() {
+    public void whenSendMessage_thenResponseIsInAnotherOutput() {
         whenSendMessage(11);
         thenPayloadInChannelIs(pipe.anotherOutput(), 11);
     }
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationTests.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationTests.java
index d004987929..b939af25fc 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationTests.java
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationTests.java
@@ -12,7 +12,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baeldung.spring.cloud.stream.rabbit.MyLoggerServiceApplication;
 import com.baeldung.spring.cloud.stream.rabbit.model.LogMessage;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -27,18 +26,15 @@ public class MyLoggerApplicationTests {
     private MessageCollector messageCollector;
 
     @Test
-    public void shouldEnrichMessage() {
-        // Send message
+    public void whenSendMessage_thenResponseShouldUpdateText() {
         pipe.input()
             .send(MessageBuilder.withPayload(new LogMessage("This is my message"))
                 .build());
 
-        // Get response from the service
         Object payload = messageCollector.forChannel(pipe.output())
             .poll()
             .getPayload();
 
-        // Assert
         assertEquals("[1]: This is my message", payload.toString());
     }
 }