Merge branch '2.1.x'

Closes gh-17079

spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/User.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,8 +59,8 @@ public class User {
 
 	@Override
 	public String toString() {
-		return "User{" + "id='" + this.id + '\'' + ", firstName='" + this.firstName + '\''
-				+ ", lastName='" + this.lastName + '\'' + '}';
+		return "User{" + "id='" + this.id + '\'' + ", firstName='" + this.firstName + '\'' + ", lastName='"
+				+ this.lastName + '\'' + '}';
 	}
 
 }

spring-boot-samples/spring-boot-sample-data-couchbase/src/test/java/sample/data/couchbase/SampleCouchbaseApplicationTests.java

@@ -33,8 +33,7 @@ class SampleCouchbaseApplicationTests {
 	@Test
 	void testDefaultSettings(CapturedOutput capturedOutput) {
 		try {
-			new SpringApplicationBuilder(SampleCouchbaseApplication.class)
-					.run("--server.port=0");
+			new SpringApplicationBuilder(SampleCouchbaseApplication.class).run("--server.port=0");
 		}
 		catch (RuntimeException ex) {
 			if (serverNotRunning(ex)) {