Merge branch '3.4.x' into 3.5.x

snicoll · snicoll · commit 33ae2a1d679b · 2025-12-08T12:41:14.000+01:00
diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configuretwodatasources/MyCompleteAdditionalDataSourceConfiguration.java
@@ -37,8 +37,7 @@ public DataSourceProperties secondDataSourceProperties() {
 	@Qualifier("second")
 	@Bean(defaultCandidate = false)
 	@ConfigurationProperties("app.datasource.configuration")
-	public HikariDataSource secondDataSource(
-			@Qualifier("second") DataSourceProperties dataSourceProperties) {
+	public HikariDataSource secondDataSource(@Qualifier("second") DataSourceProperties dataSourceProperties) {
 		return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public DataSourceProperties secondDataSourceProperties() {`
`37`	`37`	`@Qualifier("second")`
`38`	`38`	`@Bean(defaultCandidate = false)`
`39`	`39`	`@ConfigurationProperties("app.datasource.configuration")`
`40`		`- public HikariDataSource secondDataSource(`
`41`		`- @Qualifier("second") DataSourceProperties dataSourceProperties) {`
	`40`	`+ public HikariDataSource secondDataSource(@Qualifier("second") DataSourceProperties dataSourceProperties) {`
`42`	`41`	`return dataSourceProperties.initializeDataSourceBuilder().type(HikariDataSource.class).build();`
`43`	`42`	`}`
`44`	`43`