Fixup constructor injections

Consistently use constructor injection and remove
superfluous @Autowired annotations.

Author: philwebb

Diff for: livelessons-choreography/livelessons-choreography-bookmark-service/src/main/java/demo/BookmarkRestController.java

@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,8 +12,11 @@
 @RequestMapping("/{userId}/bookmarks")
 public class BookmarkRestController {
 
-	@Autowired
-	private BookmarkRepository bookmarkRepository;
+	private final BookmarkRepository bookmarkRepository;
+
+	public BookmarkRestController(BookmarkRepository bookmarkRepository) {
+		this.bookmarkRepository = bookmarkRepository;
+	}
 
 	@RequestMapping(method = RequestMethod.GET)
 	public Collection<Bookmark> getBookmarks(@PathVariable String userId) {

Diff for: livelessons-choreography/livelessons-choreography-contact-service/src/main/java/demo/ContactRestController.java

@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,8 +12,11 @@
 @RequestMapping("/{userId}/contacts")
 public class ContactRestController {
 
-	@Autowired
-	private ContactRepository contactRepository;
+	private final ContactRepository contactRepository;
+
+	public ContactRestController(ContactRepository contactRepository) {
+		this.contactRepository = contactRepository;
+	}
 
 	@RequestMapping(method = RequestMethod.GET)
 	public Collection<Contact> getContacts(@PathVariable String userId) {

Diff for: livelessons-choreography/livelessons-choreography-gateway/src/main/java/demo/PassportRestController.java

@@ -2,7 +2,6 @@
 
 import reactor.rx.Stream;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,8 +10,11 @@
 @RestController
 public class PassportRestController {
 
-	@Autowired
-	private PassportService passportService;
+	private final PassportService passportService;
+
+	public PassportRestController(PassportService passportService) {
+		this.passportService = passportService;
+	}
 
 	@RequestMapping("/{userId}/passport")
 	public DeferredResult<Passport> passport(@PathVariable String userId) {

Diff for: livelessons-choreography/livelessons-choreography-gateway/src/main/java/demo/PassportService.java

@@ -4,20 +4,23 @@
 import reactor.rx.Stream;
 import reactor.rx.Streams;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class PassportService {
 
-	@Autowired
-	private Environment environment;
+	private final Environment environment;
 
-	@Autowired
-	private ContactClient contactClient;
+	private final ContactClient contactClient;
 
-	@Autowired
-	private BookmarkClient bookmarkClient;
+	private final BookmarkClient bookmarkClient;
+
+	public PassportService(Environment environment, ContactClient contactClient,
+			BookmarkClient bookmarkClient) {
+		this.environment = environment;
+		this.contactClient = contactClient;
+		this.bookmarkClient = bookmarkClient;
+	}
 
 	public Stream<Bookmark> getBookmarks(String userId) {
 		return Streams.<Bookmark>create(subscriber -> {

Diff for: livelessons-choreography/livelessons-choreography-hystrix/src/main/java/demo/IntegrationClient.java

@@ -5,17 +5,19 @@
 
 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 class IntegrationClient {
 
-	@Autowired
-	private ContactClient contactClient;
+	private final ContactClient contactClient;
 
-	@Autowired
-	private BookmarkClient bookmarkClient;
+	private final BookmarkClient bookmarkClient;
+
+	public IntegrationClient(ContactClient contactClient, BookmarkClient bookmarkClient) {
+		this.contactClient = contactClient;
+		this.bookmarkClient = bookmarkClient;
+	}
 
 	public Collection<Bookmark> getBookmarksFallback(String userId) {
 		System.out.println("getBookmarksFallback");
@@ -37,4 +39,4 @@ public Collection<Contact> getContacts(String userId) {
 		return this.contactClient.getContacts(userId);
 	}
 
-}
+}

Diff for: livelessons-choreography/livelessons-choreography-hystrix/src/main/java/demo/PassportRestController.java

@@ -1,20 +1,22 @@
 package demo;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 class PassportRestController {
 
-	@Autowired
-	private IntegrationClient integrationClient;
+	private final IntegrationClient integrationClient;
+
+	public PassportRestController(IntegrationClient integrationClient) {
+		this.integrationClient = integrationClient;
+	}
 
 	@RequestMapping("/{userId}/passport")
 	Passport passport(@PathVariable String userId) {
 		return new Passport(userId, this.integrationClient.getContacts(userId),
 				this.integrationClient.getBookmarks(userId));
 	}
 
-}
+}

Diff for: livelessons-choreography/livelessons-choreography-ribbon-and-eureka/src/main/java/demo/DiscoveryClientExample.java

@@ -2,7 +2,6 @@
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
@@ -13,8 +12,11 @@
 @Component
 public class DiscoveryClientExample implements CommandLineRunner {
 
-	@Autowired
-	private DiscoveryClient discoveryClient;
+	private final DiscoveryClient discoveryClient;
+
+	public DiscoveryClientExample(DiscoveryClient discoveryClient) {
+		this.discoveryClient = discoveryClient;
+	}
 
 	@Override
 	public void run(String... strings) throws Exception {

Diff for: livelessons-choreography/livelessons-choreography-ribbon-and-eureka/src/main/java/demo/FeignExample.java

@@ -1,6 +1,5 @@
 package demo;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -9,11 +8,14 @@
 @Component
 public class FeignExample implements CommandLineRunner {
 
-	@Autowired
-	private ContactClient contactClient;
+	private final ContactClient contactClient;
 
-	@Autowired
-	private BookmarkClient bookmarkClient;
+	private final BookmarkClient bookmarkClient;
+
+	public FeignExample(ContactClient contactClient, BookmarkClient bookmarkClient) {
+		this.contactClient = contactClient;
+		this.bookmarkClient = bookmarkClient;
+	}
 
 	@Override
 	public void run(String... strings) throws Exception {

Diff for: livelessons-choreography/livelessons-choreography-ribbon-and-eureka/src/main/java/demo/RestTemplateExample.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.annotation.Order;
@@ -15,8 +14,11 @@
 @Component
 public class RestTemplateExample implements CommandLineRunner {
 
-	@Autowired
-	private RestTemplate restTemplate;
+	private final RestTemplate restTemplate;
+
+	public RestTemplateExample(RestTemplate restTemplate) {
+		this.restTemplate = restTemplate;
+	}
 
 	@Override
 	public void run(String... strings) throws Exception {

Diff for: livelessons-cloud/livelessons-cloud-connectors/src/main/java/demo/ExampleController.java

@@ -1,6 +1,5 @@
 package demo;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.app.ApplicationInstanceInfo;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,20 +12,20 @@ public class ExampleController {
 
 	private final ApplicationInstanceInfo info;
 
-	@Autowired
 	public ExampleController(JdbcTemplate jdbc, ApplicationInstanceInfo info) {
 		this.jdbc = jdbc;
 		this.info = info;
 	}
 
 	@RequestMapping("/")
 	public String hello() {
-		return jdbc.queryForObject("select model from car where id = 1", String.class);
+		return this.jdbc.queryForObject("select model from car where id = 1",
+				String.class);
 	}
 
 	@RequestMapping("/cloudinfo")
 	public ApplicationInstanceInfo info() {
-		return info;
+		return this.info;
 	}
 
 }

Diff for: livelessons-cloud/livelessons-cloud-s3/src/main/java/demo/CloudS3Application.java

@@ -6,7 +6,6 @@
 
 import javax.annotation.PostConstruct;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -23,12 +22,15 @@ public class CloudS3Application {
 	@Value("${livelessons.s3.bucket}")
 	private String bucket;
 
-	@Autowired
-	public ResourceLoader resourceLoader;
+	private final ResourceLoader resourceLoader;
+
+	public CloudS3Application(ResourceLoader resourceLoader) {
+		this.resourceLoader = resourceLoader;
+	}
 
 	@PostConstruct
 	public void resourceAccess() throws IOException {
-		String location = "s3://" + bucket + "/file.txt";
+		String location = "s3://" + this.bucket + "/file.txt";
 		WritableResource writeableResource = (WritableResource) this.resourceLoader
 				.getResource(location);
 		FileCopyUtils.copy("Hello World!",

Diff for: livelessons-cloud/livelessons-cloud-services/src/main/java/demo/ExampleController.java

@@ -1,6 +1,5 @@
 package demo;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -10,7 +9,6 @@ public class ExampleController {
 
 	private final JdbcTemplate jdbc;
 
-	@Autowired
 	public ExampleController(JdbcTemplate jdbc) {
 		this.jdbc = jdbc;
 	}

Diff for: livelessons-data/livelessons-data-jdbc/src/main/java/demo/CarRepository.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
@@ -11,13 +10,12 @@ public class CarRepository {
 
 	private final JdbcTemplate jdbc;
 
-	@Autowired
 	public CarRepository(JdbcTemplate jdbc) {
 		this.jdbc = jdbc;
 	}
 
 	public List<Car> findByMakeIgnoringCase(String make) {
-		return jdbc.query(
+		return this.jdbc.query(
 				"select * from car " + "where UPPER(car.make) = UPPER(?) order by id",
 				(rs, i) -> new Car(rs.getInt("id"), rs.getString("make"),
 						rs.getString("model"), rs.getInt("year")),

Diff for: livelessons-data/livelessons-data-redis/src/main/java/demo/Demo.java

@@ -6,7 +6,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
@@ -22,7 +21,6 @@ public class Demo implements CommandLineRunner {
 
 	private final SlowService service;
 
-	@Autowired
 	public Demo(StringRedisTemplate template, SlowService service) {
 		this.template = template;
 		this.service = service;

Diff for: livelessons-integration/livelessons-integration-basic-messaging/src/main/java/demo/Producer.java

@@ -6,15 +6,17 @@
 import java.util.UUID;
 
 import org.springframework.amqp.rabbit.core.RabbitMessagingTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 @Component
 public class Producer implements CommandLineRunner {
 
-	@Autowired
-	private RabbitMessagingTemplate messagingTemplate;
+	private final RabbitMessagingTemplate messagingTemplate;
+
+	public Producer(RabbitMessagingTemplate messagingTemplate) {
+		this.messagingTemplate = messagingTemplate;
+	}
 
 	@Override
 	public void run(String... args) throws Exception {

Diff for: livelessons-integration/livelessons-integration-batch/src/main/java/demo/ContactBatchJobConfiguration.java

@@ -16,7 +16,6 @@
 import org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
 import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.batch.JobExecutionEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
@@ -88,13 +87,16 @@ public JdbcTemplate jdbcTemplate(DataSource dataSource) {
 	public static class BatchJobFinishedListener
 			implements ApplicationListener<JobExecutionEvent> {
 
-		@Autowired
-		private JdbcTemplate jdbcTemplate;
+		private final JdbcTemplate jdbcTemplate;
+
+		public BatchJobFinishedListener(JdbcTemplate jdbcTemplate) {
+			this.jdbcTemplate = jdbcTemplate;
+		}
 
 		@Override
 		public void onApplicationEvent(JobExecutionEvent event) {
 			System.out.println("finished " + event.getJobExecution().toString());
-			jdbcTemplate
+			this.jdbcTemplate
 					.query("SELECT first_name, last_name, email FROM contact",
 							(rs, i) -> new Contact(rs.getString("first_name"),
 									rs.getString("last_name"), rs.getString("email")))