From 8f38f5c17aa19f50b4f3fcbb74b77c10bdcec97d Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Thu, 12 Sep 2019 11:35:30 +0200
Subject: [PATCH] Polishing

---
 .../test/context/jdbc/MergedSqlConfig.java            | 11 +++++++++++
 src/checkstyle/checkstyle-suppressions.xml            |  5 +----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
index 0109b59a59..38ea929213 100644
--- a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
+++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
@@ -130,6 +130,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the bean name of the {@link javax.sql.DataSource}.
 	 * @see SqlConfig#dataSource()
 	 */
 	String getDataSource() {
@@ -137,6 +138,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the bean name of the {@link org.springframework.transaction.PlatformTransactionManager}.
 	 * @see SqlConfig#transactionManager()
 	 */
 	String getTransactionManager() {
@@ -144,6 +146,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the {@link TransactionMode}.
 	 * @see SqlConfig#transactionMode()
 	 */
 	TransactionMode getTransactionMode() {
@@ -151,6 +154,8 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the encoding for the SQL scripts, if different from the platform
+	 * encoding.
 	 * @see SqlConfig#encoding()
 	 */
 	String getEncoding() {
@@ -158,6 +163,8 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the character string used to separate individual statements within the
+	 * SQL scripts.
 	 * @see SqlConfig#separator()
 	 */
 	String getSeparator() {
@@ -165,6 +172,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the prefixes that identify single-line comments within the SQL scripts.
 	 * @see SqlConfig#commentPrefixes()
 	 * @since 5.2
 	 */
@@ -173,6 +181,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the start delimiter that identifies block comments within the SQL scripts.
 	 * @see SqlConfig#blockCommentStartDelimiter()
 	 */
 	String getBlockCommentStartDelimiter() {
@@ -180,6 +189,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the end delimiter that identifies block comments within the SQL scripts.
 	 * @see SqlConfig#blockCommentEndDelimiter()
 	 */
 	String getBlockCommentEndDelimiter() {
@@ -187,6 +197,7 @@ class MergedSqlConfig {
 	}
 
 	/**
+	 * Get the {@link ErrorMode}.
 	 * @see SqlConfig#errorMode()
 	 */
 	ErrorMode getErrorMode() {
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index e3382a6200..2fba1f7808 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -65,7 +65,6 @@
 	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports" />
 	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]testng[\\/].+" checks="IllegalImport" id="bannedTestNGImports" />
 	<!-- spring-test - main -->
-	<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]jdbc[\\/]MergedSqlConfig" checks="JavadocStyle" />
 	<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Helper" checks="IllegalImport" id="bannedHamcrestImports" />
 	<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]client[\\/]match[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports" />
 	<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]reactive[\\/]server[\\/].+" checks="IllegalImport" id="bannedHamcrestImports" />
@@ -78,9 +77,7 @@
 	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit4" checks="SpringJUnit5" />
 	<suppress files="ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" checks="SpringJUnit5" />
 	<suppress files=".+TestSuite|ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" checks="IllegalImport" id="bannedJUnit4Imports" />
-	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit4[\\/]ExpectedExceptionSpringRunnerTests" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation" />
-	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit4[\\/]StandardJUnit4FeaturesTests" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation" />
-	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]testng[\\/]transaction[\\/]programmatic/ProgrammaticTxMgmtTestNGTests" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation" />
+	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/].+[\\/](ExpectedExceptionSpringRunnerTests|StandardJUnit4FeaturesTests|ProgrammaticTxMgmtTestNGTests)" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation" />
 
 	<!-- spring-web -->
 	<suppress files="SpringHandlerInstantiator" checks="JavadocStyle" />