Merge branch '1.5.x'

Author: wilkinsona

Diff for: spring-boot-samples/spring-boot-sample-jta-narayana/src/main/java/sample/narayana/AccountService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-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.
@@ -18,7 +18,6 @@
 
 import javax.transaction.Transactional;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Service;
 
@@ -30,7 +29,6 @@ public class AccountService {
 
 	private final AccountRepository accountRepository;
 
-	@Autowired
 	public AccountService(JmsTemplate jmsTemplate, AccountRepository accountRepository) {
 		this.jmsTemplate = jmsTemplate;
 		this.accountRepository = accountRepository;

Diff for: spring-boot-samples/spring-boot-sample-metrics-redis/src/main/java/sample/metrics/redis/SampleController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-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.
@@ -21,7 +21,6 @@
 
 import org.hibernate.validator.constraints.NotBlank;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Description;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,16 +32,15 @@ public class SampleController {
 
 	private final HelloWorldProperties helloWorldProperties;
 
-	@Autowired
 	public SampleController(HelloWorldProperties helloWorldProperties) {
 		this.helloWorldProperties = helloWorldProperties;
 	}
 
 	@GetMapping("/")
 	@ResponseBody
 	public Map<String, String> hello() {
-		return Collections.singletonMap("message", "Hello " +
-				this.helloWorldProperties.getName());
+		return Collections.singletonMap("message",
+				"Hello " + this.helloWorldProperties.getName());
 	}
 
 	protected static class Message {

Diff for: spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-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.
@@ -19,7 +19,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.util.StreamUtils;
@@ -29,7 +28,6 @@ public class SampleEndpoint {
 
 	private final HelloWorldService helloWorldService;
 
-	@Autowired
 	public SampleEndpoint(HelloWorldService helloWorldService) {
 		this.helloWorldService = helloWorldService;
 	}