diff --git a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-uri-building.adoc b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-uri-building.adoc index bd1ff485dbe..bc0f1bae54d 100644 --- a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-uri-building.adoc +++ b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-uri-building.adoc @@ -3,7 +3,7 @@ [.small]#xref:web/webflux/uri-building.adoc[See equivalent in the Reactive stack]# -This section describes various options available in the Spring Framework to work with URI's. +This section describes various options available in the Spring Framework to work with URIs. include::partial$web/web-uris.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/partials/web/web-uris.adoc b/framework-docs/modules/ROOT/partials/web/web-uris.adoc index b690cd59b58..4952f05dd5a 100644 --- a/framework-docs/modules/ROOT/partials/web/web-uris.adoc +++ b/framework-docs/modules/ROOT/partials/web/web-uris.adoc @@ -2,7 +2,7 @@ = UriComponents [.small]#Spring MVC and Spring WebFlux# -`UriComponentsBuilder` helps to build URI's from URI templates with variables, as the following example shows: +`UriComponentsBuilder` helps to build URIs from URI templates with variables, as the following example shows: [tabs] ====== @@ -247,7 +247,7 @@ and treats deviations from the syntax as illegal. https://github.com/web-platform-tests/wpt/tree/master/url[URL parsing algorithm] in the https://url.spec.whatwg.org[WhatWG URL Living standard]. It provides lenient handling of a wide range of cases of unexpected input. Browsers implement this in order to handle -leniently user typed URL's. For more details, see the URL Living Standard and URL parsing +leniently user typed URLs. For more details, see the URL Living Standard and URL parsing https://github.com/web-platform-tests/wpt/tree/master/url[test cases]. By default, `RestClient`, `WebClient`, and `RestTemplate` use the RFC parser type, and @@ -255,10 +255,10 @@ expect applications to provide with URL templates that conform to RFC syntax. To that you can customize the `UriBuilderFactory` on any of the clients. Applications and frameworks may further rely on `UriComponentsBuilder` for their own needs -to parse user provided URL's in order to inspect and possibly validated URI components +to parse user provided URLs in order to inspect and possibly validated URI components such as the scheme, host, port, path, and query. Such components can decide to use the -WhatWG parser type in order to handle URL's more leniently, and to align with the way -browsers parse URI's, in case of a redirect to the input URL or if it is included in a +WhatWG parser type in order to handle URLs more leniently, and to align with the way +browsers parse URIs, in case of a redirect to the input URL or if it is included in a response to a browser. diff --git a/spring-web/src/main/java/org/springframework/web/filter/UrlHandlerFilter.java b/spring-web/src/main/java/org/springframework/web/filter/UrlHandlerFilter.java index 7b6cd7d9c2e..c3e99de04b7 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/UrlHandlerFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/UrlHandlerFilter.java @@ -126,7 +126,7 @@ public final class UrlHandlerFilter extends OncePerRequestFilter { public interface Builder { /** - * Add a handler for URL's with a trailing slash. + * Add a handler for URLs with a trailing slash. * @param pathPatterns path patterns to map the handler to, for example, * "/path/*", "/path/**", * "/path/foo/". diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/UrlHandlerFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/UrlHandlerFilter.java index ca332edc1b3..4afe02cdd64 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/reactive/UrlHandlerFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/UrlHandlerFilter.java @@ -117,7 +117,7 @@ public final class UrlHandlerFilter implements WebFilter { public interface Builder { /** - * Add a handler for URL's with a trailing slash. + * Add a handler for URLs with a trailing slash. * @param pathPatterns path patterns to map the handler to, e.g. * "/path/*", "/path/**", * "/path/foo/". diff --git a/spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java b/spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java index 37d3bf0936c..9a197bffd46 100644 --- a/spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java +++ b/spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java @@ -26,7 +26,7 @@ import org.springframework.core.log.LogDelegateFactory; import org.springframework.util.Assert; /** - * Parser for URI's based on RFC 3986 syntax. + * Parser for URIs based on RFC 3986 syntax. * * @author Rossen Stoyanchev * @since 6.2 diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index e8783e4cf2e..ae14d794546 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -57,7 +57,7 @@ import org.springframework.web.util.UriComponents.UriTemplateVariables; * {@link ParserType#WHAT_WG WhatWG parser type}, based on the algorithm from * the WhatWG URL Living Standard * provides more lenient handling of a wide range of cases that occur in user - * types URL's. + * types URLs. * * @author Arjen Poutsma * @author Rossen Stoyanchev @@ -732,7 +732,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { public enum ParserType { /** - * This parser type expects URI's to conform to RFC 3986 syntax. + * This parser type expects URIs to conform to RFC 3986 syntax. */ RFC, @@ -740,7 +740,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { * This parser follows the * URL parsing algorithm * in the WhatWG URL Living standard that browsers implement to align on - * lenient handling of user typed URL's that may not conform to RFC syntax. + * lenient handling of user typed URLs that may not conform to RFC syntax. * @see URL Living Standard * @see URL tests */ diff --git a/spring-web/src/main/java/org/springframework/web/util/WhatWgUrlParser.java b/spring-web/src/main/java/org/springframework/web/util/WhatWgUrlParser.java index e8cc4af3311..d2d10298745 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WhatWgUrlParser.java +++ b/spring-web/src/main/java/org/springframework/web/util/WhatWgUrlParser.java @@ -39,9 +39,9 @@ import org.springframework.util.Assert; * Implementation of the * URL parsing algorithm * of the WhatWG URL Living standard. Browsers use this algorithm to align on - * lenient parsing of user typed URL's that may deviate from RFC syntax. + * lenient parsing of user typed URLs that may deviate from RFC syntax. * Use this, via {@link UriComponentsBuilder.ParserType#WHAT_WG}, if you need to - * leniently handle URL's that don't confirm to RFC syntax, or for alignment + * leniently handle URLs that don't confirm to RFC syntax, or for alignment * with browser behavior. * *

