Merge branch '1.2.x'

2015-10-07 23:34:08 -07:00
parent 47576354f7 6ab376e2e8
commit e473364e4e
507 changed files with 2659 additions and 2478 deletions
--- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java
+++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java
@@ -53,8 +53,8 @@ public class ChatService {
 		return message;
 	}

-	public static class JacksonEncoderDecoder implements Encoder<Message, String>,
-			Decoder<String, Message> {
+	public static class JacksonEncoderDecoder
+			implements Encoder<Message, String>, Decoder<String, Message> {

 		private final ObjectMapper mapper = new ObjectMapper();