From 17c778e3a00f7ad2fa836db8bdb51d1c6728cb0b Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 5 May 2022 17:26:17 +0200
Subject: [PATCH] Preserve javax nullability annotations for AOP Alliance fork

See gh-28410
---
 .../intercept/ConstructorInterceptor.java     |   6 +-
 .../intercept/ConstructorInvocation.java      |   6 +-
 .../org/aopalliance/intercept/Invocation.java |   6 +-
 .../org/aopalliance/intercept/Joinpoint.java  |   8 +-
 .../intercept/MethodInterceptor.java          |   8 +-
 .../intercept/MethodInvocation.java           |   6 +-
 src/checkstyle/checkstyle-suppressions.xml    | 145 +++++++-------
 src/checkstyle/checkstyle.xml                 | 180 +++++++++---------
 8 files changed, 184 insertions(+), 181 deletions(-)

diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java
index 3a074fd76e..8ac8f65ca3 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.aopalliance.intercept;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 /**
  * Intercepts the construction of a new object.
@@ -56,7 +56,7 @@ public interface ConstructorInterceptor extends Interceptor  {
 	 * @throws Throwable if the interceptors or the target object
 	 * throws an exception
 	 */
-	@NonNull
+	@Nonnull
 	Object construct(ConstructorInvocation invocation) throws Throwable;
 
 }
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
index c63caef3c4..72951383e9 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.aopalliance.intercept;
 
 import java.lang.reflect.Constructor;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 /**
  * Description of an invocation to a constructor, given to an
@@ -38,7 +38,7 @@ public interface ConstructorInvocation extends Invocation {
 	 * {@link Joinpoint#getStaticPart()} method (same result).
 	 * @return the constructor being called
 	 */
-	@NonNull
+	@Nonnull
 	Constructor<?> getConstructor();
 
 }
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/Invocation.java b/spring-aop/src/main/java/org/aopalliance/intercept/Invocation.java
index bd316a9dd7..96caaefefe 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/Invocation.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/Invocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.aopalliance.intercept;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 /**
  * This interface represents an invocation in the program.
@@ -34,7 +34,7 @@ public interface Invocation extends Joinpoint {
 	 * array to change the arguments.
 	 * @return the argument of the invocation
 	 */
-	@NonNull
+	@Nonnull
 	Object[] getArguments();
 
 }
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
index 56a2b77118..480d9f087c 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package org.aopalliance.intercept;
 
 import java.lang.reflect.AccessibleObject;
 
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * This interface represents a generic runtime joinpoint (in the AOP
@@ -65,7 +65,7 @@ public interface Joinpoint {
 	 * <p>The static part is an accessible object on which a chain of
 	 * interceptors are installed.
 	 */
-	@NonNull
+	@Nonnull
 	AccessibleObject getStaticPart();
 
 }
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
index 8b327568b6..9188e25e1d 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.aopalliance.intercept;
 
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Intercepts calls on an interface on its way to the target. These
@@ -56,6 +56,6 @@ public interface MethodInterceptor extends Interceptor {
 	 * throws an exception
 	 */
 	@Nullable
-	Object invoke(@NonNull MethodInvocation invocation) throws Throwable;
+	Object invoke(@Nonnull MethodInvocation invocation) throws Throwable;
 
 }
diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java
index 78a2d44cbc..f1f511bea4 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/MethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.aopalliance.intercept;
 
 import java.lang.reflect.Method;
 
-import org.springframework.lang.NonNull;
+import javax.annotation.Nonnull;
 
 /**
  * Description of an invocation to a method, given to an interceptor
@@ -38,7 +38,7 @@ public interface MethodInvocation extends Invocation {
 	 * {@link Joinpoint#getStaticPart()} method (same result).
 	 * @return the method being called
 	 */
-	@NonNull
+	@Nonnull
 	Method getMethod();
 
 }
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index b0a4d98374..b24ed59d9c 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -3,117 +3,120 @@
 <suppressions>
 
 	<!-- global -->
