Merge branch '2.1.x'

spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java

@@ -45,7 +45,8 @@ public class ChatService {
 				+ (event.isCancelled() ? "cancelled" : "closed") + "]");
 	}
 
-	@org.atmosphere.config.service.Message(encoders = JacksonEncoderDecoder.class, decoders = JacksonEncoderDecoder.class)
+	@org.atmosphere.config.service.Message(encoders = JacksonEncoderDecoder.class,
+			decoders = JacksonEncoderDecoder.class)
 	public Message onMessage(Message message) throws IOException {
 		this.logger.info("Author " + message.getAuthor() + " sent message "
 				+ message.getMessage());

spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java

@@ -45,7 +45,8 @@ import org.springframework.web.socket.handler.TextWebSocketHandler;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = SampleAtmosphereApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = SampleAtmosphereApplication.class,
+		webEnvironment = WebEnvironment.RANDOM_PORT)
 public class SampleAtmosphereApplicationTests {
 
 	private static Log logger = LogFactory.getLog(SampleAtmosphereApplicationTests.class);