Merge branch '6.2.x'

Author: sdeleuze

spring-context/src/test/java/org/springframework/context/event/ApplicationListenerMethodAdapterTests.java

@@ -213,8 +213,8 @@ void invokeListenerWithGenericPayload() {
 
 	@Test
 	void invokeListenerWithWrongGenericPayload() {
-		Method method = ReflectionUtils.findMethod
-				(SampleEvents.class, "handleGenericStringPayload", EntityWrapper.class);
+		Method method = ReflectionUtils.findMethod(
+				SampleEvents.class, "handleGenericStringPayload", EntityWrapper.class);
 		EntityWrapper<Integer> payload = new EntityWrapper<>(123);
 		invokeListener(method, new PayloadApplicationEvent<>(this, payload));
 		verify(this.sampleEvents, times(0)).handleGenericStringPayload(any());

spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java

@@ -67,7 +67,7 @@ public Foo convert(String source) {
 		converters.add(new ConverterFactory<String, Bar>() {
 			@Override
 			public <T extends Bar> Converter<String, T> getConverter(Class<T> targetType) {
-				return new Converter<> () {
+				return new Converter<>() {
 					@SuppressWarnings("unchecked")
 					@Override
 					public T convert(String source) {

spring-core/src/test/java/org/springframework/aot/generate/GeneratedClassesTests.java

@@ -148,8 +148,8 @@ void getOrAddForFeatureComponentWhenHasFeatureNamePrefix() {
 				"one", TestComponent.class, emptyTypeCustomizer);
 		GeneratedClass generatedClass2 = this.generatedClasses.getOrAddForFeatureComponent(
 				"one", TestComponent.class, emptyTypeCustomizer);
-		GeneratedClass generatedClass3 = prefixed.getOrAddForFeatureComponent
-				("one", TestComponent.class, emptyTypeCustomizer);
+		GeneratedClass generatedClass3 = prefixed.getOrAddForFeatureComponent(
+				"one", TestComponent.class, emptyTypeCustomizer);
 		GeneratedClass generatedClass4 = prefixed.getOrAddForFeatureComponent(
 				"one", TestComponent.class, emptyTypeCustomizer);
 		assertThat(generatedClass1).isSameAs(generatedClass2).isNotSameAs(generatedClass3);

spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java

@@ -98,7 +98,7 @@ public int compareTo(CompositeMessageCondition other, Message<?> message) {
 		checkCompatible(other);
 		List<MessageCondition<?>> otherConditions = other.getMessageConditions();
 		for (int i = 0; i < this.messageConditions.size(); i++) {
-			int result = compare (this.messageConditions.get(i), otherConditions.get(i), message);
+			int result = compare(this.messageConditions.get(i), otherConditions.get(i), message);
 			if (result != 0) {
 				return result;
 			}

spring-web/src/main/java/org/springframework/http/HttpHeaders.java

@@ -2214,7 +2214,7 @@ private static class HeaderNamesIterator implements Iterator<String> {
 		private final MultiValueMap<String, String> headers;
 		private final Iterator<String> namesIterator;
 
-		public HeaderNamesIterator (MultiValueMap<String, String> headers, Map<String, Object> caseInsensitiveNames) {
+		public HeaderNamesIterator(MultiValueMap<String, String> headers, Map<String, Object> caseInsensitiveNames) {
 			this.headers = headers;
 			this.namesIterator = caseInsensitiveNames.keySet().iterator();
 			this.currentName = null;

spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java

@@ -241,7 +241,7 @@ protected ServletRequest getRequest() {
 
 		protected @Nullable Object getRequestParameter(String name, Class<?> type) {
 			Object value = this.request.getParameterValues(name);
-			if (value == null && !name.endsWith ("[]") &&
+			if (value == null && !name.endsWith("[]") &&
 					(List.class.isAssignableFrom(type) || type.isArray())) {
 				value = this.request.getParameterValues(name + "[]");
 			}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java

@@ -657,7 +657,7 @@ public ModelValidatingViewResolver(Map<String, Object> attrsToValidate) {
 
 		@Override
 		public View resolveViewName(final String viewName, Locale locale) {
-			return new AbstractView () {
+			return new AbstractView() {
 				@Override
 				public String getContentType() {
 					return null;

src/checkstyle/checkstyle.xml

@@ -181,6 +181,7 @@
 		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
 
 		<!-- Whitespace -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
 
 		<!-- Miscellaneous -->