-	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="AnnotationLocation|AnnotationUseStyle|AtclauseOrder|AvoidNestedBlocks|FinalClass|HideUtilityClassConstructor|InnerTypeLast|JavadocStyle|JavadocType|JavadocVariable|LeftCurly|MultipleVariableDeclarations|NeedBraces|OneTopLevelClass|OuterTypeFilename|RequireThis|SpringCatch|SpringJavadoc|SpringNoThis" />
-	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]org[\\/]springframework[\\/].+(Tests|Suite)" checks="IllegalImport" id="bannedJUnitJupiterImports" />
-	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="SpringJUnit5" message="should not be public" />
+	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="AnnotationLocation|AnnotationUseStyle|AtclauseOrder|AvoidNestedBlocks|FinalClass|HideUtilityClassConstructor|InnerTypeLast|JavadocStyle|JavadocType|JavadocVariable|LeftCurly|MultipleVariableDeclarations|NeedBraces|OneTopLevelClass|OuterTypeFilename|RequireThis|SpringCatch|SpringJavadoc|SpringNoThis"/>
+	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]org[\\/]springframework[\\/].+(Tests|Suite)" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
+	<suppress files="[\\/]src[\\/](test|testFixtures)[\\/]java[\\/]" checks="SpringJUnit5" message="should not be public"/>
 	<!-- generated sources -->
-	<suppress files="[\\/]build[\\/]generated[\\/]sources[\\/]" checks=".*" />
+	<suppress files="[\\/]build[\\/]generated[\\/]sources[\\/]" checks=".*"/>
 
 	<!-- JMH benchmarks -->
-	<suppress files="[\\/]src[\\/]jmh[\\/]java[\\/]org[\\/]springframework[\\/]" checks="JavadocVariable|JavadocStyle|InnerTypeLast" />
+	<suppress files="[\\/]src[\\/]jmh[\\/]java[\\/]org[\\/]springframework[\\/]" checks="JavadocVariable|JavadocStyle|InnerTypeLast"/>
+
+	<!-- spring-aop -->
+	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]aopalliance[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
 
 	<!-- spring-beans -->
 	<suppress files="TypeMismatchException" checks="MutableException"/>
 	<suppress files="BeanCreationException" checks="MutableException"/>
-	<suppress files="BeanDefinitionParserDelegate" checks="JavadocVariable" />
-	<suppress files="DefaultBeanDefinitionDocumentReader" checks="JavadocVariable" />
-	<suppress files="BeanComponentDefinition" checks="EqualsHashCode" />
-	<suppress files="GenericBeanDefinition" checks="EqualsHashCode" />
-	<suppress files="RootBeanDefinition" checks="EqualsHashCode" />
+	<suppress files="BeanDefinitionParserDelegate" checks="JavadocVariable"/>
+	<suppress files="DefaultBeanDefinitionDocumentReader" checks="JavadocVariable"/>
+	<suppress files="BeanComponentDefinition" checks="EqualsHashCode"/>
+	<suppress files="GenericBeanDefinition" checks="EqualsHashCode"/>
+	<suppress files="RootBeanDefinition" checks="EqualsHashCode"/>
 
 	<!-- spring-context -->
-	<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" id="bannedJUnit3Imports" />
+	<suppress files="SpringAtInjectTckTests" checks="IllegalImportCheck" id="bannedJUnit3Imports"/>
 
 	<!-- spring-core -->
-	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*" />
-	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]cglib[\\/]" checks=".*" />
+	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]asm[\\/]" checks=".*"/>
+	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]cglib[\\/]" checks=".*"/>
 	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]lang[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
 	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]core[\\/]annotation[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]core[\\/]annotation[\\/]" checks="IllegalImport" id="bannedImports" message="javax"/>
