Merge pull request #26538 from izeye

* pr/26538:
  Update copyright of change file
  Polish

Closes gh-26538

Author: snicoll

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

@@ -187,7 +187,7 @@ public final void subscribe(Subscriber<? super Void> subscriber) {
 
 	/**
 	 * Invoked when an error happens while flushing.
-	 * <p>The default implementation cancels the upstream  write publisher and
+	 * <p>The default implementation cancels the upstream write publisher and
 	 * sends an onError downstream as the result of request handling.
 	 */
 	protected void flushingFailed(Throwable t) {

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

@@ -52,7 +52,7 @@ public interface ServerHttpRequest extends HttpRequest, ReactiveHttpInputMessage
 	 * not including the {@link #getQueryParams() query}.
 	 * <p>The returned path is sub-divided into a
 	 * {@link RequestPath#contextPath()} portion and the remaining
-	 * {@link RequestPath#pathWithinApplication() pathwithinApplication} portion.
+	 * {@link RequestPath#pathWithinApplication() pathWithinApplication} portion.
 	 * The latter can be passed into methods of
 	 * {@link org.springframework.web.util.pattern.PathPattern} for path
 	 * matching purposes.

spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.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.
@@ -66,7 +66,7 @@ public void assertCustomConfig() throws Exception {
 
 		Object config = request.getHttpContext().getAttribute(HttpClientContext.REQUEST_CONFIG);
 		assertThat(config).as("Request config should be set").isNotNull();
-		assertThat(config).as("Wrong request config type" + config.getClass().getName()).isInstanceOf(RequestConfig.class);
+		assertThat(config).as("Wrong request config type " + config.getClass().getName()).isInstanceOf(RequestConfig.class);
 		RequestConfig requestConfig = (RequestConfig) config;
 		assertThat(requestConfig.getConnectTimeout()).as("Wrong custom connection timeout").isEqualTo(1234);
 		assertThat(requestConfig.getConnectionRequestTimeout()).as("Wrong custom connection request timeout").isEqualTo(4321);

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java

@@ -229,7 +229,7 @@ public PathMatcher getPathMatcher() {
 	}
 
 	/**
-	 * Return the configure UrlPathHelper or a default, shared instance otherwise.
+	 * Return the configured UrlPathHelper or a default, shared instance otherwise.
 	 * @since 5.3
 	 */
 	protected UrlPathHelper getUrlPathHelperOrDefault() {
@@ -243,7 +243,7 @@ protected UrlPathHelper getUrlPathHelperOrDefault() {
 	}
 
 	/**
-	 * Return the configure PathMatcher or a default, shared, instance otherwise.
+	 * Return the configured PathMatcher or a default, shared instance otherwise.
 	 * @since 5.3
 	 */
 	protected PathMatcher getPathMatcherOrDefault() {
@@ -257,7 +257,7 @@ protected PathMatcher getPathMatcherOrDefault() {
 	}
 
 	/**
-	 * Return the configured PathPatternParser or a default, shared, instance otherwise.
+	 * Return the configured PathPatternParser or a default, shared instance otherwise.
 	 * @since 5.3.4
 	 */
 	public PathPatternParser getPatternParserOrDefault() {