From 65d2e9bb547e15df4b9eda1dcf36ec17f8f3a60a Mon Sep 17 00:00:00 2001 From: liuzhifei <2679431923@qq.com> Date: Fri, 24 Dec 2021 11:11:28 +0800 Subject: [PATCH 1/2] Fix typo and use of componentry See gh-27852 --- .../springframework/scheduling/annotation/EnableAsync.java | 2 +- .../scheduling/annotation/EnableScheduling.java | 2 +- .../java/org/springframework/http/server/RequestPath.java | 4 ++-- .../web/SpringServletContainerInitializer.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java index 0b7df3269e5..08225849007 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java @@ -133,7 +133,7 @@ import org.springframework.core.Ordered; * setting of the thread name prefix of the {@code Executor}; this is because * the {@code } element does not expose such an attribute. This * demonstrates how the JavaConfig-based approach allows for maximum configurability - * through direct access to actual componentry. + * through direct access to actual component. * *

The {@link #mode} attribute controls how advice is applied: If the mode is * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java index e35b0a79929..3b7e68a7678 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java @@ -180,7 +180,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar; * instead of a custom {@code Trigger} implementation; this is because the * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is * but one demonstration how the code-based approach allows for maximum configurability - * through direct access to actual componentry. + * through direct access to actual component. * *

Note: {@code @EnableScheduling} applies to its local application context only, * allowing for selective scheduling of beans at different levels. Please redeclare diff --git a/spring-web/src/main/java/org/springframework/http/server/RequestPath.java b/spring-web/src/main/java/org/springframework/http/server/RequestPath.java index 6b748da1d43..cea7a8b9998 100644 --- a/spring-web/src/main/java/org/springframework/http/server/RequestPath.java +++ b/spring-web/src/main/java/org/springframework/http/server/RequestPath.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. @@ -23,7 +23,7 @@ import org.springframework.lang.Nullable; /** * Specialization of {@link PathContainer} that sub-divides the path into a * {@link #contextPath()} and the remaining {@link #pathWithinApplication()}. - * The lattery is typically used for request mapping within the application + * The latter is typically used for request mapping within the application * while the former is useful when preparing external links that point back to * the application. * diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java index 3c0d69c46d8..5e1a189fe6a 100644 --- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java +++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java @@ -129,7 +129,7 @@ public class SpringServletContainerInitializer implements ServletContainerInitia * method will be invoked on each instance, delegating the {@code ServletContext} such * that each instance may register and configure servlets such as Spring's * {@code DispatcherServlet}, listeners such as Spring's {@code ContextLoaderListener}, - * or any other Servlet API componentry such as filters. + * or any other Servlet API component such as filters. * @param webAppInitializerClasses all implementations of * {@link WebApplicationInitializer} found on the application classpath * @param servletContext the servlet context to be initialized From 900e0f56eba3669e7b2c13567589678c12e41c55 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 29 Dec 2021 11:05:27 +0100 Subject: [PATCH 2/2] Polish "Fix typo and use of componentry" See gh-27852 --- .../org/springframework/scheduling/annotation/EnableAsync.java | 2 +- .../springframework/scheduling/annotation/EnableScheduling.java | 2 +- .../springframework/web/SpringServletContainerInitializer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java index 08225849007..38f5c2f410c 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java @@ -133,7 +133,7 @@ import org.springframework.core.Ordered; * setting of the thread name prefix of the {@code Executor}; this is because * the {@code } element does not expose such an attribute. This * demonstrates how the JavaConfig-based approach allows for maximum configurability - * through direct access to actual component. + * through direct access to the actual component. * *

The {@link #mode} attribute controls how advice is applied: If the mode is * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java index 3b7e68a7678..0d49e240d5d 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java @@ -180,7 +180,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar; * instead of a custom {@code Trigger} implementation; this is because the * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is * but one demonstration how the code-based approach allows for maximum configurability - * through direct access to actual component. + * through direct access to the actual component. * *

Note: {@code @EnableScheduling} applies to its local application context only, * allowing for selective scheduling of beans at different levels. Please redeclare diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java index 5e1a189fe6a..5ced8bf39e4 100644 --- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java +++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java @@ -129,7 +129,7 @@ public class SpringServletContainerInitializer implements ServletContainerInitia * method will be invoked on each instance, delegating the {@code ServletContext} such * that each instance may register and configure servlets such as Spring's * {@code DispatcherServlet}, listeners such as Spring's {@code ContextLoaderListener}, - * or any other Servlet API component such as filters. + * or any other Servlet API features such as filters. * @param webAppInitializerClasses all implementations of * {@link WebApplicationInitializer} found on the application classpath * @param servletContext the servlet context to be initialized