-	<suppress files="ByteArrayEncoder" checks="SpringLambda" />
-	<suppress files="SocketUtils" checks="HideUtilityClassConstructor" />
-	<suppress files="ResolvableType" checks="FinalClass" />
-	<suppress files="[\\/]src[\\/]testFixtures[\\/]java[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports" />
+	<suppress files="ByteArrayEncoder" checks="SpringLambda"/>
+	<suppress files="SocketUtils" checks="HideUtilityClassConstructor"/>
+	<suppress files="ResolvableType" checks="FinalClass"/>
+	<suppress files="[\\/]src[\\/]testFixtures[\\/]java[\\/].+" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
 
 	<!-- spring-expression -->
-	<suppress files="ExpressionException" checks="MutableException" />
-	<suppress files="SpelMessage" checks="JavadocVariable|JavadocStyle" />
-	<suppress files="SpelReproTests" checks="InterfaceIsType" />
+	<suppress files="ExpressionException" checks="MutableException"/>
+	<suppress files="SpelMessage" checks="JavadocVariable|JavadocStyle"/>
+	<suppress files="SpelReproTests" checks="InterfaceIsType"/>
 
 	<!-- spring-jcl -->
-	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]commons[\\/]logging[\\/]" checks="Header|SpringNoThis|IllegalImport" />
+	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]apache[\\/]commons[\\/]logging[\\/]" checks="Header|SpringNoThis|IllegalImport"/>
 
 	<!-- spring-jdbc -->
-	<suppress files="ResultSetWrappingSqlRowSet" checks="JavadocStyle" />
+	<suppress files="ResultSetWrappingSqlRowSet" checks="JavadocStyle"/>
 
 	<!-- spring-jms -->
-	<suppress files="JmsHeaderMapper" checks="InterfaceIsType" />
-	<suppress files="JmsHeaders" checks="InterfaceIsType" />
-	<suppress files="AbstractJmsListenerContainerFactory" checks="JavadocStyle" />
-	<suppress files="DefaultJmsListenerContainerFactory" checks="JavadocStyle" />
-	<suppress files="DefaultJcaListenerContainerFactory" checks="JavadocStyle" />
+	<suppress files="JmsHeaderMapper" checks="InterfaceIsType"/>
+	<suppress files="JmsHeaders" checks="InterfaceIsType"/>
+	<suppress files="AbstractJmsListenerContainerFactory" checks="JavadocStyle"/>
+	<suppress files="DefaultJmsListenerContainerFactory" checks="JavadocStyle"/>
+	<suppress files="DefaultJcaListenerContainerFactory" checks="JavadocStyle"/>
 
 	<!-- spring-messaging -->
-	<suppress files="SimpMessageHeaderAccessor" checks="JavadocVariable" />
-	<suppress files="SimpMessageType" checks="JavadocVariable" />
-	<suppress files="StompCommand" checks="JavadocVariable" />
-	<suppress files="StompHeaderAccessor" checks="JavadocVariable" />
-	<suppress files="StompHeaders" checks="JavadocVariable" />
-	<suppress files="org[\\/]springframework[\\/]messaging[\\/]handler[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType" />
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]messaging[\\/]protobuf[\\/].*" checks=".*" />
+	<suppress files="SimpMessageHeaderAccessor" checks="JavadocVariable"/>
+	<suppress files="SimpMessageType" checks="JavadocVariable"/>
+	<suppress files="StompCommand" checks="JavadocVariable"/>
+	<suppress files="StompHeaderAccessor" checks="JavadocVariable"/>
+	<suppress files="StompHeaders" checks="JavadocVariable"/>
+	<suppress files="org[\\/]springframework[\\/]messaging[\\/]handler[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType"/>
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]messaging[\\/]protobuf[\\/].*" checks=".*"/>
 
 	<!-- spring-orm -->
 	<suppress files="jpa[\\/]vendor[\\/]Database" checks="JavadocVariable|JavadocStyle"/>
 
 	<!-- spring-tx -->
-	<suppress files="TransactionSystemException" checks="MutableException" />
-	<suppress files="TransactionTemplate" checks="EqualsHashCode" />
+	<suppress files="TransactionSystemException" checks="MutableException"/>
+	<suppress files="TransactionTemplate" checks="EqualsHashCode"/>
 
 	<!-- spring-test - main and test -->
