Merge branch '2.0.x' into 2.1.x

Closes gh-17078

spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/RemoteVehicleDetailsService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -35,15 +35,12 @@ import org.springframework.web.client.RestTemplate;
 @Service
 public class RemoteVehicleDetailsService implements VehicleDetailsService {
 
-	private static final Log logger = LogFactory
-			.getLog(RemoteVehicleDetailsService.class);
+	private static final Log logger = LogFactory.getLog(RemoteVehicleDetailsService.class);
 
 	private final RestTemplate restTemplate;
 
-	public RemoteVehicleDetailsService(ServiceProperties properties,
-			RestTemplateBuilder restTemplateBuilder) {
-		this.restTemplate = restTemplateBuilder
-				.rootUri(properties.getVehicleServiceRootUrl()).build();
+	public RemoteVehicleDetailsService(ServiceProperties properties, RestTemplateBuilder restTemplateBuilder) {
+		this.restTemplate = restTemplateBuilder.rootUri(properties.getVehicleServiceRootUrl()).build();
 	}
 
 	@Override
@@ -52,8 +49,7 @@ public class RemoteVehicleDetailsService implements VehicleDetailsService {
 		Assert.notNull(vin, "VIN must not be null");
 		logger.debug("Retrieving vehicle data for: " + vin);
 		try {
-			return this.restTemplate.getForObject("/vehicle/{vin}/details",
-					VehicleDetails.class, vin);
+			return this.restTemplate.getForObject("/vehicle/{vin}/details", VehicleDetails.class, vin);
 		}
 		catch (HttpStatusCodeException ex) {
 			if (HttpStatus.NOT_FOUND.equals(ex.getStatusCode())) {

spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/VehicleDetails.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -33,8 +33,7 @@ public class VehicleDetails {
 	private final String model;
 
 	@JsonCreator
-	public VehicleDetails(@JsonProperty("make") String make,
-			@JsonProperty("model") String model) {
+	public VehicleDetails(@JsonProperty("make") String make, @JsonProperty("model") String model) {
 		Assert.notNull(make, "Make must not be null");
 		Assert.notNull(model, "Model must not be null");
 		this.make = make;

spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/service/VehicleIdentificationNumberNotFoundException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -31,8 +31,7 @@ public class VehicleIdentificationNumberNotFoundException extends RuntimeExcepti
 		this(vin, null);
 	}
 
-	public VehicleIdentificationNumberNotFoundException(VehicleIdentificationNumber vin,
-			Throwable cause) {
+	public VehicleIdentificationNumberNotFoundException(VehicleIdentificationNumber vin, Throwable cause) {
 		super("Unable to find VehicleIdentificationNumber " + vin, cause);
 		this.vehicleIdentificationNumber = vin;
 	}

spring-boot-samples/spring-boot-sample-test/src/main/java/sample/test/web/UserVehicleService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -37,15 +37,13 @@ public class UserVehicleService {
 
 	private final VehicleDetailsService vehicleDetailsService;
 
-	public UserVehicleService(UserRepository userRepository,
-			VehicleDetailsService vehicleDetailsService) {
+	public UserVehicleService(UserRepository userRepository, VehicleDetailsService vehicleDetailsService) {
 		this.userRepository = userRepository;
 		this.vehicleDetailsService = vehicleDetailsService;
 	}
 
 	public VehicleDetails getVehicleDetails(String username)
-			throws UserNameNotFoundException,
-			VehicleIdentificationNumberNotFoundException {
+			throws UserNameNotFoundException, VehicleIdentificationNumberNotFoundException {
 		Assert.notNull(username, "Username must not be null");
 		User user = this.userRepository.findByUsername(username);
 		if (user == null) {

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/SampleTestApplicationWebIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -43,8 +43,7 @@ import static org.mockito.BDDMockito.given;
 @AutoConfigureTestDatabase
 public class SampleTestApplicationWebIntegrationTests {
 
-	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber(
-			"01234567890123456");
+	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber("01234567890123456");
 
 	@Autowired
 	private TestRestTemplate restTemplate;
@@ -54,8 +53,7 @@ public class SampleTestApplicationWebIntegrationTests {
 
 	@Before
 	public void setup() {
-		given(this.vehicleDetailsService.getVehicleDetails(VIN))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
+		given(this.vehicleDetailsService.getVehicleDetails(VIN)).willReturn(new VehicleDetails("Honda", "Civic"));
 	}
 
 	@Test

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/UserEntityTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -36,8 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 @DataJpaTest
 public class UserEntityTests {
 
-	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber(
-			"00000000000000000");
+	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber("00000000000000000");
 
 	@Autowired
 	private TestEntityManager entityManager;

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/UserRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -35,8 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @DataJpaTest
 public class UserRepositoryTests {
 
-	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber(
-			"00000000000000000");
+	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber("00000000000000000");
 
 	@Autowired
 	private TestEntityManager entityManager;

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/domain/VehicleIdentificationNumberTests.java

@@ -35,22 +35,19 @@ public class VehicleIdentificationNumberTests {
 
 	@Test
 	public void createWhenVinIsNullShouldThrowException() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new VehicleIdentificationNumber(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> new VehicleIdentificationNumber(null))
 				.withMessage("VIN must not be null");
 	}
 
 	@Test
 	public void createWhenVinIsMoreThan17CharsShouldThrowException() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new VehicleIdentificationNumber("012345678901234567"))
+		assertThatIllegalArgumentException().isThrownBy(() -> new VehicleIdentificationNumber("012345678901234567"))
 				.withMessage("VIN must be exactly 17 characters");
 	}
 
 	@Test
 	public void createWhenVinIsLessThan17CharsShouldThrowException() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new VehicleIdentificationNumber("0123456789012345"))
+		assertThatIllegalArgumentException().isThrownBy(() -> new VehicleIdentificationNumber("0123456789012345"))
 				.withMessage("VIN must be exactly 17 characters");
 	}
 
@@ -64,8 +61,7 @@ public class VehicleIdentificationNumberTests {
 	public void equalsAndHashCodeShouldBeBasedOnVin() {
 		VehicleIdentificationNumber vin1 = new VehicleIdentificationNumber(SAMPLE_VIN);
 		VehicleIdentificationNumber vin2 = new VehicleIdentificationNumber(SAMPLE_VIN);
-		VehicleIdentificationNumber vin3 = new VehicleIdentificationNumber(
-				"00000000000000000");
+		VehicleIdentificationNumber vin3 = new VehicleIdentificationNumber("00000000000000000");
 		assertThat(vin1.hashCode()).isEqualTo(vin2.hashCode());
 		assertThat(vin1).isEqualTo(vin1).isEqualTo(vin2).isNotEqualTo(vin3);
 	}

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/service/RemoteVehicleDetailsServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -56,38 +56,31 @@ public class RemoteVehicleDetailsServiceTests {
 
 	@Test
 	public void getVehicleDetailsWhenVinIsNullShouldThrowException() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.service.getVehicleDetails(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.service.getVehicleDetails(null))
 				.withMessage("VIN must not be null");
 	}
 
 	@Test
 	public void getVehicleDetailsWhenResultIsSuccessShouldReturnDetails() {
 		this.server.expect(requestTo("/vehicle/" + VIN + "/details"))
-				.andRespond(withSuccess(getClassPathResource("vehicledetails.json"),
-						MediaType.APPLICATION_JSON));
-		VehicleDetails details = this.service
-				.getVehicleDetails(new VehicleIdentificationNumber(VIN));
+				.andRespond(withSuccess(getClassPathResource("vehicledetails.json"), MediaType.APPLICATION_JSON));
+		VehicleDetails details = this.service.getVehicleDetails(new VehicleIdentificationNumber(VIN));
 		assertThat(details.getMake()).isEqualTo("Honda");
 		assertThat(details.getModel()).isEqualTo("Civic");
 	}
 
 	@Test
 	public void getVehicleDetailsWhenResultIsNotFoundShouldThrowException() {
-		this.server.expect(requestTo("/vehicle/" + VIN + "/details"))
-				.andRespond(withStatus(HttpStatus.NOT_FOUND));
+		this.server.expect(requestTo("/vehicle/" + VIN + "/details")).andRespond(withStatus(HttpStatus.NOT_FOUND));
 		assertThatExceptionOfType(VehicleIdentificationNumberNotFoundException.class)
-				.isThrownBy(() -> this.service
-						.getVehicleDetails(new VehicleIdentificationNumber(VIN)));
+				.isThrownBy(() -> this.service.getVehicleDetails(new VehicleIdentificationNumber(VIN)));
 	}
 
 	@Test
 	public void getVehicleDetailsWhenResultIServerErrorShouldThrowException() {
-		this.server.expect(requestTo("/vehicle/" + VIN + "/details"))
-				.andRespond(withServerError());
+		this.server.expect(requestTo("/vehicle/" + VIN + "/details")).andRespond(withServerError());
 		assertThatExceptionOfType(HttpServerErrorException.class)
-				.isThrownBy(() -> this.service
-						.getVehicleDetails(new VehicleIdentificationNumber(VIN)));
+				.isThrownBy(() -> this.service.getVehicleDetails(new VehicleIdentificationNumber(VIN)));
 	}
 
 	private ClassPathResource getClassPathResource(String path) {

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/service/VehicleDetailsJsonTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -44,15 +44,13 @@ public class VehicleDetailsJsonTests {
 		assertThat(this.json.write(details)).isEqualTo("vehicledetails.json");
 		assertThat(this.json.write(details)).isEqualToJson("vehicledetails.json");
 		assertThat(this.json.write(details)).hasJsonPathStringValue("@.make");
-		assertThat(this.json.write(details)).extractingJsonPathStringValue("@.make")
-				.isEqualTo("Honda");
+		assertThat(this.json.write(details)).extractingJsonPathStringValue("@.make").isEqualTo("Honda");
 	}
 
 	@Test
 	public void deserializeJson() throws Exception {
 		String content = "{\"make\":\"Ford\",\"model\":\"Focus\"}";
-		assertThat(this.json.parse(content))
-				.isEqualTo(new VehicleDetails("Ford", "Focus"));
+		assertThat(this.json.parse(content)).isEqualTo(new VehicleDetails("Ford", "Focus"));
 		assertThat(this.json.parseObject(content).getMake()).isEqualTo("Ford");
 	}
 

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -59,17 +59,15 @@ public class UserVehicleControllerApplicationTests {
 
 	@Test
 	public void getVehicleWhenRequestingTextShouldReturnMakeAndModel() throws Exception {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
-		this.mvc.perform(get("/sboot/vehicle").accept(MediaType.TEXT_PLAIN))
-				.andExpect(status().isOk()).andExpect(content().string("Honda Civic"));
+		given(this.userVehicleService.getVehicleDetails("sboot")).willReturn(new VehicleDetails("Honda", "Civic"));
+		this.mvc.perform(get("/sboot/vehicle").accept(MediaType.TEXT_PLAIN)).andExpect(status().isOk())
+				.andExpect(content().string("Honda Civic"));
 	}
 
 	@Test
 	public void welcomeCommandLineRunnerShouldBeAvailable() {
 		// Since we're a @SpringBootTest all beans should be available.
-		assertThat(this.applicationContext.getBean(WelcomeCommandLineRunner.class))
-				.isNotNull();
+		assertThat(this.applicationContext.getBean(WelcomeCommandLineRunner.class)).isNotNull();
 	}
 
 }

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerHtmlUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -47,8 +47,7 @@ public class UserVehicleControllerHtmlUnitTests {
 
 	@Test
 	public void getVehicleWhenRequestingTextShouldReturnMakeAndModel() throws Exception {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
+		given(this.userVehicleService.getVehicleDetails("sboot")).willReturn(new VehicleDetails("Honda", "Civic"));
 		HtmlPage page = this.webClient.getPage("/sboot/vehicle.html");
 		assertThat(page.getBody().getTextContent()).isEqualTo("Honda Civic");
 	}

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerSeleniumTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -48,8 +48,7 @@ public class UserVehicleControllerSeleniumTests {
 
 	@Test
 	public void getVehicleWhenRequestingTextShouldReturnMakeAndModel() {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
+		given(this.userVehicleService.getVehicleDetails("sboot")).willReturn(new VehicleDetails("Honda", "Civic"));
 		this.webDriver.get("/sboot/vehicle.html");
 		WebElement element = this.webDriver.findElement(By.tagName("h1"));
 		assertThat(element.getText()).isEqualTo("Honda Civic");

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -47,8 +47,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @WebMvcTest(UserVehicleController.class)
 public class UserVehicleControllerTests {
 
-	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber(
-			"00000000000000000");
+	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber("00000000000000000");
 
 	@Autowired
 	private MockMvc mvc;
@@ -61,34 +60,28 @@ public class UserVehicleControllerTests {
 
 	@Test
 	public void getVehicleWhenRequestingTextShouldReturnMakeAndModel() throws Exception {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
-		this.mvc.perform(get("/sboot/vehicle").accept(MediaType.TEXT_PLAIN))
-				.andExpect(status().isOk()).andExpect(content().string("Honda Civic"));
+		given(this.userVehicleService.getVehicleDetails("sboot")).willReturn(new VehicleDetails("Honda", "Civic"));
+		this.mvc.perform(get("/sboot/vehicle").accept(MediaType.TEXT_PLAIN)).andExpect(status().isOk())
+				.andExpect(content().string("Honda Civic"));
 	}
 
 	@Test
 	public void getVehicleWhenRequestingJsonShouldReturnMakeAndModel() throws Exception {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
-		this.mvc.perform(get("/sboot/vehicle").accept(MediaType.APPLICATION_JSON))
-				.andExpect(status().isOk())
+		given(this.userVehicleService.getVehicleDetails("sboot")).willReturn(new VehicleDetails("Honda", "Civic"));
+		this.mvc.perform(get("/sboot/vehicle").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk())
 				.andExpect(content().json("{'make':'Honda','model':'Civic'}"));
 	}
 
 	@Test
 	public void getVehicleWhenRequestingHtmlShouldReturnMakeAndModel() throws Exception {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willReturn(new VehicleDetails("Honda", "Civic"));
-		this.mvc.perform(get("/sboot/vehicle.html").accept(MediaType.TEXT_HTML))
-				.andExpect(status().isOk())
+		given(this.userVehicleService.getVehicleDetails("sboot")).willReturn(new VehicleDetails("Honda", "Civic"));
+		this.mvc.perform(get("/sboot/vehicle.html").accept(MediaType.TEXT_HTML)).andExpect(status().isOk())
 				.andExpect(content().string(containsString("<h1>Honda Civic</h1>")));
 	}
 
 	@Test
 	public void getVehicleWhenUserNotFoundShouldReturnNotFound() throws Exception {
-		given(this.userVehicleService.getVehicleDetails("sboot"))
-				.willThrow(new UserNameNotFoundException("sboot"));
+		given(this.userVehicleService.getVehicleDetails("sboot")).willThrow(new UserNameNotFoundException("sboot"));
 		this.mvc.perform(get("/sboot/vehicle")).andExpect(status().isNotFound());
 	}
 

spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -39,8 +39,7 @@ import static org.mockito.BDDMockito.given;
  */
 public class UserVehicleServiceTests {
 
-	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber(
-			"00000000000000000");
+	private static final VehicleIdentificationNumber VIN = new VehicleIdentificationNumber("00000000000000000");
 
 	@Mock
 	private VehicleDetailsService vehicleDetailsService;
@@ -53,14 +52,12 @@ public class UserVehicleServiceTests {
 	@Before
 	public void setup() {
 		MockitoAnnotations.initMocks(this);
-		this.service = new UserVehicleService(this.userRepository,
-				this.vehicleDetailsService);
+		this.service = new UserVehicleService(this.userRepository, this.vehicleDetailsService);
 	}
 
 	@Test
 	public void getVehicleDetailsWhenUsernameIsNullShouldThrowException() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> this.service.getVehicleDetails(null))
+		assertThatIllegalArgumentException().isThrownBy(() -> this.service.getVehicleDetails(null))
 				.withMessage("Username must not be null");
 	}
 
@@ -73,8 +70,7 @@ public class UserVehicleServiceTests {
 
 	@Test
 	public void getVehicleDetailsShouldReturnMakeAndModel() {
-		given(this.userRepository.findByUsername(anyString()))
-				.willReturn(new User("sboot", VIN));
+		given(this.userRepository.findByUsername(anyString())).willReturn(new User("sboot", VIN));
 		VehicleDetails details = new VehicleDetails("Honda", "Civic");
 		given(this.vehicleDetailsService.getVehicleDetails(VIN)).willReturn(details);
 		VehicleDetails actual = this.service.getVehicleDetails("sboot");