diff --git a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt
index 6473fc28267..1bd66d676d1 100644
--- a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt
+++ b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt
@@ -9,13 +9,11 @@ class BasicDataSourceConfiguration {
 
 	// tag::dataSourceBean[]
 	@Bean(destroyMethod = "close")
-	fun dataSource(): BasicDataSource {
-		val dataSource = BasicDataSource()
-		dataSource.driverClassName = "org.hsqldb.jdbcDriver"
-		dataSource.url = "jdbc:hsqldb:hsql://localhost:"
-		dataSource.username = "sa"
-		dataSource.password = ""
-		return dataSource
+	fun dataSource() = BasicDataSource().apply {
+		driverClassName = "org.hsqldb.jdbcDriver"
+		url = "jdbc:hsqldb:hsql://localhost:"
+		username = "sa"
+		password = ""
 	}
 	// end::dataSourceBean[]
 }
diff --git a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt
index 73072815cd0..34d1f6518d4 100644
--- a/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt
+++ b/framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt
@@ -9,13 +9,11 @@ internal class ComboPooledDataSourceConfiguration {
 
 	// tag::dataSourceBean[]
 	@Bean(destroyMethod = "close")
-	fun dataSource(): ComboPooledDataSource {
-		val dataSource = ComboPooledDataSource()
-		dataSource.driverClass = "org.hsqldb.jdbcDriver"
-		dataSource.jdbcUrl = "jdbc:hsqldb:hsql://localhost:"
-		dataSource.user = "sa"
-		dataSource.password = ""
-		return dataSource
+	fun dataSource() = ComboPooledDataSource().apply {
+		driverClass = "org.hsqldb.jdbcDriver"
+		jdbcUrl = "jdbc:hsqldb:hsql://localhost:"
+		user = "sa"
+		password = ""
 	}
 	// end::dataSourceBean[]