-	<suppress files="org[\\/]springframework[\\/]test[\\/]context[\\/]junit4[\\/].+" checks="IllegalImport" id="bannedJUnit4Imports" />
-	<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[\\/]junit4[\\/].+" checks="IllegalImport" id="bannedJUnit4Imports"/>
+	<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[\\/]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" />
-	<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]servlet[\\/]result[\\/].+Matchers" 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[\\/]reactive[\\/]server[\\/].+" checks="IllegalImport" id="bannedHamcrestImports"/>
+	<suppress files="src[\\/]main[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/]servlet[\\/]result[\\/].+Matchers" checks="IllegalImport" id="bannedHamcrestImports"/>
 	<!-- spring-test - test -->
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/].+TestNGTests" checks="IllegalImport" id="bannedTestNGImports" />
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/]web[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports" />
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports" />
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/](client|reactive|servlet)[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports" />
-	<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[\\/].+[\\/](ExpectedExceptionSpringRunnerTests|StandardJUnit4FeaturesTests|ProgrammaticTxMgmtTestNGTests)" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation" />
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/].+TestNGTests" checks="IllegalImport" id="bannedTestNGImports"/>
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]context[\\/]junit[\\/]jupiter[\\/]web[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports"/>
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]util[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports"/>
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]test[\\/]web[\\/](client|reactive|servlet)[\\/].+Tests" checks="IllegalImport" id="bannedHamcrestImports"/>
+	<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[\\/].+[\\/](ExpectedExceptionSpringRunnerTests|StandardJUnit4FeaturesTests|ProgrammaticTxMgmtTestNGTests)" checks="RegexpSinglelineJava" id="expectedExceptionAnnotation"/>
 
 	<!-- spring-web -->
-	<suppress files="SpringHandlerInstantiator" checks="JavadocStyle" />
-	<suppress files="org[\\/]springframework[\\/]http[\\/]HttpMethod" checks="JavadocVariable|JavadocStyle" />
-	<suppress files="org[\\/]springframework[\\/]http[\\/]HttpStatus" checks="JavadocVariable|JavadocStyle" />
-	<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]CrossOrigin" checks="JavadocStyle" />
-	<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]RequestMethod" checks="JavadocVariable" />
-	<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType" />
-	<suppress files="PatternParseException" checks="JavadocVariable" />
-	<suppress files="web[\\/]reactive[\\/]socket[\\/]CloseStatus" checks="JavadocStyle" />
+	<suppress files="SpringHandlerInstantiator" checks="JavadocStyle"/>
+	<suppress files="org[\\/]springframework[\\/]http[\\/]HttpMethod" checks="JavadocVariable|JavadocStyle"/>
+	<suppress files="org[\\/]springframework[\\/]http[\\/]HttpStatus" checks="JavadocVariable|JavadocStyle"/>
+	<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]CrossOrigin" checks="JavadocStyle"/>
+	<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]RequestMethod" checks="JavadocVariable"/>
+	<suppress files="org[\\/]springframework[\\/]web[\\/]bind[\\/]annotation[\\/]ValueConstants" checks="InterfaceIsType"/>
+	<suppress files="PatternParseException" checks="JavadocVariable"/>
+	<suppress files="web[\\/]reactive[\\/]socket[\\/]CloseStatus" checks="JavadocStyle"/>
 
 	<!-- spring-webflux -->
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports" />
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]resource[\\/]GzipSupport" checks="IllegalImport" id="bannedJUnitJupiterImports"/>
 
 	<!-- spring-webmvc -->
-	<suppress files="org[\\/]springframework[\\/]web[\\/]servlet[\\/]tags[\\/]form[\\/].*Tag" checks="JavadocVariable" />
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]protobuf[\\/].*" checks=".*" />
-	<suppress files="ExtractingResponseErrorHandlerTests" checks="MutableException" />
-	<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="org[\\/]springframework[\\/]web[\\/]servlet[\\/]tags[\\/]form[\\/].*Tag" checks="JavadocVariable"/>
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]protobuf[\\/].*" checks=".*"/>
+	<suppress files="ExtractingResponseErrorHandlerTests" checks="MutableException"/>
+	<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"/>
 
 	<!-- spring-websocket -->
