Merge pull request #26150 from zuisong

snicoll · snicoll · commit fea53294e4e4 · 2021-04-19T09:28:02.000+02:00
* pr/26150: Fix wrong replacements for spring.datasource.[schema|data] Closes gh-26150
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
@@ -414,7 +414,7 @@ public void setPlatform(String platform) {
 	}
 
 	@Deprecated
-	@DeprecatedConfigurationProperty(replacement = "spring.sql.init.ddlScriptLocations")
+	@DeprecatedConfigurationProperty(replacement = "spring.sql.init.schema-locations")
 	public List<String> getSchema() {
 		return this.schema;
 	}
@@ -447,7 +447,7 @@ public void setSchemaPassword(String schemaPassword) {
 	}
 
 	@Deprecated
-	@DeprecatedConfigurationProperty(replacement = "spring.sql.init.dmlScriptLocations")
+	@DeprecatedConfigurationProperty(replacement = "spring.sql.init.data-locations")
 	public List<String> getData() {
 		return this.data;
 	}

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ public void setPlatform(String platform) {`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`@Deprecated`
`417`		`- @DeprecatedConfigurationProperty(replacement = "spring.sql.init.ddlScriptLocations")`
	`417`	`+ @DeprecatedConfigurationProperty(replacement = "spring.sql.init.schema-locations")`
`418`	`418`	`public List<String> getSchema() {`
`419`	`419`	`return this.schema;`
`420`	`420`	`}`
`@@ -447,7 +447,7 @@ public void setSchemaPassword(String schemaPassword) {`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`@Deprecated`
`450`		`- @DeprecatedConfigurationProperty(replacement = "spring.sql.init.dmlScriptLocations")`
	`450`	`+ @DeprecatedConfigurationProperty(replacement = "spring.sql.init.data-locations")`
`451`	`451`	`public List<String> getData() {`
`452`	`452`	`return this.data;`
`453`	`453`	`}`