root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2019-09-12 11:35:30 +02:00
parent 30cff46e7f
commit 8f38f5c17a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
View File

@ -130,6 +130,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the bean name of the {@link javax.sql.DataSource}.
* @see SqlConfig#dataSource() * @see SqlConfig#dataSource()
*/ */
String getDataSource() { String getDataSource() {
@ -137,6 +138,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the bean name of the {@link org.springframework.transaction.PlatformTransactionManager}.
* @see SqlConfig#transactionManager() * @see SqlConfig#transactionManager()
*/ */
String getTransactionManager() { String getTransactionManager() {
@ -144,6 +146,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the {@link TransactionMode}.
* @see SqlConfig#transactionMode() * @see SqlConfig#transactionMode()
*/ */
TransactionMode getTransactionMode() { TransactionMode getTransactionMode() {
@ -151,6 +154,8 @@ class MergedSqlConfig {
} }
/** /**
* Get the encoding for the SQL scripts, if different from the platform
* encoding.
* @see SqlConfig#encoding() * @see SqlConfig#encoding()
*/ */
String getEncoding() { String getEncoding() {
@ -158,6 +163,8 @@ class MergedSqlConfig {
} }
/** /**
* Get the character string used to separate individual statements within the
* SQL scripts.
* @see SqlConfig#separator() * @see SqlConfig#separator()
*/ */
String getSeparator() { String getSeparator() {
@ -165,6 +172,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the prefixes that identify single-line comments within the SQL scripts.
* @see SqlConfig#commentPrefixes() * @see SqlConfig#commentPrefixes()
* @since 5.2 * @since 5.2
*/ */
@ -173,6 +181,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the start delimiter that identifies block comments within the SQL scripts.
* @see SqlConfig#blockCommentStartDelimiter() * @see SqlConfig#blockCommentStartDelimiter()
*/ */
String getBlockCommentStartDelimiter() { String getBlockCommentStartDelimiter() {
@ -180,6 +189,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the end delimiter that identifies block comments within the SQL scripts.
* @see SqlConfig#blockCommentEndDelimiter() * @see SqlConfig#blockCommentEndDelimiter()
*/ */
String getBlockCommentEndDelimiter() { String getBlockCommentEndDelimiter() {
@ -187,6 +197,7 @@ class MergedSqlConfig {
} }
/** /**
* Get the {@link ErrorMode}.
* @see SqlConfig#errorMode() * @see SqlConfig#errorMode()
*/ */
ErrorMode getErrorMode() { ErrorMode getErrorMode() {

5
src/checkstyle/checkstyle-suppressions.xml
View File

@ -65,7 +65,6 @@
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports" /> <suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports" />
<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]testng[\\/].+" checks="IllegalImport" id="bannedTestNGImports" /> <suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]testng[\\/].+" checks="IllegalImport" id="bannedTestNGImports" />
<!-- spring-test - main --> <!-- 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[\\/]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[\\/]client[\\/]match[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports" />
<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]reactive[\\/]server[\\/].+" 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="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit4" checks="SpringJUnit5" />
<suppress files="ContextHierarchyDirtiesContextTests|ClassLevelDirtiesContextTests|ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests|ContextConfigurationWithPropertiesExtendingPropertiesTests|DirtiesContextInterfaceTests|.+WacTests|JUnit4SpringContextWebTests" 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=".+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[\\/].+[\\/](ExpectedExceptionSpringRunnerTests|StandardJUnit4FeaturesTests|ProgrammaticTxMgmtTestNGTests)" 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" />
<!-- spring-web --> <!-- spring-web -->
<suppress files="SpringHandlerInstantiator" checks="JavadocStyle" /> <suppress files="SpringHandlerInstantiator" checks="JavadocStyle" />