-	<suppress files="web[\\/]socket[\\/]CloseStatus" checks="JavadocStyle" />
-	<suppress files="web[\\/]socket[\\/]WebSocketHttpHeaders" checks="JavadocVariable" />
-	<suppress files="sockjs[\\/]frame[\\/]SockJsFrameType" checks="JavadocVariable" />
-	<suppress files="sockjs[\\/]transport[\\/]TransportType" checks="JavadocVariable" />
-	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]protobuf[\\/].*" checks=".*" />
+	<suppress files="web[\\/]socket[\\/]CloseStatus" checks="JavadocStyle"/>
+	<suppress files="web[\\/]socket[\\/]WebSocketHttpHeaders" checks="JavadocVariable"/>
+	<suppress files="sockjs[\\/]frame[\\/]SockJsFrameType" checks="JavadocVariable"/>
+	<suppress files="sockjs[\\/]transport[\\/]TransportType" checks="JavadocVariable"/>
+	<suppress files="src[\\/]test[\\/]java[\\/]org[\\/]springframework[\\/]web[\\/]reactive[\\/]protobuf[\\/].*" checks=".*"/>
 
 </suppressions>
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index d588b78584..a8764a5474 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -8,7 +8,7 @@
 
 	<!-- Root Checks -->
 	<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
-		<property name="fileExtensions" value="java" />
+		<property name="fileExtensions" value="java"/>
 		<property name="headerType" value="apache2"/>
 		<property name="headerCopyrightPattern" value="20\d\d-20\d\d"/>
 		<property name="packageInfoHeaderType" value="none"/>
@@ -19,125 +19,125 @@
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<!-- Annotations -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck">
-			<property name="elementStyle" value="compact" />
+			<property name="elementStyle" value="compact"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck">
 			<property name="allowSamelineSingleParameterlessAnnotation"
-				value="false" />
+				value="false"/>
 		</module>
 
 		<!-- Block Checks -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">
-			<property name="option" value="text" />
+			<property name="option" value="text"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck">
-			<property name="option" value="alone" />
+			<property name="option" value="alone"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck"/>
 
 		<!-- Class Design -->
-		<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck">
-			<property name="format" value="^.*Exception$" />
+			<property name="format" value="^.*Exception$"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck"/>
 
 		<!-- Type Names -->
 		<module name="TypeName">
-			<property name="format" value="^[A-Z][a-zA-Z0-9_$]*(?&lt;!Test)$" />
-			<property name="tokens" value="CLASS_DEF" />
+			<property name="format" value="^[A-Z][a-zA-Z0-9_$]*(?&lt;!Test)$"/>
+			<property name="tokens" value="CLASS_DEF"/>
 			<message key="name.invalidPattern"
-				value="Class name ''{0}'' must not end with ''Test'' (checked pattern ''{1}'')." />
+				value="Class name ''{0}'' must not end with ''Test'' (checked pattern ''{1}'')."/>
 		</module>
 
 		<!-- Coding -->
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck">
-			<property name="max" value="3" />
+			<property name="max" value="3"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck">
-			<property name="max" value="5" />
+			<property name="max" value="5"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
-			<property name="max" value="3" />
+			<property name="max" value="3"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"/>
 
-		<module name="io.spring.javaformat.checkstyle.filter.RequiresOuterThisFilter" />
+		<module name="io.spring.javaformat.checkstyle.filter.RequiresOuterThisFilter"/>
 		<module name="io.spring.javaformat.checkstyle.filter.IdentCheckFilter">
-			<property name="names" value="logger" />
+			<property name="names" value="logger"/>
 			<module
 				name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
