Upgrade to spring-javaformat 0.0.28 and downgrade to Checkstyle 8.41

In order to be able to use text blocks and other new Java language
features, we are upgrading to a recent version of Checkstyle.

The latest version of spring-javaformat-checkstyle (0.0.28) is built
against Checkstyle 8.32 which does not include support for language
features such as text blocks. Support for text blocks was added in
Checkstyle 8.36.

In addition, there is a binary compatibility issue between
spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot
use Checkstyle 8.42 or higher.

In this commit, we therefore upgrade to spring-javaformat-checkstyle
0.0.28 and downgrade to Checkstyle 8.41.

This change is being applied to `5.3.x` as well as `main` in order to
benefit from the enhanced checking provided in more recent versions of
Checkstyle.

Closes gh-27481

build.gradle

@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.45.1"
+		toolVersion = "8.41"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
@@ -362,7 +362,8 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.15")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.28")
+		checkstyle("com.puppycrawl.tools:checkstyle:8.41")
 	}
 
 	ext.javadocLinks = [

spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -146,7 +146,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 
 	@Override
 	public String toString() {
-		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + methodName;
+		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + this.methodName;
 	}
 
 }

spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.aop.support;
 
 import org.junit.jupiter.api.Test;
@@ -29,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Rob Harrop
  * @author Rick Evans
  */
