From ac722772588633508690940ca40b928c81f90a63 Mon Sep 17 00:00:00 2001
From: Sanghyuk Jung <sanghyuk.jung@navercorp.com>
Date: Thu, 19 Aug 2021 01:17:42 +0900
Subject: [PATCH 1/2] Fix duplicate "the" in Javadoc and XSD

See gh-27291
---
 .../java/org/springframework/asm/RecordComponentWriter.java | 2 +-
 .../java/org/springframework/cglib/core/KeyFactory.java     | 2 +-
 .../java/org/springframework/util/ConcurrentLruCache.java   | 2 +-
 .../simp/config/AbstractMessageBrokerConfiguration.java     | 2 +-
 .../r2dbc/core/AbstractDatabaseClientIntegrationTests.java  | 2 +-
 ...AbstractTransactionalDatabaseClientIntegrationTests.java | 2 +-
 .../springframework/web/reactive/socket/HandshakeInfo.java  | 2 +-
 .../web/servlet/mvc/condition/PatternsRequestCondition.java | 6 +++---
 .../web/servlet/mvc/method/RequestMappingInfo.java          | 2 +-
 .../method/annotation/ServletInvocableHandlerMethod.java    | 2 +-
 .../socket/config/annotation/SockJsServiceRegistration.java | 2 +-
 .../web/socket/sockjs/support/AbstractSockJsService.java    | 2 +-
 .../springframework/web/socket/config/spring-websocket.xsd  | 4 ++--
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
index bd007ac26d..c36d2054fc 100644
--- a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
+++ b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
@@ -37,7 +37,7 @@ final class RecordComponentWriter extends RecordComponentVisitor {
   /** The name_index field of the Record attribute. */
   private final int nameIndex;
 
-  /** The descriptor_index field of the the Record attribute. */
+  /** The descriptor_index field of the Record attribute. */
   private final int descriptorIndex;
 
   /**
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
index e1503b85c1..efcbc4c044 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
@@ -28,7 +28,7 @@ import org.springframework.cglib.core.internal.CustomizerRegistry;
 
 /**
  * Generates classes to handle multi-valued keys, for use in things such as Maps and Sets.
- * Code for <code>equals</code> and <code>hashCode</code> methods follow the
+ * Code for <code>equals</code> and <code>hashCode</code> methods follow
  * the rules laid out in <i>Effective Java</i> by Joshua Bloch.
  * <p>
  * To generate a <code>KeyFactory</code>, you need to supply an interface which
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
index 2f1f2e0896..ceee603e17 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
@@ -174,7 +174,7 @@ public class ConcurrentLruCache<K, V> {
 	}
 
 	/**
-	 * Return the the maximum number of entries in the cache
+	 * Return the maximum number of entries in the cache
 	 * (0 indicates no caching, always generating a new value).
 	 * @see #size()
 	 */
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
index df9b5320fb..b2e180686f 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -82,7 +82,7 @@ import org.springframework.validation.Validator;
  * <li>{@link #userDestinationMessageHandler}</li>
  * </ul>
  *
- * <p>{@link #brokerChannel} delivers messages from within the application to the
+ * <p>{@link #brokerChannel} delivers messages from within the application to
  * the respective message handlers. {@link #brokerMessagingTemplate} can be injected
  * into any application component to send messages.
  *
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
index dff746cd59..d315a10290 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
@@ -59,7 +59,7 @@ public abstract class AbstractDatabaseClientIntegrationTests {
 	protected abstract ConnectionFactory createConnectionFactory();
 
 	/**
-	 * Return the the CREATE TABLE statement for table {@code legoset} with the following
+	 * Return the CREATE TABLE statement for table {@code legoset} with the following
 	 * three columns:
 	 * <ul>
 	 * <li>id integer (primary key), not null</li>
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
index 1d90bc7a45..acebde10d4 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
@@ -89,7 +89,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests  {
 	protected abstract ConnectionFactory createConnectionFactory();
 
 	/**
-	 * Return the the CREATE TABLE statement for table {@code legoset} with the following three columns:
+	 * Return the CREATE TABLE statement for table {@code legoset} with the following three columns:
 	 * <ul>
 	 * <li>id integer (primary key), not null</li>
 	 * <li>name varchar(255), nullable</li>
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
index 657a20408c..0bef75a832 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
@@ -77,7 +77,7 @@ public class HandshakeInfo {
 	}
 
 	/**
-	 * Constructor targeting server-side use with extra information such as the
+	 * Constructor targeting server-side use with extra information such as
 	 * the remote address, attributes, and a log prefix.
 	 * @param uri the endpoint URL
 	 * @param headers server request headers
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index d04b26942f..875002618e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -87,7 +87,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
 	 * Variant of {@link #PatternsRequestCondition(String...)} with a
 	 * {@link UrlPathHelper} and a {@link PathMatcher}, and whether to match
 	 * trailing slashes.
-	 * <p>As of 5.3 the the path is obtained through the static method
+	 * <p>As of 5.3 the path is obtained through the static method
 	 * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
 	 * does not need to be passed in.
 	 * @since 5.2.4
@@ -105,7 +105,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
 	 * Variant of {@link #PatternsRequestCondition(String...)} with a
 	 * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
 	 * with suffixes and trailing slashes.
-	 * <p>As of 5.3 the the path is obtained through the static method
+	 * <p>As of 5.3 the path is obtained through the static method
 	 * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
 	 * does not need to be passed in.
 	 * @deprecated as of 5.2.4. See class-level note in
@@ -123,7 +123,7 @@ public class PatternsRequestCondition extends AbstractRequestCondition<PatternsR
 	 * Variant of {@link #PatternsRequestCondition(String...)} with a
 	 * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
 	 * with suffixes and trailing slashes, along with specific extensions.
-	 * <p>As of 5.3 the the path is obtained through the static method
+	 * <p>As of 5.3 the path is obtained through the static method
 	 * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
 	 * does not need to be passed in.
 	 * @deprecated as of 5.2.4. See class-level note in
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
index a0dadcd798..79622c3861 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -47,7 +47,7 @@ import org.springframework.web.util.pattern.PathPattern;
 import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
- * Request mapping information. A composite for the the following conditions:
+ * Request mapping information. A composite for the following conditions:
  * <ol>
  * <li>{@link PathPatternsRequestCondition} with parsed {@code PathPatterns} or
  * {@link PatternsRequestCondition} with String patterns via {@code PathMatcher}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index 8b2ba44f3e..1cc9d203ae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -194,7 +194,7 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
 	}
 
 	/**
-	 * Create a nested ServletInvocableHandlerMethod subclass that returns the
+	 * Create a nested ServletInvocableHandlerMethod subclass that returns
 	 * the given value (or raises an Exception if the value is one) rather than
 	 * actually invoking the controller method. This is useful when processing
 	 * async return values (e.g. Callable, DeferredResult, ListenableFuture).
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
index 0a49af7309..6cd9c30cbb 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
@@ -106,7 +106,7 @@ public class SockJsServiceRegistration {
 	 * also be set to point to a URL served by the application.
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
 	 * must be relative to the iframe URL. For example assuming a SockJS endpoint
-	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
+	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html",
 	 * the relative URL must start with "../../" to traverse up to the location
 	 * above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	 * traversal may be needed.
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
index 682ac8dbcf..e3a9419371 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -153,7 +153,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
 	 * However, it can also be set to point to a URL served by the application.
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
 	 * must be relative to the iframe URL. For example assuming a SockJS endpoint
-	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
+	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
 	 * the relative URL must start with "../../" to traverse up to the location
 	 * above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	 * traversal may be needed.
diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
index 1870ad7ee5..271332f5cb 100644
--- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
+++ b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
@@ -141,8 +141,8 @@
 
 	Note that it's possible to specify a relative URL in which case the URL
 	must be relative to the iframe URL. For example assuming a SockJS endpoint
-	mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
-	The relative URL must start with "../../" to traverse up to the location
+	mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
+	the relative URL must start with "../../" to traverse up to the location
 	above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	traversal may be needed.
                 ]]></xsd:documentation>

From af6fd6c303252a2bf83770419bfd829849d12e70 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 19 Aug 2021 08:54:15 +0200
Subject: [PATCH 2/2] Polish "Fix duplicate "the" in Javadoc and XSD"

See gh-27291
---
 .../java/org/springframework/asm/RecordComponentWriter.java   | 2 +-
 .../main/java/org/springframework/cglib/core/KeyFactory.java  | 2 +-
 .../java/org/springframework/util/ConcurrentLruCache.java     | 2 +-
 .../simp/config/AbstractMessageBrokerConfiguration.java       | 4 ++--
 .../web/servlet/mvc/condition/PatternsRequestCondition.java   | 2 +-
 .../mvc/method/annotation/ServletInvocableHandlerMethod.java  | 4 ++--
 .../socket/config/annotation/SockJsServiceRegistration.java   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
index c36d2054fc..bd007ac26d 100644
--- a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
+++ b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
@@ -37,7 +37,7 @@ final class RecordComponentWriter extends RecordComponentVisitor {
   /** The name_index field of the Record attribute. */
   private final int nameIndex;
 
-  /** The descriptor_index field of the Record attribute. */
+  /** The descriptor_index field of the the Record attribute. */
   private final int descriptorIndex;
 
   /**
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
index efcbc4c044..e1503b85c1 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
@@ -28,7 +28,7 @@ import org.springframework.cglib.core.internal.CustomizerRegistry;
 
 /**
  * Generates classes to handle multi-valued keys, for use in things such as Maps and Sets.
- * Code for <code>equals</code> and <code>hashCode</code> methods follow
+ * Code for <code>equals</code> and <code>hashCode</code> methods follow the
  * the rules laid out in <i>Effective Java</i> by Joshua Bloch.
  * <p>
  * To generate a <code>KeyFactory</code>, you need to supply an interface which
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
index ceee603e17..1d99b4cd09 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.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.
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
index b2e180686f..fb4150ad7b 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -82,8 +82,8 @@ import org.springframework.validation.Validator;
  * <li>{@link #userDestinationMessageHandler}</li>
  * </ul>
  *
- * <p>{@link #brokerChannel} delivers messages from within the application to
- * the respective message handlers. {@link #brokerMessagingTemplate} can be injected
+ * <p>{@link #brokerChannel} delivers messages from within the application to the
+ * respective message handlers. {@link #brokerMessagingTemplate} can be injected
  * into any application component to send messages.
  *
  * <p>Subclasses are responsible for the parts of the configuration that feed messages
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index 875002618e..9539415ae3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index 1cc9d203ae..ae3473873d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -194,8 +194,8 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
 	}
 
 	/**
-	 * Create a nested ServletInvocableHandlerMethod subclass that returns
-	 * the given value (or raises an Exception if the value is one) rather than
+	 * Create a nested ServletInvocableHandlerMethod subclass that returns the
+	 * given value (or raises an Exception if the value is one) rather than
 	 * actually invoking the controller method. This is useful when processing
 	 * async return values (e.g. Callable, DeferredResult, ListenableFuture).
 	 */
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
index 6cd9c30cbb..edc4e568a8 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.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.
@@ -106,7 +106,7 @@ public class SockJsServiceRegistration {
 	 * also be set to point to a URL served by the application.
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
 	 * must be relative to the iframe URL. For example assuming a SockJS endpoint
-	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html",
+	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
 	 * the relative URL must start with "../../" to traverse up to the location
 	 * above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	 * traversal may be needed.