-				<property name="checkMethods" value="false" />
-				<property name="validateOnlyOverlapping" value="false" />
+				<property name="checkMethods" value="false"/>
+				<property name="validateOnlyOverlapping" value="false"/>
 			</module>
 		</module>
 		<module name="io.spring.javaformat.checkstyle.check.SpringNoThisCheck">
-			<property name="names" value="logger" />
+			<property name="names" value="logger"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
 
 		<!-- Imports -->
-		<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck">
-			<property name="processJavadoc" value="true" />
+			<property name="processJavadoc" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">
-			<property name="groups" value="java,javax,*,org.springframework" />
-			<property name="ordered" value="true" />
-			<property name="separated" value="true" />
-			<property name="option" value="bottom" />
-			<property name="sortStaticImportsAlphabetically" value="true" />
+			<property name="groups" value="java,javax,*,org.springframework"/>
+			<property name="ordered" value="true"/>
+			<property name="separated" value="true"/>
+			<property name="option" value="bottom"/>
+			<property name="sortStaticImportsAlphabetically" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedImports"/>
-			<property name="regexp" value="true" />
+			<property name="regexp" value="true"/>
 			<property name="illegalClasses"
-				value="^reactor\.core\.support\.Assert,^org\.slf4j\.LoggerFactory,^(?!org\.springframework).*(NonNull|Nonnull|NonNullApi|NonNullFields|Nullable)$" />
+				value="^reactor\.core\.support\.Assert,^org\.slf4j\.LoggerFactory,^(?!org\.springframework).*(NonNull|Nonnull|NonNullApi|NonNullFields|Nullable)$"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedJUnit3Imports"/>
-			<property name="regexp" value="true" />
-			<property name="illegalClasses" value="^junit\.framework\..+" />
+			<property name="regexp" value="true"/>
+			<property name="illegalClasses" value="^junit\.framework\..+"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedJUnit4Imports"/>
-			<property name="regexp" value="true" />
+			<property name="regexp" value="true"/>
 			<property name="illegalClasses"
-				value="^org\.junit\.(Test|BeforeClass|AfterClass|Before|After|Ignore|FixMethodOrder|Rule|ClassRule|Assert|Assume)$,^org\.junit\.(Assert|Assume)\..+,^org\.junit\.(experimental|internal|matchers|rules|runner|runners|validator)\..+" />
+				value="^org\.junit\.(Test|BeforeClass|AfterClass|Before|After|Ignore|FixMethodOrder|Rule|ClassRule|Assert|Assume)$,^org\.junit\.(Assert|Assume)\..+,^org\.junit\.(experimental|internal|matchers|rules|runner|runners|validator)\..+"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedJUnitJupiterImports"/>
-			<property name="regexp" value="true" />
-			<property name="illegalClasses" value="^org\.junit\.jupiter\..+" />
+			<property name="regexp" value="true"/>
+			<property name="illegalClasses" value="^org\.junit\.jupiter\..+"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedTestNGImports"/>
-			<property name="regexp" value="true" />
-			<property name="illegalClasses" value="^org\.testng\..+," />
+			<property name="regexp" value="true"/>
+			<property name="illegalClasses" value="^org\.testng\..+,"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedHamcrestImports"/>
-			<property name="regexp" value="true" />
-			<property name="illegalClasses" value="^org\.hamcrest\..+" />
+			<property name="regexp" value="true"/>
+			<property name="illegalClasses" value="^org\.hamcrest\..+"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="id" value="bannedJetbrainsAnnotationsImports"/>
-			<property name="regexp" value="true" />
-			<property name="illegalClasses" value="^org\.jetbrains\.annotations\..+" />
+			<property name="regexp" value="true"/>
+			<property name="illegalClasses" value="^org\.jetbrains\.annotations\..+"/>
 		</module>
 
 		<!-- Javadoc Comments -->
@@ -155,7 +155,7 @@
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
 			<property name="checkEmptyJavadoc" value="true"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck">
 			<property name="offset" value="0"/>
 		</module>
@@ -172,74 +172,74 @@
 		<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck">
 			<property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/>
 
 		<!-- Regexp -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
