From 004ea51b05bd607122834b42c6849b852d62ddbc Mon Sep 17 00:00:00 2001 From: Param Date: Mon, 30 Mar 2020 09:36:51 -0500 Subject: [PATCH 1/2] Make it clear to which type the DataSource properties are bound See gh-20727 --- .../src/main/groovy/generateConfigurationPropertyTables.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy b/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy index 1b5baa2fdc9..fcded5d8264 100644 --- a/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy +++ b/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy @@ -56,7 +56,7 @@ def generateConfigMetadataDocumentation() { "spring.jdbc", "spring.jpa") .addOverride("spring.datasource.dbcp2", "Commons DBCP2 specific settings") .addOverride("spring.datasource.tomcat", "Tomcat datasource specific settings") - .addOverride("spring.datasource.hikari", "Hikari specific settings") + .addOverride("spring.datasource.hikari", "Hikari specific settings bound to an instance of `HikariDataSource`") .addSection("transaction") .withKeyPrefixes("spring.jta", "spring.transaction") .addSection("integration") From 6d7c3da1cf5bf592fe62cc1df77d748516c82012 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 31 Mar 2020 12:45:04 +0100 Subject: [PATCH 2/2] Polish "Make it clear to which type the DataSource properties are bound" See gh-20727 --- .../main/groovy/generateConfigurationPropertyTables.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy b/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy index fcded5d8264..b237fb96464 100644 --- a/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy +++ b/spring-boot-project/spring-boot-docs/src/main/groovy/generateConfigurationPropertyTables.groovy @@ -54,9 +54,9 @@ def generateConfigMetadataDocumentation() { "spring.influx", "spring.mongodb", "spring.redis", "spring.dao", "spring.data", "spring.datasource", "spring.jooq", "spring.jdbc", "spring.jpa") - .addOverride("spring.datasource.dbcp2", "Commons DBCP2 specific settings") - .addOverride("spring.datasource.tomcat", "Tomcat datasource specific settings") - .addOverride("spring.datasource.hikari", "Hikari specific settings bound to an instance of `HikariDataSource`") + .addOverride("spring.datasource.dbcp2", "Commons DBCP2 specific settings bound to an instance of DBCP2's BasicDataSource") + .addOverride("spring.datasource.tomcat", "Tomcat datasource specific settings bound to an instance of Tomcat JDBC's DataSource") + .addOverride("spring.datasource.hikari", "Hikari specific settings bound to an instance of Hikari's HikariDataSource") .addSection("transaction") .withKeyPrefixes("spring.jta", "spring.transaction") .addSection("integration")