diff --git a/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java b/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java index f53ea234e4..ff5e3d87e8 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2019 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. @@ -50,10 +50,10 @@ public class SimpleNamespaceContextTests { @Test public void getNamespaceURI() { context.bindNamespaceUri(XMLConstants.XMLNS_ATTRIBUTE, additionalNamespaceUri); - assertThat("Always returns \"https://www.w3.org/2000/xmlns/\" for \"xmlns\"", + assertThat("Always returns \"http://www.w3.org/2000/xmlns/\" for \"xmlns\"", context.getNamespaceURI(XMLConstants.XMLNS_ATTRIBUTE), is(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)); context.bindNamespaceUri(XMLConstants.XML_NS_PREFIX, additionalNamespaceUri); - assertThat("Always returns \"https://www.w3.org/XML/1998/namespace\" for \"xml\"", + assertThat("Always returns \"http://www.w3.org/XML/1998/namespace\" for \"xml\"", context.getNamespaceURI(XMLConstants.XML_NS_PREFIX), is(XMLConstants.XML_NS_URI)); assertThat("Returns \"\" for an unbound prefix", context.getNamespaceURI(unboundPrefix), @@ -76,9 +76,9 @@ public class SimpleNamespaceContextTests { @Test public void getPrefix() { - assertThat("Always returns \"xmlns\" for \"https://www.w3.org/2000/xmlns/\"", + assertThat("Always returns \"xmlns\" for \"http://www.w3.org/2000/xmlns/\"", context.getPrefix(XMLConstants.XMLNS_ATTRIBUTE_NS_URI), is(XMLConstants.XMLNS_ATTRIBUTE)); - assertThat("Always returns \"xml\" for \"https://www.w3.org/XML/1998/namespace\"", + assertThat("Always returns \"xml\" for \"http://www.w3.org/XML/1998/namespace\"", context.getPrefix(XMLConstants.XML_NS_URI), is(XMLConstants.XML_NS_PREFIX)); assertThat("Returns null for an unbound namespace URI", context.getPrefix(unboundNamespaceUri), @@ -103,10 +103,10 @@ public class SimpleNamespaceContextTests { @Test public void getPrefixes() { - assertThat("Returns only \"xmlns\" for \"https://www.w3.org/2000/xmlns/\"", + assertThat("Returns only \"xmlns\" for \"http://www.w3.org/2000/xmlns/\"", getItemSet(context.getPrefixes(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)), is(makeSet(XMLConstants.XMLNS_ATTRIBUTE))); - assertThat("Returns only \"xml\" for \"https://www.w3.org/XML/1998/namespace\"", + assertThat("Returns only \"xml\" for \"http://www.w3.org/XML/1998/namespace\"", getItemSet(context.getPrefixes(XMLConstants.XML_NS_URI)), is(makeSet(XMLConstants.XML_NS_PREFIX))); assertThat("Returns empty iterator for unbound prefix", context.getPrefixes("unbound Namespace URI").hasNext(), diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java index f23b3a4f59..20e37cd9b4 100644 --- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java +++ b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java @@ -71,7 +71,7 @@ import org.springframework.util.StringUtils; * <?xml version="1.0" encoding="UTF-8"?> * <connector xmlns="http://java.sun.com/xml/ns/j2ee" * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - * xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" + * xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee https://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" * version="1.5"> * <vendor-name>Spring Framework</vendor-name> * <eis-type>Spring Connector</eis-type> diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java index d70d871f84..e498b7fba6 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java @@ -102,42 +102,42 @@ public class HttpHeaders implements MultiValueMap, Serializable public static final String ACCEPT_RANGES = "Accept-Ranges"; /** * The CORS {@code Access-Control-Allow-Credentials} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_ALLOW_CREDENTIALS = "Access-Control-Allow-Credentials"; /** * The CORS {@code Access-Control-Allow-Headers} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers"; /** * The CORS {@code Access-Control-Allow-Methods} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_ALLOW_METHODS = "Access-Control-Allow-Methods"; /** * The CORS {@code Access-Control-Allow-Origin} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_ALLOW_ORIGIN = "Access-Control-Allow-Origin"; /** * The CORS {@code Access-Control-Expose-Headers} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers"; /** * The CORS {@code Access-Control-Max-Age} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_MAX_AGE = "Access-Control-Max-Age"; /** * The CORS {@code Access-Control-Request-Headers} request header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers"; /** * The CORS {@code Access-Control-Request-Method} request header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public static final String ACCESS_CONTROL_REQUEST_METHOD = "Access-Control-Request-Method"; /** diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java index 998c45b617..3b885f39bb 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; * @author Juergen Hoeller * @author Sam Brannen * @since 4.2 - * @see CORS spec + * @see CORS spec */ public class CorsConfiguration { diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java index 16619f8211..c7b946236f 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsProcessor.java @@ -34,7 +34,7 @@ import org.springframework.lang.Nullable; * @author Sebastien Deleuze * @author Rossen Stoyanchev * @since 4.2 - * @see CORS W3C recommendation + * @see CORS W3C recommendation * @see org.springframework.web.servlet.handler.AbstractHandlerMapping#setCorsProcessor */ public interface CorsProcessor { diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java index 654d220715..2e31588101 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java @@ -23,7 +23,7 @@ import org.springframework.http.HttpMethod; /** * Utility class for CORS request handling based on the - * CORS W3C recommendation. + * CORS W3C recommendation. * * @author Sebastien Deleuze * @since 4.2 diff --git a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java index afd7647bcd..3063488343 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java @@ -40,7 +40,7 @@ import org.springframework.web.util.WebUtils; /** * The default implementation of {@link CorsProcessor}, as defined by the - * CORS W3C recommendation. + * CORS W3C recommendation. * *

Note that when input {@link CorsConfiguration} is {@code null}, this * implementation does not reject simple or actual requests outright but simply diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java index 9e2ef96b90..c27a06575c 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsProcessor.java @@ -28,7 +28,7 @@ import org.springframework.web.server.ServerWebExchange; * @author Sebastien Deleuze * @author Rossen Stoyanchev * @since 5.0 - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public interface CorsProcessor { diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java index 8fcee84589..73107bb1dc 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java @@ -28,7 +28,7 @@ import org.springframework.web.util.UriComponentsBuilder; /** * Utility class for CORS reactive request handling based on the - * CORS W3C recommendation. + * CORS W3C recommendation. * * @author Sebastien Deleuze * @since 5.0 diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsWebFilter.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsWebFilter.java index dac35b6ba1..4938d7842e 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsWebFilter.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsWebFilter.java @@ -39,7 +39,7 @@ import org.springframework.web.server.WebFilterChain; * * @author Sebastien Deleuze * @since 5.0 - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public class CorsWebFilter implements WebFilter { diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/DefaultCorsProcessor.java index 5945d3eb0c..f52d9be190 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/DefaultCorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/DefaultCorsProcessor.java @@ -35,7 +35,7 @@ import org.springframework.web.server.ServerWebExchange; /** * The default implementation of {@link CorsProcessor}, - * as defined by the CORS W3C recommendation. + * as defined by the CORS W3C recommendation. * *

Note that when input {@link CorsConfiguration} is {@code null}, this * implementation does not reject simple or actual requests outright but simply diff --git a/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java index 658bc50bb6..d85fce5505 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java @@ -48,7 +48,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; * * @author Sebastien Deleuze * @since 4.2 - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ public class CorsFilter extends OncePerRequestFilter { diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java index 5ffeafcf58..7368d6cf57 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java @@ -31,7 +31,7 @@ import org.springframework.util.Assert; * HTML 4.0 standard. * *

A complete description of the HTML 4.0 character set can be found - * at http://www.w3.org/TR/html4/charset.html. + * at https://www.w3.org/TR/html4/charset.html. * * @author Juergen Hoeller * @author Martin Kersten diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java index 480d24cb90..fdf96ca1bf 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java @@ -24,7 +24,7 @@ import org.springframework.util.Assert; * character entity references. * *

Reference: - * http://www.w3.org/TR/html4/charset.html + * https://www.w3.org/TR/html4/charset.html * *

For a comprehensive set of String escaping utilities, * consider Apache Commons Lang and its StringEscapeUtils class. @@ -52,8 +52,8 @@ public abstract class HtmlUtils { *

Escapes all special characters to their corresponding * entity reference (e.g. {@code <}). *

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (unescaped) input string * @return the escaped string @@ -70,8 +70,8 @@ public abstract class HtmlUtils { * specified encoding. In other words, if a special character does * not have to be escaped for the given encoding, it may not be. *

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (unescaped) input string * @param encoding the name of a supported {@link java.nio.charset.Charset charset} @@ -101,8 +101,8 @@ public abstract class HtmlUtils { *

Escapes all special characters to their corresponding numeric * reference in decimal format (&#Decimal;). *

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (unescaped) input string * @return the escaped string @@ -119,8 +119,8 @@ public abstract class HtmlUtils { * specified encoding. In other words, if a special character does * not have to be escaped for the given encoding, it may not be. *

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (unescaped) input string * @param encoding the name of a supported {@link java.nio.charset.Charset charset} @@ -151,8 +151,8 @@ public abstract class HtmlUtils { *

Escapes all special characters to their corresponding numeric * reference in hex format (&#xHex;). *

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (unescaped) input string * @return the escaped string @@ -169,8 +169,8 @@ public abstract class HtmlUtils { * specified encoding. In other words, if a special character does * not have to be escaped for the given encoding, it may not be. *

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (unescaped) input string * @param encoding the name of a supported {@link java.nio.charset.Charset charset} @@ -208,8 +208,8 @@ public abstract class HtmlUtils { * Gracefully handles malformed character references by copying original * characters as is when encountered.

*

Reference: - * - * http://www.w3.org/TR/html4/sgml/entities.html + * + * https://www.w3.org/TR/html4/sgml/entities.html * * @param input the (escaped) input string * @return the unescaped string diff --git a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java index e7aeafacfd..e04abe34a1 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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/src/docs/asciidoc/web/webflux-cors.adoc b/src/docs/asciidoc/web/webflux-cors.adoc index 29f0bef3a1..a19f06d276 100644 --- a/src/docs/asciidoc/web/webflux-cors.adoc +++ b/src/docs/asciidoc/web/webflux-cors.adoc @@ -17,7 +17,7 @@ For example, you could have your bank account in one tab and evil.com in another from evil.com should not be able to make AJAX requests to your bank API with your credentials -- for example, withdrawing money from your account! -Cross-Origin Resource Sharing (CORS) is a http://www.w3.org/TR/cors/[W3C specification] +Cross-Origin Resource Sharing (CORS) is a https://www.w3.org/TR/cors/[W3C specification] implemented by https://caniuse.com/#feat=cors[most browsers] that lets you specify what kind of cross-domain requests are authorized, rather than using less secure and less powerful workarounds based on IFRAME or JSONP. diff --git a/src/docs/asciidoc/web/webmvc-cors.adoc b/src/docs/asciidoc/web/webmvc-cors.adoc index cae801d31f..32e9bcdb4a 100644 --- a/src/docs/asciidoc/web/webmvc-cors.adoc +++ b/src/docs/asciidoc/web/webmvc-cors.adoc @@ -17,7 +17,7 @@ For example, you could have your bank account in one tab and evil.com in another from evil.com should not be able to make AJAX requests to your bank API with your credentials -- for example withdrawing money from your account! -Cross-Origin Resource Sharing (CORS) is a http://www.w3.org/TR/cors/[W3C specification] +Cross-Origin Resource Sharing (CORS) is a https://www.w3.org/TR/cors/[W3C specification] implemented by https://caniuse.com/#feat=cors[most browsers] that lets you specify what kind of cross-domain requests are authorized, rather than using less secure and less powerful workarounds based on IFRAME or JSONP.