-			<property name="format" value="^\t* +\t*\S" />
+			<property name="format" value="^\t* +\t*\S"/>
 			<property name="message"
-				value="Line has leading space characters; indentation should be performed with tabs only." />
-			<property name="ignoreComments" value="true" />
+				value="Line has leading space characters; indentation should be performed with tabs only."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck">
-			<property name="format" value="[ \t]+$" />
-			<property name="illegalPattern" value="true" />
-			<property name="message" value="Trailing whitespace" />
+			<property name="format" value="[ \t]+$"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Trailing whitespace"/>
 		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
-			<property name="maximum" value="0" />
+			<property name="maximum" value="0"/>
 			<property name="format"
-				value="assertThatExceptionOfType\((NullPointerException|IllegalArgumentException|IOException|IllegalStateException)\.class\)" />
+				value="assertThatExceptionOfType\((NullPointerException|IllegalArgumentException|IOException|IllegalStateException)\.class\)"/>
 			<property name="message"
-				value="Please use specialized AssertJ assertThat*Exception method." />
-			<property name="ignoreComments" value="true" />
+				value="Please use specialized AssertJ assertThat*Exception method."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="id" value="bddMockito"/>
 			<property name="maximum" value="0"/>
-			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" />
-			<property name="message" value="Please use BDDMockito." />
-			<property name="ignoreComments" value="true" />
+			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)"/>
+			<property name="message" value="Please use BDDMockito."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="id" value="expectedExceptionAnnotation"/>
 			<property name="maximum" value="0"/>
-			<property name="format" value="\@Test\(expected" />
-			<property name="message" value="Please use AssertJ assertions." />
-			<property name="ignoreComments" value="true" />
+			<property name="format" value="\@Test\(expected"/>
+			<property name="message" value="Please use AssertJ assertions."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="id" value="junit4Assertions"/>
 			<property name="maximum" value="0"/>
-			<property name="format" value="org\.junit\.Assert\.assert" />
-			<property name="message" value="Please use AssertJ assertions." />
-			<property name="ignoreComments" value="true" />
+			<property name="format" value="org\.junit\.Assert\.assert"/>
+			<property name="message" value="Please use AssertJ assertions."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="id" value="junitJupiterAssertions"/>
 			<property name="maximum" value="0"/>
-			<property name="format" value="org\.junit\.jupiter\.api\.Assertions\.assert" />
-			<property name="message" value="Please use AssertJ assertions." />
-			<property name="ignoreComments" value="true" />
+			<property name="format" value="org\.junit\.jupiter\.api\.Assertions\.assert"/>
+			<property name="message" value="Please use AssertJ assertions."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="id" value="testNGAssertions"/>
 			<property name="maximum" value="0"/>
 			<!-- should cover org.testng.Assert and org.testng.AssertJUnit -->
-			<property name="format" value="org\.testng\.Assert(JUnit)?\.assert" />
-			<property name="message" value="Please use AssertJ assertions." />
-			<property name="ignoreComments" value="true" />
+			<property name="format" value="org\.testng\.Assert(JUnit)?\.assert"/>
+			<property name="message" value="Please use AssertJ assertions."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 
 		<!-- Spring Conventions -->
 		<module name="io.spring.javaformat.checkstyle.check.SpringLambdaCheck">
-			<property name="singleArgumentParentheses" value="false" />
+			<property name="singleArgumentParentheses" value="false"/>
 		</module>
-		<module name="io.spring.javaformat.checkstyle.check.SpringCatchCheck" />
-		<module name="io.spring.javaformat.checkstyle.check.SpringJavadocCheck" />
-		<module name="io.spring.javaformat.checkstyle.check.SpringJUnit5Check" />
+		<module name="io.spring.javaformat.checkstyle.check.SpringCatchCheck"/>
+		<module name="io.spring.javaformat.checkstyle.check.SpringJavadocCheck"/>
+		<module name="io.spring.javaformat.checkstyle.check.SpringJUnit5Check"/>
  	</module>
 </module>