Polishing

Author: jhoeller

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

@@ -780,7 +780,7 @@ private static MergedAnnotations getRepeatableAnnotations(AnnotatedElement eleme
 		if (containerType == null) {
 			// Invoke RepeatableContainers.of() in order to adhere to the contract of
 			// getMergedRepeatableAnnotations() which states that an IllegalArgumentException
-			// will be thrown if the the container cannot be resolved.
+			// will be thrown if the container cannot be resolved.
 			//
 			// In any case, we use standardRepeatables() in order to support repeatable
 			// annotations on other types of repeatable annotations (i.e., nested repeatable
@@ -807,7 +807,7 @@ private static MergedAnnotations findRepeatableAnnotations(AnnotatedElement elem
 		if (containerType == null) {
 			// Invoke RepeatableContainers.of() in order to adhere to the contract of
 			// findMergedRepeatableAnnotations() which states that an IllegalArgumentException
-			// will be thrown if the the container cannot be resolved.
+			// will be thrown if the container cannot be resolved.
 			//
 			// In any case, we use standardRepeatables() in order to support repeatable
 			// annotations on other types of repeatable annotations (i.e., nested repeatable
@@ -829,8 +829,7 @@ private static MultiValueMap<String, Object> nullIfEmpty(MultiValueMap<String, O
 	}
 
 	private static <A extends Annotation> Comparator<MergedAnnotation<A>> highAggregateIndexesFirst() {
-		return Comparator.<MergedAnnotation<A>> comparingInt(
-				MergedAnnotation::getAggregateIndex).reversed();
+		return Comparator.<MergedAnnotation<A>> comparingInt(MergedAnnotation::getAggregateIndex).reversed();
 	}
 
 	@Nullable
@@ -840,13 +839,12 @@ private static AnnotationAttributes getAnnotationAttributes(MergedAnnotation<?>
 		if (!annotation.isPresent()) {
 			return null;
 		}
-		return annotation.asAnnotationAttributes(
-				Adapt.values(classValuesAsString, nestedAnnotationsAsMap));
+		return annotation.asAnnotationAttributes(Adapt.values(classValuesAsString, nestedAnnotationsAsMap));
 	}
 
 
 	/**
-	 * Adapted {@link AnnotatedElement} that hold specific annotations.
+	 * Adapted {@link AnnotatedElement} that holds specific annotations.
 	 */
 	private static class AnnotatedElementForAnnotations implements AnnotatedElement {
 

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -77,7 +77,7 @@
  * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale}
  * or {@link #setPreferredLocales}.
  *
- * <p>As of Spring Framework 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
+ * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -53,7 +53,7 @@
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface.
  *
- * <p>As of Spring Framework 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
+ * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson

spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -78,7 +78,7 @@
  * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale}
  * or {@link #setPreferredLocales}.
  *
- * <p>As of Spring Framework 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
+ * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson

spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java

@@ -53,7 +53,7 @@
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface.
  *
- * <p>As of Spring Framework 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
+ * <p>As of Spring 5.0, this set of mocks is designed on a Servlet 4.0 baseline.
  *
  * @author Juergen Hoeller
  * @author Rod Johnson

spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -73,7 +73,7 @@ public abstract class AbstractTyrusRequestUpgradeStrategy extends AbstractStanda
 
 	private static final Constructor<?> constructor;
 
-	private static boolean constructorWithBooleanArgument;
+	private static final boolean constructorWithBooleanArgument;
 
 	private static final Method registerMethod;