-public class ClassUtilsTests {
+class ClassUtilsTests {
 
 	@Test
-	public void getShortNameForCglibClass() {
+	void getShortNameForCglibClass() {
 		TestBean tb = new TestBean();
 		ProxyFactory pf = new ProxyFactory();
 		pf.setTarget(tb);
@@ -41,4 +42,5 @@ public class ClassUtilsTests {
 		String className = ClassUtils.getShortName(proxy.getClass());
 		assertThat(className).as("Class name did not match").isEqualTo("TestBean");
 	}
+
 }

spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.aspectj;
 
 /**
- * Marker interface for domain object that need DI through aspects.
+ * Marker interface for domain objects that need DI through aspects.
  *
  * @author Ramnivas Laddad
  * @since 2.5
  */
 public interface ConfigurableObject {
-
 }

spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
@@ -29,4 +30,5 @@ public class ClassWithPrivateAnnotatedMember {
 
 	@Transactional
 	private void doInTransaction() {}
+
 }

spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
@@ -29,4 +30,5 @@ public class ClassWithProtectedAnnotatedMember {
 
 	@Transactional
 	protected void doInTransaction() {}
+
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -27,4 +28,5 @@ public class CustomCallbackBean {
 	public void destroy() {
 		System.setProperty("security.destroy", "true");
 	}
+
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -26,4 +27,5 @@ public class DestroyBean implements DisposableBean {
 	public void destroy() throws Exception {
 		System.setProperty("security.destroy", "true");
 	}
+
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -33,4 +34,5 @@ public class FactoryBean {
 		System.getProperties();
 		return new Object();
 	}
+
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 import org.springframework.beans.factory.InitializingBean;
@@ -26,4 +27,5 @@ public class InitBean implements InitializingBean {
 	public void afterPropertiesSet() throws Exception {
 		System.getProperties();
 	}
+
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -27,4 +28,5 @@ public class PropertyBean {
 	public void setProperty(Object property) {
 
 	}
+
 }

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.testfixture.beans;
 
 /**
@@ -65,4 +66,5 @@ public class DummyBean {
 	public TestBean getSpouse() {
 		return spouse;
 	}
+
 }

spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.format;
 
 import org.springframework.core.convert.converter.Converter;

spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java

@@ -171,7 +171,6 @@ public final class CronExpression {
 	 * <li>{@code "@daily"} (or {@code "@midnight"}) to run once a day, i.e. {@code "0 0 0 * * *"},</li>
 	 * <li>{@code "@hourly"} to run once an hour, i.e. {@code "0 0 * * * *"}.</li>
 	 * </ul>
-	 *
 	 * @param expression the expression string to parse
 	 * @return the parsed {@code CronExpression} object
 	 * @throws IllegalArgumentException in the expression does not conform to

spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.aop.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;

spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.context.annotation;
 
 import org.junit.jupiter.api.Test;

spring-core/src/jmh/java/org/springframework/core/codec/StringDecoderBenchmark.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.codec;
 
 import java.nio.charset.Charset;

spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java

@@ -573,7 +573,7 @@ final class TypeMappedAnnotation<A extends Annotation> extends AbstractMergedAnn
 		}
 		if (this.source != null) {
 			if (this.source instanceof Class) {
-				return ((Class<?>) source).getClassLoader();
+				return ((Class<?>) this.source).getClassLoader();
 			}
 			if (this.source instanceof Member) {
 				((Member) this.source).getDeclaringClass().getClassLoader();

spring-core/src/main/java/org/springframework/core/codec/DecodingException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.codec;
 
 import org.springframework.lang.Nullable;

spring-core/src/main/java/org/springframework/core/codec/EncodingException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.codec;
 
 import org.springframework.lang.Nullable;

spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java

@@ -138,7 +138,6 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		customizePropertySources(propertySources);
 	}
 
-
 	/**
 	 * Factory method used to create the {@link ConfigurablePropertyResolver}
 	 * instance used by the Environment.
@@ -168,6 +167,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * sources using {@link MutablePropertySources#addLast(PropertySource)} such that
 	 * further subclasses may call {@code super.customizePropertySources()} with
 	 * predictable results. For example:
+	 *
 	 * <pre class="code">
 	 * public class Level1Environment extends AbstractEnvironment {
 	 *     &#064;Override
@@ -187,11 +187,13 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 *     }
 	 * }
 	 * </pre>
-	 * In this arrangement, properties will be resolved against sources A, B, C, D in that
+	 *
+	 * <p>In this arrangement, properties will be resolved against sources A, B, C, D in that
 	 * order. That is to say that property source "A" has precedence over property source
 	 * "D". If the {@code Level2Environment} subclass wished to give property sources C
 	 * and D higher precedence than A and B, it could simply call
 	 * {@code super.customizePropertySources} after, rather than before adding its own:
+	 *
 	 * <pre class="code">
 	 * public class Level2Environment extends Level1Environment {
 	 *     &#064;Override
@@ -202,25 +204,24 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 *     }
 	 * }
 	 * </pre>
-	 * The search order is now C, D, A, B as desired.
 	 *
-	 * <p>Beyond these recommendations, subclasses may use any of the {@code add&#42;},
+	 * <p>The search order is now C, D, A, B as desired.
+	 * <p>Beyond these recommendations, subclasses may use any of the {@code add*},
 	 * {@code remove}, or {@code replace} methods exposed by {@link MutablePropertySources}
 	 * in order to create the exact arrangement of property sources desired.
-	 *
 	 * <p>The base implementation registers no property sources.
-	 *
 	 * <p>Note that clients of any {@link ConfigurableEnvironment} may further customize
 	 * property sources via the {@link #getPropertySources()} accessor, typically within
 	 * an {@link org.springframework.context.ApplicationContextInitializer
 	 * ApplicationContextInitializer}. For example:
+	 *
 	 * <pre class="code">
 	 * ConfigurableEnvironment env = new StandardEnvironment();
 	 * env.getPropertySources().addLast(new PropertySourceX(...));
 	 * </pre>
 	 *
 	 * <h2>A warning about instance variable access</h2>
-	 * Instance variables declared in subclasses and having default initial values should
+	 * <p>Instance variables declared in subclasses and having default initial values should
 	 * <em>not</em> be accessed from within this method. Due to Java object creation
 	 * lifecycle constraints, any initial value will not yet be assigned when this
 	 * callback is invoked by the {@link #AbstractEnvironment()} constructor, which may
@@ -229,7 +230,6 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * property source manipulation and instance variable access directly within the
 	 * subclass constructor. Note that <em>assigning</em> values to instance variables is
 	 * not problematic; it is only attempting to read default values that must be avoided.
-	 *
 	 * @see MutablePropertySources
 	 * @see PropertySourcesPropertyResolver
 	 * @see org.springframework.context.ApplicationContextInitializer

spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferLimitException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.io.buffer;
 
 /**

spring-core/src/main/java/org/springframework/core/io/buffer/LimitedDataBufferList.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.io.buffer;
 
 import java.util.ArrayList;

spring-core/src/test/java/org/springframework/core/SpringCoreBlockHoundIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core;
 
 import java.lang.reflect.Method;

spring-core/src/test/java/org/springframework/core/io/buffer/LimitedDataBufferListTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.core.io.buffer;
 
 import java.nio.charset.StandardCharsets;

spring-core/src/test/java/org/springframework/util/concurrent/MonoToListenableFutureAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.util.concurrent;
 
 import java.time.Duration;

spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.expression.spel;
 
 import java.math.BigDecimal;
@@ -31,10 +32,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Andy Clement
  * @author Giovanni Dall'Oglio Risso
  */
-public class DefaultComparatorUnitTests {
+class DefaultComparatorUnitTests {
 
 	@Test
-	public void testPrimitives() throws EvaluationException {
+	void testPrimitives() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		// primitive int
 		assertThat(comparator.compare(1, 2) < 0).isTrue();
@@ -63,7 +64,7 @@ public class DefaultComparatorUnitTests {
 	}
 
 	@Test
-	public void testNonPrimitiveNumbers() throws EvaluationException {
+	void testNonPrimitiveNumbers() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 
 		BigDecimal bdOne = new BigDecimal("1");
@@ -92,7 +93,7 @@ public class DefaultComparatorUnitTests {
 	}
 
 	@Test
-	public void testNulls() throws EvaluationException {
+	void testNulls() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		assertThat(comparator.compare(null,"abc")<0).isTrue();
 		assertThat(comparator.compare(null,null)==0).isTrue();
@@ -100,7 +101,7 @@ public class DefaultComparatorUnitTests {
 	}
 
 	@Test
-	public void testObjects() throws EvaluationException {
+	void testObjects() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		assertThat(comparator.compare("a","a")==0).isTrue();
 		assertThat(comparator.compare("a","b")<0).isTrue();
@@ -108,7 +109,7 @@ public class DefaultComparatorUnitTests {
 	}
 
 	@Test
-	public void testCanCompare() throws EvaluationException {
+	void testCanCompare() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		assertThat(comparator.canCompare(null,1)).isTrue();
 		assertThat(comparator.canCompare(1,null)).isTrue();

spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.expression.spel;
 
 import java.util.List;
@@ -26,14 +27,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
- * Unit tests for type comparison
+ * Unit tests for type comparison.
  *
  * @author Andy Clement
  */
-public class StandardTypeLocatorTests {
+class StandardTypeLocatorTests {
 
 	@Test
-	public void testImports() throws EvaluationException {
+	void testImports() throws EvaluationException {
 		StandardTypeLocator locator = new StandardTypeLocator();
 		assertThat(locator.findType("java.lang.Integer")).isEqualTo(Integer.class);
 		assertThat(locator.findType("java.lang.String")).isEqualTo(String.class);
@@ -45,7 +46,7 @@ public class StandardTypeLocatorTests {
 
 		assertThat(locator.findType("Boolean")).isEqualTo(Boolean.class);
 		// currently does not know about java.util by default
-//		assertEquals(java.util.List.class,locator.findType("List"));
+		// assertEquals(java.util.List.class,locator.findType("List"));
 
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
 				locator.findType("URL"))

spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-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.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.expression.spel.testdata;
 
 /**
- *
  * @author Andy Clement
  * @since 4.1.2
  */
@@ -35,4 +35,5 @@ public class PersonInOtherPackage {
 	public void setAge(int age) {
 		this.age = age;
 	}
+
 }

spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -68,7 +68,6 @@ public interface CallableStatementCallback<T> {
 	 * a domain object or a collection of domain objects. A thrown RuntimeException
 	 * is treated as application exception: it gets propagated to the caller of
 	 * the template.
-	 *
 	 * @param cs active JDBC CallableStatement
 	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by a JDBC method, to be auto-converted

spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.jms.core.support;
 
 import java.util.ArrayList;
@@ -31,10 +32,10 @@ import static org.mockito.Mockito.mock;
  * @author Mark Pollack
  * @since 24.9.2004
  */
-public class JmsGatewaySupportTests {
+class JmsGatewaySupportTests {
 
 	@Test
-	public void testJmsGatewaySupportWithConnectionFactory() throws Exception {
+	void testJmsGatewaySupportWithConnectionFactory() throws Exception {
 		ConnectionFactory mockConnectionFactory = mock(ConnectionFactory.class);
 		final List<String> test = new ArrayList<>(1);
 		JmsGatewaySupport gateway = new JmsGatewaySupport() {
@@ -51,7 +52,7 @@ public class JmsGatewaySupportTests {
 	}
 
 	@Test
-	public void testJmsGatewaySupportWithJmsTemplate() throws Exception {
+	void testJmsGatewaySupportWithJmsTemplate() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		final List<String> test = new ArrayList<>(1);
 		JmsGatewaySupport gateway = new JmsGatewaySupport() {

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandler.java

@@ -208,7 +208,6 @@ public class MessageMappingMessageHandler extends AbstractMethodMessageHandler<C
 	 *     // delegate all methods
 	 * }
 	 * </pre>
-	 *
 	 * @param bean the bean to check for {@code @MessageExceptionHandler} methods
 	 * @since 5.3.5
 	 */

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolver.java

@@ -146,11 +146,9 @@ public class PayloadMethodArgumentResolver implements HandlerMethodArgumentResol
 	 * {@code @javax.validation.Valid} or
 	 * {@link org.springframework.validation.annotation.Validated}. Validation
 	 * failure results in an {@link MethodArgumentNotValidException}.
-	 *
 	 * @param parameter the target method argument that we are decoding to
 	 * @param message the message from which the content was extracted
 	 * @return a Mono with the result of argument resolution
-	 *
 	 * @see #extractContent(MethodParameter, Message)
 	 * @see #getMimeType(Message)
 	 */

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataEncoder.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.ArrayList;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MetadataExtractor.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.Map;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketConnectorConfigurer.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import io.rsocket.core.RSocketConnector;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket.annotation.support;
 
 import java.util.Arrays;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java

@@ -471,7 +471,6 @@ public class RSocketMessageHandler extends MessageMappingMessageHandler {
 	 * for more advanced scenarios, e.g. discovering handlers through a custom
 	 * stereotype annotation, consider declaring {@code RSocketMessageHandler}
 	 * as a bean, and then obtain the responder from it.
-	 *
 	 * @param strategies the strategies to set on the created
 	 * {@code RSocketMessageHandler}
 	 * @param candidateHandlers a list of Objects and/or Classes with annotated

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -797,7 +797,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler
 		 * @since 5.3
 		 */
 		void updateClientSendMessageCount(long now) {
-			if (this.clientSendMessageCount != null && this.clientSendInterval > (now - clientSendMessageTimestamp)) {
+			if (this.clientSendMessageCount != null && this.clientSendInterval > (now - this.clientSendMessageTimestamp)) {
 				this.clientSendMessageCount.set(0);
 				this.clientSendMessageTimestamp = now;
 			}

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompConversionException.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.stomp;
 
 import org.springframework.core.NestedRuntimeException;

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompReactorNettyCodec.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.stomp;
 
 import java.nio.ByteBuffer;

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompTcpConnectionHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.stomp;
 
 import org.springframework.messaging.simp.SimpMessageHeaderAccessor;

spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.simp.user;
 
 /**

spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyCodec.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.tcp.reactor;
 
 import java.util.Collection;

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/MessagingPredicates.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation;
 
 import java.util.function.Predicate;

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation.reactive;
 
 import java.time.Duration;

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation.reactive;
 
 import java.nio.charset.StandardCharsets;

spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation;
 
 import java.lang.reflect.Method;

spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/EncoderMethodReturnValueHandlerTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.Collections;

spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/TestEncoderMethodReturnValueHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.List;
@@ -65,4 +66,5 @@ public class TestEncoderMethodReturnValueHandler extends AbstractEncoderMethodRe
 		this.encodedContent = Flux.empty();
 		return Mono.empty();
 	}
+
 }

spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.nio.charset.StandardCharsets;

spring-messaging/src/test/java/org/springframework/messaging/rsocket/LeakAwareNettyDataBufferFactory.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;

spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;

spring-messaging/src/test/java/org/springframework/messaging/rsocket/PayloadUtilsTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.nio.charset.StandardCharsets;

spring-messaging/src/test/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandlerTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket.annotation.support;
 
 import java.util.Arrays;

spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java

@@ -79,7 +79,6 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
 	 * <p>The default write handler consumes and caches the request body so it
 	 * may be accessed subsequently, e.g. in test assertions. Use this property
 	 * when the request body is an infinite stream.
-	 *
 	 * @param writeHandler the write handler to use returning {@code Mono<Void>}
 	 * when the body has been "written" (i.e. consumed).
 	 */

spring-test/src/main/java/org/springframework/test/context/support/PropertyProvider.java

@@ -32,7 +32,6 @@ public interface PropertyProvider {
 
 	/**
 	 * Get the value of the named property.
-	 *
 	 * @param name the name of the property to retrieve
 	 * @return the value of the property or {@code null} if not found
 	 */

spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java

@@ -44,10 +44,8 @@ public abstract class TestConstructorUtils {
 	/**
 	 * Determine if the supplied executable for the given test class is an
 	 * autowirable constructor.
-	 *
 	 * <p>This method delegates to {@link #isAutowirableConstructor(Executable, Class, PropertyProvider)}
 	 * will a value of {@code null} for the fallback {@link PropertyProvider}.
-	 *
 	 * @param executable an executable for the test class
 	 * @param testClass the test class
 	 * @return {@code true} if the executable is an autowirable constructor
@@ -60,10 +58,8 @@ public abstract class TestConstructorUtils {
 	/**
 	 * Determine if the supplied constructor for the given test class is
 	 * autowirable.
-	 *
 	 * <p>This method delegates to {@link #isAutowirableConstructor(Constructor, Class, PropertyProvider)}
 	 * will a value of {@code null} for the fallback {@link PropertyProvider}.
-	 *
 	 * @param constructor a constructor for the test class
 	 * @param testClass the test class
 	 * @return {@code true} if the constructor is autowirable
@@ -76,10 +72,8 @@ public abstract class TestConstructorUtils {
 	/**
 	 * Determine if the supplied executable for the given test class is an
 	 * autowirable constructor.
-	 *
 	 * <p>This method delegates to {@link #isAutowirableConstructor(Constructor, Class, PropertyProvider)}
 	 * if the supplied executable is a constructor and otherwise returns {@code false}.
-	 *
 	 * @param executable an executable for the test class
 	 * @param testClass the test class
 	 * @param fallbackPropertyProvider fallback property provider used to look up
@@ -114,7 +108,6 @@ public abstract class TestConstructorUtils {
 	 * {@link PropertyProvider} (see
 	 * {@link TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME}).</li>
 	 * </ol>
-	 *
 	 * @param constructor a constructor for the test class
 	 * @param testClass the test class
 	 * @param fallbackPropertyProvider fallback property provider used to look up

spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java

@@ -203,7 +203,6 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * Delegates to the configured {@link TestContextManager} to
 	 * {@linkplain TestContextManager#afterTestMethod(Object, Method, Throwable)
 	 * post-process} the test method after the actual test has executed.
-	 *
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
 	 * @throws Exception allows all exceptions to propagate

spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java

@@ -52,7 +52,6 @@ public abstract class TestContextResourceUtils {
 
 	/**
 	 * Convert the supplied paths to classpath resource paths.
-	 *
 	 * <p>Delegates to {@link #convertToClasspathResourcePaths(Class, boolean, String...)}
 	 * with {@code false} supplied for the {@code preservePlaceholders} flag.
 	 * @param clazz the class with which the paths are associated

spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java

@@ -42,7 +42,6 @@ public interface RequestExpectationManager {
 	 * used to add more expectations and define a response.
 	 * <p>This is a delegate for
 	 * {@link MockRestServiceServer#expect(ExpectedCount, RequestMatcher)}.
-	 *
 	 * @param requestMatcher a request expectation
 	 * @return for setting up further expectations and define a response
 	 * @see MockRestServiceServer#expect(RequestMatcher)

spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerClientHttpResponse.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import org.springframework.http.client.reactive.ClientHttpResponse;

spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java

@@ -862,7 +862,6 @@ public interface WebTestClient {
 		/**
 		 * Exit the chained flow in order to consume the response body
 		 * externally, e.g. via {@link reactor.test.StepVerifier}.
-		 *
 		 * <p>Note that when {@code Void.class} is passed in, the response body
 		 * is consumed and released. If no content is expected, then consider
 		 * using {@code .expectBody().isEmpty()} instead which asserts that

spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java

@@ -47,7 +47,6 @@ public interface ResultActions {
 	 *   .andExpect(content().contentType(MediaType.APPLICATION_JSON))
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
-	 *
 	 * @see #andExpectAll(ResultMatcher...)
 	 */
 	ResultActions andExpect(ResultMatcher matcher) throws Exception;
@@ -78,7 +77,6 @@ public interface ResultActions {
 	 *       jsonPath("$.person.name").value("Jason")
 	 *   );
 	 * </pre>
-	 *
 	 * @since 5.3.10
 	 * @see #andExpect(ResultMatcher)
 	 */
@@ -105,7 +103,6 @@ public interface ResultActions {
 
 	/**
 	 * Return the result of the executed request for direct access to the results.
-	 *
 	 * @return the result of the request
 	 */
 	MvcResult andReturn();

spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java

@@ -49,7 +49,6 @@ public interface ResultHandler {
 
 	/**
 	 * Perform an action on the given result.
-	 *
 	 * @param result the result of the executed request
 	 * @throws Exception if a failure occurs
 	 */

spring-test/src/main/java/org/springframework/test/web/servlet/SmartRequestBuilder.java

@@ -31,7 +31,6 @@ public interface SmartRequestBuilder extends RequestBuilder {
 	/**
 	 * Apply request post processing. Typically that means invoking one or more
 	 * {@link org.springframework.test.web.servlet.request.RequestPostProcessor org.springframework.test.web.servlet.request.RequestPostProcessors}.
-	 *
 	 * @param request the request to initialize
 	 * @return the request to use, either the one passed in or a wrapped one
 	 */

spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import javax.servlet.Filter;

spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;

spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import java.io.StringWriter;

spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import java.util.function.Supplier;
@@ -112,7 +113,6 @@ public interface MockMvcWebTestClient {
 	/**
 	 * This method can be used to apply further assertions on a given
 	 * {@link ExchangeResult} based the state of the server response.
-	 *
 	 * <p>Normally {@link WebTestClient} is used to assert the client response
 	 * including HTTP status, headers, and body. That is all that is available
 	 * when making a live request over HTTP. However when the server is
@@ -134,7 +134,6 @@ public interface MockMvcWebTestClient {
 	 * 		.andExpect(flash().attributeCount(1))
 	 * 		.andExpect(flash().attribute("message", "success!"));
 	 * </pre>
-	 *
 	 * <p>Note: this method works only if the {@link WebTestClient} used to
 	 * perform the request was initialized through one of bind method in this
 	 * class, and therefore requests are handled by {@link MockMvc}.

spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpec.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.client;
 
 import java.util.function.Supplier;

spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.samples;
 
 import java.io.IOException;

spring-test/src/test/java/org/springframework/test/web/reactive/server/ApplicationContextSpecTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import org.junit.jupiter.api.Test;

spring-test/src/test/java/org/springframework/test/web/reactive/server/CookieAssertionTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import java.net.URI;

spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultRouterFunctionSpecTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import org.junit.jupiter.api.Test;

spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerSpecTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import java.nio.charset.StandardCharsets;

spring-test/src/test/java/org/springframework/test/web/reactive/server/MockServerTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server;
 
 import java.util.Arrays;

spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
 import java.security.Principal;

spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/GlobalEntityResultConsumerTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
 import java.nio.charset.StandardCharsets;

spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/Person.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
 import javax.xml.bind.annotation.XmlRootElement;

spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.result;
 
 import java.time.ZoneId;

spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/AsyncTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import java.nio.charset.StandardCharsets;

spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ReactiveReturnTypeTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import java.time.Duration;

spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/RequestParameterTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import org.junit.jupiter.api.Test;

spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/SseTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.client.standalone;
 
 import org.junit.jupiter.api.Test;

spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ReactiveReturnTypeTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.standalone;
 
 import java.time.Duration;

spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.samples.standalone;
 
 import org.junit.jupiter.api.Test;

spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -81,7 +81,7 @@ final class SimpleBufferingAsyncClientHttpRequest extends AbstractBufferingAsync
 			if (getMethod() == HttpMethod.DELETE && bufferedOutput.length == 0) {
 				this.connection.setDoOutput(false);
 			}
-			if (this.connection.getDoOutput() && outputStreaming) {
+			if (this.connection.getDoOutput() && this.outputStreaming) {
 				this.connection.setFixedLengthStreamingMode(bufferedOutput.length);
 			}
 			this.connection.connect();

spring-web/src/main/java/org/springframework/http/client/reactive/JettyResourceFactory.java

@@ -132,7 +132,7 @@ public class JettyResourceFactory implements InitializingBean, DisposableBean {
 		if (this.byteBufferPool == null) {
 			this.byteBufferPool = new MappedByteBufferPool(2048,
 					this.executor instanceof ThreadPool.SizedThreadPool
-							? ((ThreadPool.SizedThreadPool) executor).getMaxThreads() / 2
+							? ((ThreadPool.SizedThreadPool) this.executor).getMaxThreads() / 2
 							: ProcessorUtils.availableProcessors() * 2);
 		}
 		if (this.scheduler == null) {

spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartWriterSupport.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.codec.multipart;
 
 import java.nio.charset.Charset;

spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -265,7 +265,6 @@ public class ProtobufDecoder extends ProtobufCodecSupport implements Decoder<Mes
 		 * Parse message size as a varint from the input stream, updating {@code messageBytesToRead} and
 		 * {@code offset} fields if needed to allow processing of upcoming chunks.
 		 * Inspired from {@link CodedInputStream#readRawVarint32(int, java.io.InputStream)}
-		 *
 		 * @return {code true} when the message size is parsed successfully, {code false} when the message size is
 		 * truncated
 		 * @see <a href="https://developers.google.com/protocol-buffers/docs/encoding#varints">Base 128 Varints</a>
@@ -290,7 +289,7 @@ public class ProtobufDecoder extends ProtobufCodecSupport implements Decoder<Mes
 						return false;
 					}
 					final int b = input.read();
-					this.messageBytesToRead |= (b & 0x7f) << offset;
+					this.messageBytesToRead |= (b & 0x7f) << this.offset;
 					if ((b & 0x80) == 0) {
 						this.offset = 0;
 						return true;

spring-web/src/main/java/org/springframework/http/server/RequestPath.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server;
 
 import java.net.URI;

spring-web/src/main/java/org/springframework/http/server/reactive/ServerHttpResponseDecorator.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server.reactive;
 
 import java.util.function.Supplier;

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.bind;
 
 /**

spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java

@@ -169,7 +169,6 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
 	 * {@link HttpClientErrorException#create} for errors in the 4xx range, to
 	 * {@link HttpServerErrorException#create} for errors in the 5xx range,
 	 * or otherwise raises {@link UnknownHttpStatusCodeException}.
-	 *
 	 * @since 5.0
 	 * @see HttpClientErrorException#create
 	 * @see HttpServerErrorException#create

spring-web/src/main/java/org/springframework/web/client/RestOperations.java

@@ -448,7 +448,6 @@ public interface RestOperations {
 	/**
 	 * Delete the resources at the specified URI.
 	 * <p>URI Template variables are expanded using the given map.
-	 *
 	 * @param url the URL
 	 * @param uriVariables the variables to expand the template
 	 */

spring-web/src/main/java/org/springframework/web/context/request/AsyncWebRequestInterceptor.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request;
 
 /**
@@ -41,7 +42,6 @@ public interface AsyncWebRequestInterceptor extends WebRequestInterceptor{
 	/**
 	 * Called instead of {@code postHandle} and {@code afterCompletion}, when the
 	 * handler started handling the request concurrently.
-	 *
 	 * @param request the current request
 	 */
 	void afterConcurrentHandlingStarted(WebRequest request);

spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java

@@ -63,7 +63,6 @@ public abstract class CorsUtils {
 	 * {@code "Forwarded"} and {@code "X-Forwarded-*"} headers that specify the
 	 * client-originated address. Consider using the {@code ForwardedHeaderFilter}
 	 * to extract and use, or to discard such headers.
-	 *
 	 * @return {@code true} if the request is a same-origin one, {@code false} in case
 	 * of a cross-origin request
 	 * @deprecated as of 5.2, same-origin checks are performed directly by {@link #isCorsRequest}

spring-web/src/main/java/org/springframework/web/cors/reactive/PreFlightRequestWebFilter.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.cors.reactive;
 
 import reactor.core.publisher.Mono;

spring-web/src/main/java/org/springframework/web/filter/RelativeRedirectResponseWrapper.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.filter;
 
 import javax.servlet.http.HttpServletResponse;