Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-03-19 16:24:18 +01:00
parent 2f8c5a580a 208d52d852
commit 8db1340263
97 changed files with 378 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@
<suppress files="ResolvableType" checks="FinalClass"/>
<suppress files="[\\/]src[\\/]testFixtures[\\/]java[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
<suppress files="Target_ClassFinder" checks="HideUtilityClassConstructor"/>
<suppress files="StringDecoderBenchmark" checks="RegexpSinglelineJava" id="separatorSymbolLocation"/>
<!-- spring-core-test -->
<suppress files="CompileWithForkedClassLoader" checks="IllegalImport" id="bannedJUnitJupiterImports" />
@@ -128,6 +129,7 @@
<suppress files="ServletAnnotationControllerHandlerMethodTests" checks="InterfaceIsType"/>
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]servlet[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]servlet[\\/]handler[\\/]PathPatterns.+" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
<suppress files="(ResponseBodyEmitterReturnValueHandlerTests|SseServerResponseTests)" checks="RegexpSinglelineJava" id="separatorSymbolLocation"/>
<!-- spring-websocket -->
<suppress files="web[\\/]socket[\\/]CloseStatus" checks="JavadocStyle"/>

8
src/checkstyle/checkstyle.xml
View File

@@ -188,6 +188,14 @@
<property name="illegalPattern" value="true"/>
<property name="message" value="Trailing whitespace"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<!-- https://github.com/spring-projects/spring-framework/wiki/Code-Style#line-wrapping-->
<property name="id" value="separatorSymbolLocation"/>
<property name="format" value="^\s+?([,?:]|(\+(?!\+))|&amp;&amp;|\|\|)"/>
<property name="message"
value="Separator symbols ('','', ''+'', ''?'', '':'', ''&amp;&amp;'', ''||'') must be declared at the end of the previous line."/>
<property name="ignoreComments" value="true"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="atSinceVersionConvention"/>
<property name="format" value="\@since \d+\.\d+\.0"/>