From e3aac5913ed3caf53b34eb7750138a4ed6839549 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 17 May 2023 17:32:06 -0700
Subject: [PATCH] Polish property order

Keep "flyway teams" properties at the end.
---
 .../flyway/FlywayProperties.java              | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
index 8215c688a9..b629e7c425 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
@@ -253,6 +253,26 @@ public class FlywayProperties {
 	 */
 	private boolean validateOnMigrate = true;
 
+	/**
+	 * Prefix of placeholders in migration scripts.
+	 */
+	private String scriptPlaceholderPrefix = "FP__";
+
+	/**
+	 * Suffix of placeholders in migration scripts.
+	 */
+	private String scriptPlaceholderSuffix = "__";
+
+	/**
+	 * Whether Flyway should execute SQL within a transaction.
+	 */
+	private boolean executeInTransaction = true;
+
+	/**
+	 * Loggers Flyway should use.
+	 */
+	private String[] loggers = { "slf4j" };
+
 	/**
 	 * Whether to batch SQL statements when executing them. Requires Flyway Teams.
 	 */
@@ -352,26 +372,6 @@ public class FlywayProperties {
 	 */
 	private Boolean detectEncoding;
 
-	/**
-	 * Prefix of placeholders in migration scripts.
-	 */
-	private String scriptPlaceholderPrefix = "FP__";
-
-	/**
-	 * Suffix of placeholders in migration scripts.
-	 */
-	private String scriptPlaceholderSuffix = "__";
-
-	/**
-	 * Whether Flyway should execute SQL within a transaction.
-	 */
-	private boolean executeInTransaction = true;
-
-	/**
-	 * Loggers Flyway should use.
-	 */
-	private String[] loggers = { "slf4j" };
-
 	public boolean isEnabled() {
 		return this.enabled;
 	}
@@ -692,6 +692,38 @@ public class FlywayProperties {
 		this.validateOnMigrate = validateOnMigrate;
 	}
 
+	public String getScriptPlaceholderPrefix() {
+		return this.scriptPlaceholderPrefix;
+	}
+
+	public void setScriptPlaceholderPrefix(String scriptPlaceholderPrefix) {
+		this.scriptPlaceholderPrefix = scriptPlaceholderPrefix;
+	}
+
+	public String getScriptPlaceholderSuffix() {
+		return this.scriptPlaceholderSuffix;
+	}
+
+	public void setScriptPlaceholderSuffix(String scriptPlaceholderSuffix) {
+		this.scriptPlaceholderSuffix = scriptPlaceholderSuffix;
+	}
+
+	public boolean isExecuteInTransaction() {
+		return this.executeInTransaction;
+	}
+
+	public void setExecuteInTransaction(boolean executeInTransaction) {
+		this.executeInTransaction = executeInTransaction;
+	}
+
+	public String[] getLoggers() {
+		return this.loggers;
+	}
+
+	public void setLoggers(String[] loggers) {
+		this.loggers = loggers;
+	}
+
 	public Boolean getBatch() {
 		return this.batch;
 	}
@@ -836,36 +868,4 @@ public class FlywayProperties {
 		this.detectEncoding = detectEncoding;
 	}
 
-	public String getScriptPlaceholderPrefix() {
-		return this.scriptPlaceholderPrefix;
-	}
-
-	public void setScriptPlaceholderPrefix(String scriptPlaceholderPrefix) {
-		this.scriptPlaceholderPrefix = scriptPlaceholderPrefix;
-	}
-
-	public String getScriptPlaceholderSuffix() {
-		return this.scriptPlaceholderSuffix;
-	}
-
-	public void setScriptPlaceholderSuffix(String scriptPlaceholderSuffix) {
-		this.scriptPlaceholderSuffix = scriptPlaceholderSuffix;
-	}
-
-	public boolean isExecuteInTransaction() {
-		return this.executeInTransaction;
-	}
-
-	public void setExecuteInTransaction(boolean executeInTransaction) {
-		this.executeInTransaction = executeInTransaction;
-	}
-
-	public String[] getLoggers() {
-		return this.loggers;
-	}
-
-	public void setLoggers(String[] loggers) {
-		this.loggers = loggers;
-	}
-
 }