diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java index 8f5ddaff4a3..af706c2e124 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java @@ -638,7 +638,7 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic * {@link org.springframework.web.context.ConfigurableWebApplicationContext} * interface. Can be overridden in subclasses. *

Do not forget to register this servlet instance as application listener on the - * created context (for triggering its {@link #onRefresh callback}, and to call + * created context (for triggering its {@link #onRefresh callback}), and to call * {@link org.springframework.context.ConfigurableApplicationContext#refresh()} * before returning the context instance. * @param parent the parent ApplicationContext to use, or {@code null} if none diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java index d3c3dd8dd9c..68ae2011c5e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java @@ -40,7 +40,7 @@ import org.springframework.lang.Nullable; *

Note: {@code HandlerAdapter} implementors may implement the {@link * org.springframework.core.Ordered} interface to be able to specify a sorting * order (and thus a priority) for getting applied by the {@code DispatcherServlet}. - * Non-Ordered instances get treated as lowest priority. + * Non-Ordered instances get treated as the lowest priority. * * @author Rod Johnson * @author Juergen Hoeller @@ -50,7 +50,7 @@ import org.springframework.lang.Nullable; public interface HandlerAdapter { /** - * Given a handler instance, return whether or not this {@code HandlerAdapter} + * Given a handler instance, return whether this {@code HandlerAdapter} * can support it. Typical HandlerAdapters will base the decision on the handler * type. HandlerAdapters will usually only support one handler type each. *

A typical implementation: @@ -58,7 +58,7 @@ public interface HandlerAdapter { * return (handler instanceof MyHandler); * } * @param handler the handler object to check - * @return whether or not this object can use the given handler + * @return whether this object can use the given handler */ boolean supports(Object handler); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java index 0a64002f018..081f677aebe 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java @@ -45,7 +45,7 @@ import org.springframework.lang.Nullable; * *

Note: Implementations can implement the {@link org.springframework.core.Ordered} * interface to be able to specify a sorting order and thus a priority for getting - * applied by DispatcherServlet. Non-Ordered instances get treated as lowest priority. + * applied by DispatcherServlet. Non-Ordered instances get treated as the lowest priority. * * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java index 12954130a08..d7e1e4ef203 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java @@ -58,7 +58,7 @@ public class ModelAndView { @Nullable private HttpStatusCode status; - /** Indicates whether or not this instance has been cleared with a call to {@link #clear()}. */ + /** Indicates whether this instance has been cleared with a call to {@link #clear()}. */ private boolean cleared = false; @@ -216,7 +216,7 @@ public class ModelAndView { } /** - * Indicate whether or not this {@code ModelAndView} has a view, either + * Indicate whether this {@code ModelAndView} has a view, either * as a view name or as a direct {@link View} instance. */ public boolean hasView() { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java index 752febb4082..9279901135c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java @@ -90,7 +90,7 @@ public class DefaultServletHandlerConfigurer { * Return a handler mapping instance ordered at {@link Ordered#LOWEST_PRECEDENCE} * containing the {@link DefaultServletHttpRequestHandler} instance mapped * to {@code "/**"}; or {@code null} if default servlet handling was not - * been enabled. + * enabled. * @since 4.3.12 */ @Nullable diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index bd9c8897b1b..6f6cc56c068 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -1094,7 +1094,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv /** * Register a {@link ViewResolverComposite} that contains a chain of view resolvers * to use for view resolution. - * By default this resolver is ordered at 0 unless content negotiation view + * By default, this resolver is ordered at 0 unless content negotiation view * resolution is used in which case the order is raised to * {@link org.springframework.core.Ordered#HIGHEST_PRECEDENCE * Ordered.HIGHEST_PRECEDENCE}. @@ -1152,7 +1152,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv } /** - * Override this method to configure cross origin requests processing. + * Override this method to configure cross-origin requests processing. * @since 4.2 * @see CorsRegistry */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java index 7ec8ac81d88..8055d62e258 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java @@ -105,7 +105,7 @@ public interface WebMvcConfigurer { } /** - * Configure "global" cross origin request processing. The configured CORS + * Configure "global" cross-origin request processing. The configured CORS * mappings apply to annotated controllers, functional endpoints, and static * resources. *

Annotated controllers can further declare more fine-grained config via diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java index cb9e9afbc3c..08606f5c01f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java @@ -335,14 +335,14 @@ public abstract class RequestPredicates { void method(Set methods); /** - * Receive notification of an path predicate. + * Receive notification of a path predicate. * @param pattern the path pattern that makes up the predicate * @see RequestPredicates#path(String) */ void path(String pattern); /** - * Receive notification of an path extension predicate. + * Receive notification of a path extension predicate. * @param extension the path extension that makes up the predicate * @see RequestPredicates#pathExtension(String) */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java index e8b3982c77a..1ffe98fadfa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java @@ -267,7 +267,7 @@ public interface ServerRequest { * also with conditional POST/PUT/DELETE requests. *

Note: you can use either * this {@code #checkNotModified(Instant)} method; or - * {@link #checkNotModified(String)}. If you want enforce both + * {@link #checkNotModified(String)}. If you want to enforce both * a strong entity tag and a Last-Modified value, * as recommended by the HTTP specification, * then you should use {@link #checkNotModified(Instant, String)}. @@ -301,7 +301,7 @@ public interface ServerRequest { * also with conditional POST/PUT/DELETE requests. *

Note: you can use either * this {@link #checkNotModified(Instant)} method; or - * {@code #checkNotModified(String)}. If you want enforce both + * {@code #checkNotModified(String)}. If you want to enforce both * a strong entity tag and a Last-Modified value, * as recommended by the HTTP specification, * then you should use {@link #checkNotModified(Instant, String)}. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java index 26848264843..8a1c44bdb3e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java @@ -150,8 +150,8 @@ public class RouterFunctionMapping extends AbstractHandlerMapping implements Ini } /** - * Detect a all {@linkplain RouterFunction router functions} in the - * current application context. + * Detect all {@linkplain RouterFunction router functions} in the current + * application context. */ private void initRouterFunctions() { List> routerFunctions = obtainApplicationContext() diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java index 5ebd32a6f4d..0dc6875f018 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java @@ -512,7 +512,7 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap * Provide the mapping for a handler method. A method for which no * mapping can be provided is not a handler method. * @param method the method to provide a mapping for - * @param handlerType the handler type, possibly a sub-type of the method's + * @param handlerType the handler type, possibly a subtype of the method's * declaring class * @return the mapping, or {@code null} if the method is not mapped */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java index 46977483ada..ebac18eedaf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java @@ -48,7 +48,7 @@ import org.springframework.web.util.pattern.PatternParseException; * parsed} {@code RequestPath} which in turn depends on the * {@link HandlerMapping} that matched the current request. * - *

{@code MappedInterceptor} is supported by sub-classes of + *

{@code MappedInterceptor} is supported by subclasses of * {@link org.springframework.web.servlet.handler.AbstractHandlerMethodMapping * AbstractHandlerMethodMapping} which detect beans of type * {@code MappedInterceptor} and also check if interceptors directly registered diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java index 9a61f1d98e1..7cf819cf65f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java @@ -117,7 +117,7 @@ public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping { } /** - * Allow Map access to the URL path mappings, with the option to add or + * Allow {@code Map} access to the URL path mappings, with the option to add or * override specific entries. *

Useful for specifying entries directly, for example via "urlMap[myKey]". * This is particularly useful for adding or overriding entries in child diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java index 673c110da12..315e2cf711b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java @@ -35,7 +35,7 @@ import org.springframework.web.servlet.ModelAndView; /** * Spring Controller implementation that wraps a servlet instance which it manages - * internally. Such a wrapped servlet is not known outside of this controller; + * internally. Such a wrapped servlet is not known outside this controller; * its entire lifecycle is covered here (in contrast to {@link ServletForwardingController}). * *

Useful to invoke an existing servlet via Spring's dispatching infrastructure, diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java index b0e94f7f0b2..661b2ffd17d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java @@ -56,7 +56,7 @@ import org.springframework.web.util.pattern.PathPatternParser; * {@link PathPattern}s. The syntax is largely the same with the latter being * more tailored for web usage and more efficient. The choice depends on the * presence of a {@link UrlPathHelper#resolveAndCacheLookupPath resolved} - * {@code String} lookupPath or a {@link ServletRequestPathUtils#parseAndCache} + * {@code String} lookupPath or a {@link ServletRequestPathUtils#parseAndCache * parsed} {@code RequestPath} which in turn depends on the * {@link HandlerMapping} that matched the current request. * @@ -182,7 +182,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle /** * Map specific URL paths to a specific {@link org.springframework.http.CacheControl}. *

Overrides the default cache seconds setting of this interceptor. - * Can specify a empty {@link org.springframework.http.CacheControl} instance + * Can specify an empty {@link org.springframework.http.CacheControl} instance * to exclude a URL path from default caching. *

For pattern syntax see {@link AntPathMatcher} and {@link PathPattern} * as well as the class-level Javadoc for details for when each is used. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java index d69fd239ced..1dbf4853569 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java @@ -33,7 +33,7 @@ import org.springframework.lang.Nullable; public abstract class AbstractRequestCondition> implements RequestCondition { /** - * Indicates whether this condition is empty, i.e. whether or not it + * Indicates whether this condition is empty, i.e. whether it * contains any discrete items. * @return {@code true} if empty; {@code false} otherwise */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java index d12f14d02d8..5d613bb86b4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java @@ -62,7 +62,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i /** * This implementation expects the handler to be an {@link HandlerMethod}. * @param handler the handler instance to check - * @return whether or not this adapter can adapt the given handler + * @return whether this adapter can adapt the given handler */ @Override public final boolean supports(Object handler) { @@ -70,9 +70,9 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i } /** - * Given a handler method, return whether or not this adapter can support it. + * Given a handler method, return whether this adapter can support it. * @param handlerMethod the handler method to check - * @return whether or not this adapter can adapt the given method + * @return whether this adapter can adapt the given method */ protected abstract boolean supportsInternal(HandlerMethod handlerMethod); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java index f6a7eb42d3f..e52bbe5b01c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java @@ -298,7 +298,7 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe } /** - * Whether there any partial matches. + * Whether there are any partial matches. */ public boolean isEmpty() { return this.partialMatches.isEmpty(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java index cba21ac3dfe..37fae80c472 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java @@ -38,7 +38,7 @@ import org.springframework.web.servlet.HandlerMapping; /** * Resolves arguments annotated with {@link MatrixVariable @MatrixVariable}. * - *

If the method parameter is of type {@link Map} it will by resolved by + *

If the method parameter is of type {@link Map} it will be resolved by * {@link MatrixVariableMapMethodArgumentResolver} instead unless the annotation * specifies a name in which case it is considered to be a single attribute of * type map (vs multiple attributes collected in a map). diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java index cee45f41e06..a59e21d3ed9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java @@ -388,7 +388,7 @@ public class MvcUriComponentsBuilder { *

The configured * {@link org.springframework.web.servlet.handler.HandlerMethodMappingNamingStrategy * HandlerMethodMappingNamingStrategy} determines the names of controller - * method request mappings at startup. By default all mappings are assigned + * method request mappings at startup. By default, all mappings are assigned * a name based on the capital letters of the class name, followed by "#" as * separator, and then the method name. For example "PC#getPerson" * for a class named PersonController with method getPerson. In case the @@ -642,7 +642,7 @@ public class MvcUriComponentsBuilder { contributor.contributeMethodArgument(param, args[i], builder, uriVars); } - // This may not be all the URI variables, supply what we have so far.. + // This may not be all the URI variables, supply what we have so far. return builder.uriVariables(uriVars); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java index e823f66306e..b23ae8912cd 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java @@ -94,7 +94,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM /** * Whether the given {@linkplain MethodParameter method parameter} is - * supported as multi-part. Supports the following method parameters: + * supported as multipart. Supports the following method parameters: *