Merge branch '2.0.x' into 2.1.x

Closes gh-17078
2019-06-07 10:50:34 +01:00
parent 857b96b77d c6c139d980
commit 24925c3dae
2691 changed files with 27746 additions and 46049 deletions
--- a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/Person.java
+++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/Person.java
@@ -25,8 +25,7 @@ import javax.persistence.SequenceGenerator;
 public class Person {

 	@Id
-	@SequenceGenerator(name = "person_generator", sequenceName = "person_sequence",
-			allocationSize = 1)
+	@SequenceGenerator(name = "person_generator", sequenceName = "person_sequence", allocationSize = 1)
 	@GeneratedValue(generator = "person_generator")
 	private Long id;

@@ -52,8 +51,7 @@ public class Person {

 	@Override
 	public String toString() {
-		return "Person [firstName=" + this.firstName + ", lastName=" + this.lastName
-				+ "]";
+		return "Person [firstName=" + this.firstName + ", lastName=" + this.lastName + "]";
 	}

 }