Comments in this class correlate to the parsing algorithm. diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ApiVersionConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ApiVersionConfigurer.java index 59351a43aa3..0665c9e5e90 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ApiVersionConfigurer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ApiVersionConfigurer.java @@ -100,7 +100,7 @@ public class ApiVersionConfigurer { * Add a resolver that extracts the API version from a path segment. *

Note that this resolver never returns {@code null}, and therefore * cannot yield to other resolvers, see {@link org.springframework.web.accept.PathApiVersionResolver}. - * @param index the index of the path segment to check; e.g. for URL's like + * @param index the index of the path segment to check; e.g. for URLs like * {@code "/{version}/..."} use index 0, for {@code "/api/{version}/..."} index 1. */ public ApiVersionConfigurer usePathSegment(int index) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeMethodArgumentResolver.java index 2a6ff3bc17b..86e7d195cca 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeMethodArgumentResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeMethodArgumentResolver.java @@ -47,7 +47,7 @@ import org.springframework.web.util.UriComponentsBuilder; *

  • {@link Locale} *
  • {@link TimeZone} *
  • {@link ZoneId} - *
  • {@link UriBuilder} or {@link UriComponentsBuilder} -- for building URL's + *
  • {@link UriBuilder} or {@link UriComponentsBuilder} -- for building URLs * relative to the current request * * diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ApiVersionConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ApiVersionConfigurer.java index 92f06a09281..e2a7a69b204 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ApiVersionConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ApiVersionConfigurer.java @@ -100,7 +100,7 @@ public class ApiVersionConfigurer { * Add resolver to extract the version from a path segment. *

    Note that this resolver never returns {@code null}, and therefore * cannot yield to other resolvers, see {@link PathApiVersionResolver}. - * @param index the index of the path segment to check; e.g. for URL's like + * @param index the index of the path segment to check; e.g. for URLs like * {@code "/{version}/..."} use index 0, for {@code "/api/{version}/..."} index 1. */ public ApiVersionConfigurer usePathSegment(int index) {