diff --git a/spring-integration-reference/src/samples.xml b/spring-integration-reference/src/samples.xml
index 0f33f34170..6101440c80 100644
--- a/spring-integration-reference/src/samples.xml
+++ b/spring-integration-reference/src/samples.xml
@@ -56,21 +56,26 @@
     <channel id="coldDrinks">
         <queue capacity="10"/>
     </channel>
-    <service-activator input-channel="coldDrinks" ref="barista" method="prepareColdDrink" output-channel="preparedDrinks"/>
+    <service-activator input-channel="coldDrinks" ref="barista"
+                       method="prepareColdDrink" output-channel="preparedDrinks"/>
 
     <channel id="hotDrinks">
         <queue capacity="10"/>
     </channel>
-    <service-activator input-channel="hotDrinks" ref="barista" method="prepareHotDrink" output-channel="preparedDrinks"/>
+    <service-activator input-channel="hotDrinks" ref="barista"
+                       method="prepareHotDrink" output-channel="preparedDrinks"/>
 
     <channel id="preparedDrinks"/>
-    <aggregator input-channel="preparedDrinks" ref="waiter" method="prepareDelivery" output-channel="deliveries"/>
+    <aggregator input-channel="preparedDrinks" ref="waiter"
+                method="prepareDelivery" output-channel="deliveries"/>
 
     <stream:stdout-channel-adapter id="deliveries"/>
 
-    <beans:bean id="orderSplitter" class="org.springframework.integration.samples.cafe.xml.OrderSplitter"/>
+    <beans:bean id="orderSplitter"
+                class="org.springframework.integration.samples.cafe.xml.OrderSplitter"/>
 
-    <beans:bean id="drinkRouter" class="org.springframework.integration.samples.cafe.xml.DrinkRouter"/>
+    <beans:bean id="drinkRouter"
+                class="org.springframework.integration.samples.cafe.xml.DrinkRouter"/>
 
     <beans:bean id="barista" class="org.springframework.integration.samples.cafe.xml.Barista"/>
 
@@ -120,10 +125,10 @@
         try {
             Thread.sleep(this.hotDrinkDelay);
             System.out.println(Thread.currentThread().getName()
-                    + " prepared hot drink #" + hotDrinkCounter.incrementAndGet() + " for order #"
-                    + orderItem.getOrder().getNumber() + ": " + orderItem);
-            return new Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(),
-                    orderItem.getShots());
+                    + " prepared hot drink #" + hotDrinkCounter.incrementAndGet()
+                    + " for order #" + orderItem.getOrder().getNumber() + ": " + orderItem);
+            return new Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(),
+                    orderItem.isIced(), orderItem.getShots());
         }
         catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -135,10 +140,10 @@
         try {
             Thread.sleep(this.coldDrinkDelay);
             System.out.println(Thread.currentThread().getName()
-                    + " prepared cold drink #" + coldDrinkCounter.incrementAndGet() + " for order #"
-                    + orderItem.getOrder().getNumber() + ": " + orderItem);
-            return new Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(),
-                    orderItem.getShots());
+                    + " prepared cold drink #" + coldDrinkCounter.incrementAndGet()
+                    + " for order #" + orderItem.getOrder().getNumber() + ": " + orderItem);
+            return new Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(),
+                    orderItem.isIced(), orderItem.getShots());
         }
         catch (InterruptedException e) {
             Thread.currentThread().interrupt();