diff --git a/CONTRIBUTING-DOCUMENTATION.adoc b/CONTRIBUTING-DOCUMENTATION.adoc
index 6b51e5d7d22..5133dbe17da 100644
--- a/CONTRIBUTING-DOCUMENTATION.adoc
+++ b/CONTRIBUTING-DOCUMENTATION.adoc
@@ -1,6 +1,6 @@
= How to contribute to the reference
-The Spring Framework reference now uses http://asciidoctor.org/[asciidoctor]. This
+The Spring Framework reference now uses https://asciidoctor.org/[asciidoctor]. This
document describes how to contribute documentation updates.
== Building with Gradle
@@ -18,7 +18,7 @@ One of the nice features about using asciidoctor is the support for live editing
You will find a Guardfile already present at `spring-framework/src/asciidoc/Guardfile`.
Make sure first to follow the setup instructions within the
-http://asciidoctor.org/docs/editing-asciidoc-with-live-preview/[Editing AsciiDoc with Live Preview]
+https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/[Editing AsciiDoc with Live Preview]
document. Once you have done that, there are additional gems to install to make it work
(assuming that you are using http://livereload.com/[LiveReload]):
@@ -45,7 +45,7 @@ Some notes on documentation
* Documentation is wrapped at 90 chars, ensure that you manually wrap your edits
* Tabs are used for indentation, do not use spaces
* Follow the existing style when inserting `source` blocks
-* http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[Asciidoctor Quick Reference]
-* http://asciidoctor.org/docs/user-manual/[Asciidoctor Manual]
-* http://asciidoctor.org/docs/asciidoc-writers-guide/[Asciidoctor Writers Guide]
+* https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[Asciidoctor Quick Reference]
+* https://asciidoctor.org/docs/user-manual/[Asciidoctor Manual]
+* https://asciidoctor.org/docs/asciidoc-writers-guide/[Asciidoctor Writers Guide]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d901d803ea..142885c77d5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -305,12 +305,12 @@ Note that you can always force push (`git push -f`) reworked / rebased commits
against the branch used to submit your pull request. In other words, you do not
need to issue a new pull request when asked to make changes.
-[help documentation]: http://help.github.com/send-pull-requests
+[help documentation]: https://help.github.com/send-pull-requests
[JIRA issue tracker]: https://jira.spring.io/browse/SPR
[spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib
[Spring ICLA form]: https://support.springsource.com/spring_committer_signup
[fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
[Spring Framework Code Style]: https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style
-[Rewriting History section of Pro Git]: http://git-scm.com/book/en/Git-Tools-Rewriting-History
-[Commit Guidelines section of Pro Git]: http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines
+[Rewriting History section of Pro Git]: https://git-scm.com/book/en/Git-Tools-Rewriting-History
+[Commit Guidelines section of Pro Git]: https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines
[building from source]: https://github.com/spring-projects/spring-framework#building-from-source
diff --git a/README.md b/README.md
index ffece4a39ff..bb5ec516d54 100644
--- a/README.md
+++ b/README.md
@@ -70,29 +70,29 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
[Spring Integration]: https://github.com/spring-projects/spring-integration
[Spring Batch]: https://github.com/spring-projects/spring-batch
-[family of projects]: http://spring.io/projects
+[family of projects]: https://spring.io/projects
[Spring organization]: https://github.com/spring-projects
[downloading Spring artifacts]: https://github.com/spring-projects/spring-framework/wiki/Downloading-Spring-artifacts
[building a distribution with dependencies]: https://github.com/spring-projects/spring-framework/wiki/Building-a-distribution-with-dependencies
-[Javadoc]: http://docs.spring.io/spring-framework/docs/current/javadoc-api/
-[reference docs]: http://docs.spring.io/spring-framework/docs/current/spring-framework-reference/
-[spring tags]: http://spring.io/questions
-[Stack Overflow]: http://stackoverflow.com/faq
-[Commercial support]: http://spring.io/services
+[Javadoc]: https://docs.spring.io/spring-framework/docs/current/javadoc-api/
+[reference docs]: https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/
+[spring tags]: https://spring.io/questions
+[Stack Overflow]: https://stackoverflow.com/faq
+[Commercial support]: https://spring.io/services
[Spring Framework JIRA]: https://jira.spring.io/browse/SPR
[the lifecycle of an issue]: https://github.com/spring-projects/spring-framework/wiki/The-Lifecycle-of-an-Issue
[spring-framework-issues]: https://github.com/spring-projects/spring-framework-issues#readme
[readme]: https://github.com/spring-projects/spring-framework-issues#readme
-[Gradle]: http://gradle.org
-[`./gradlew`]: http://vimeo.com/34436402
-[Git]: http://help.github.com/set-up-git-redirect
-[JDK8 build]: http://www.oracle.com/technetwork/java/javase/downloads
+[Gradle]: https://gradle.org
+[`./gradlew`]: https://vimeo.com/34436402
+[Git]: https://help.github.com/set-up-git-redirect
+[JDK8 build]: https://www.oracle.com/technetwork/java/javase/downloads
[Gradle build and release FAQ]: https://github.com/spring-projects/spring-framework/wiki/Gradle-build-and-release-FAQ
-[Pull requests]: http://help.github.com/send-pull-requests
+[Pull requests]: https://help.github.com/send-pull-requests
[contributor guidelines]: https://github.com/spring-projects/spring-framework/blob/master/CONTRIBUTING.md
[@SpringFramework]: https://twitter.com/springframework
[@SpringCentral]: https://twitter.com/springcentral
[team members]: https://twitter.com/springframework/lists/team/members
-[The Spring Blog]: http://spring.io/blog/
-[news feed]: http://spring.io/blog/category/news
+[The Spring Blog]: https://spring.io/blog/
+[news feed]: https://spring.io/blog/category/news
[Apache License]: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/gradle/jdiff/README.txt b/gradle/jdiff/README.txt
index 9f7529e2864..ed49a1b9231 100644
--- a/gradle/jdiff/README.txt
+++ b/gradle/jdiff/README.txt
@@ -11,7 +11,7 @@ difference between two public Java APIs.
The file jdiff.html contains the reference page for JDiff. The latest
version of JDiff can be downloaded at:
-http://sourceforge.net/projects/javadiff
+https://sourceforge.net/projects/javadiff
To use the Ant task on your own project, see example.xml. More examples
of using JDiff to compare the public APIs of J2SE1.3 and J2SE1.4 can
@@ -40,7 +40,7 @@ Acknowledgements
JDiff uses Stuart D. Gathman's Java translation of Gene Myers' O(ND)
difference algorithm.
-JDiff uses Xerces 1.4.2 from http://www.apache.org.
+JDiff uses Xerces 1.4.2 from https://www.apache.org.
JDiff also includes a script to use the classdoc application from
http://classdoc.sourceforge.net or http://www.jensgulden.de, by Jens
@@ -56,4 +56,4 @@ much of this work.
Footnote:
If you are looking for a generalized diff tool for XML, try diffmk from
-http://wwws.sun.com/software/xml/developers/diffmk/
+https://wwws.sun.com/software/xml/developers/diffmk/
diff --git a/gradle/jdiff/jdiff.html b/gradle/jdiff/jdiff.html
index 5c46f967b9e..d242fb8a495 100644
--- a/gradle/jdiff/jdiff.html
+++ b/gradle/jdiff/jdiff.html
@@ -7,10 +7,10 @@
JDiff is a Javadoc doclet which generates an
+href="https://java.sun.com/j2se/javadoc">doclet which generates an
HTML report of all the packages, classes, constructors, methods, and
fields which have been removed, added or changed in any way, including
their documentation, when two APIs are compared. This is very useful
@@ -312,7 +312,7 @@ the HTML output to the given directory.
-javadocnew <javadoc files location for the new API>
The location of existing Javadoc files
- for the new API, e.g. "http://java.sun.com/j2se/1.5.0/docs/api/" for the
+ for the new API, e.g. "https://java.sun.com/j2se/1.5.0/docs/api/" for the
public documentation for J2SE1.5.0. The default value is "../", which implies
that the documentation directory generated by Javadoc is at the same level as
the "changes.html" file generated by JDiff. Slashes are always
@@ -325,7 +325,7 @@ the HTML output to the given directory.
-javadocold <javadoc files location for the old API>
The location of existing
- Javadoc files for the old API, e.g. "http://java.sun.com/j2se/1.5.0/docs/API/"
+ Javadoc files for the old API, e.g. "https://java.sun.com/j2se/1.5.0/docs/API/"
for the public documentation for J2SE1.5.0. The default value is null, which
results in no links to Javadoc-generated documentation for the previous
release. Slashes are always forward in the argument, since this is an HTML
@@ -426,7 +426,7 @@ the HTML output to the given directory.
-showallchanges
If this argument is used, JDiff will show changes in
- native and synchronized modifiers. See here for why these are not shown by default.
+ native and synchronized modifiers. See here for why these are not shown by default.
@@ -547,7 +547,7 @@ moved to the end of the file and placed inside XML comments.
The text which is added can be HTML text if necessary, but if the
HTML is incorrect, JDiff may fail to read the comments file and exit. Note that
- the required HTML is in fact XHTML. Since this HTML is stored in an XML document, single tags without their closing ("slash") element are not permitted.
+ the required HTML is in fact XHTML. Since this HTML is stored in an XML document, single tags without their closing ("slash") element are not permitted.
For example, most browsers permit HTML which looks like "<p>Here is some
text.", with no closing tag. XML requires that either a closing tag exists ("</p>"),
or that the single tag is closed, e.g. "<p/>Here is some text.".
@@ -988,7 +988,7 @@ it can tell you how the content has changed.
Nor does it
compare what the methods in an API do; if JDiff could tell you what had changed about the way two
versions of an API execute, the Halting
+href="https://en.wikipedia.org/wiki/Halting_Problem">Halting
Problem would be solved, and our lives would be very different.
On a P3 450MHz machine, to scan all of the J2SE Java
and javax packages and generate XML takes about 2 minutes
@@ -1002,14 +1002,14 @@ per version. To generate a report from the XML files takes about 30s
diff --git a/import-into-idea.md b/import-into-idea.md
index 64326ef81a0..d280d460dad 100644
--- a/import-into-idea.md
+++ b/import-into-idea.md
@@ -14,7 +14,7 @@ _Within your locally cloned spring-framework working directory:_
1. `spring-oxm` should be pre-compiled since it's using repackaged dependencies (see *RepackJar tasks)
2. `spring-aspects` does not compile out of the box due to references to aspect types unknown to IDEA.
-See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the 'spring-aspects'
+See https://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the 'spring-aspects'
should be excluded from the overall project to avoid compilation errors.
3. While all JUnit tests pass from the command line with Gradle, many will fail when run from IDEA.
Resolving this is a work in progress. If attempting to run all JUnit tests from within IDEA, you will
@@ -28,6 +28,6 @@ You'll notice these files are already intentionally in .gitignore. The same poli
## FAQ
-Q. What about IDEA's own [Gradle support](http://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?
+Q. What about IDEA's own [Gradle support](https://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?
-A. Keep an eye on http://youtrack.jetbrains.com/issue/IDEA-53476
+A. Keep an eye on https://youtrack.jetbrains.com/issue/IDEA-53476
diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
index bc3235b9d9d..bd29e4316d0 100644
--- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
+++ b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
@@ -7,8 +7,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+ } XML. {@link #getPropertyDescriptors()} returns all
* existing property descriptors from the wrapped {@code BeanInfo} as well any added for
* non-void returning setters. Both standard ("non-indexed") and
- *
+ *
* indexed properties are fully supported.
*
* @author Chris Beams
@@ -137,7 +137,7 @@ class ExtendedBeanInfo implements BeanInfo {
}
// Sort non-void returning write methods to guard against the ill effects of
// non-deterministic sorting of methods returned from Class#getDeclaredMethods
- // under JDK 7. See http://bugs.sun.com/view_bug.do?bug_id=7023180
+ // under JDK 7. See https://bugs.java.com/view_bug.do?bug_id=7023180
Collections.sort(matches, new Comparator() {
@Override
public int compare(Method m1, Method m2) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
index e204d426fcd..1434cfe2129 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
@@ -111,7 +111,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
* {@code beanRefFactory.xml} definition file:
*
*
<?xml version="1.0" encoding="UTF-8"?>
- * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
*
* <beans>
*
@@ -141,7 +141,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
* Another relatively simple variation of the {@code beanRefFactory.xml} definition file could be:
*
*
<?xml version="1.0" encoding="UTF-8"?>
- * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
*
* <beans>
* <!-- child of util -->
@@ -234,7 +234,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
* {@code beanRefFactory.xml} file inside jar for services module:
*
*
<?xml version="1.0" encoding="UTF-8"?>
- * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
*
* <beans>
* <!-- child of data-access -->
@@ -255,7 +255,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
* a name known to this module:
*
*
<?xml version="1.0" encoding="UTF-8"?>
- * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+ * <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
*
* <beans>
* <!-- define an alias for "com.mycompany.myapp.services" -->
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
index 5f303858907..c0c3bae2949 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
@@ -67,11 +67,11 @@ public abstract class YamlProcessor {
* to properties before the match is made. E.g.
*
*
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
index 0834baa9e5e..318ed880932 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
@@ -6,7 +6,7 @@
* Builds on the org.springframework.beans package.
*
*
This package and related packages are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*/
package org.springframework.beans.factory;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
index 2754e7806cb..39c14bdd8cf 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
@@ -1447,7 +1447,7 @@ public class BeanDefinitionParserDelegate {
if (handler != null) {
return handler.decorate(node, originalDef, new ParserContext(this.readerContext, this, containingBd));
}
- else if (namespaceUri != null && namespaceUri.startsWith("http://www.springframework.org/")) {
+ else if (namespaceUri != null && namespaceUri.startsWith("https://www.springframework.org/")) {
error("Unable to locate Spring NamespaceHandler for XML schema namespace [" + namespaceUri + "]", node);
}
else {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
index 5f3edffff8a..9d8aaa8c203 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
@@ -33,7 +33,7 @@ import org.springframework.core.io.Resource;
*
Fetches "spring-beans-2.0.dtd" from the class path resource
* "/org/springframework/beans/factory/xml/spring-beans-2.0.dtd",
* no matter whether specified as some local URL that includes "spring-beans"
- * in the DTD name or as "http://www.springframework.org/dtd/spring-beans-2.0.dtd".
+ * in the DTD name or as "https://www.springframework.org/dtd/spring-beans-2.0.dtd".
*
* @author Juergen Hoeller
* @author Colin Sampaleanu
diff --git a/spring-beans/src/main/java/org/springframework/beans/package-info.java b/spring-beans/src/main/java/org/springframework/beans/package-info.java
index 6b4466dbea8..d878846387c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/package-info.java
@@ -6,7 +6,7 @@
* singly or in bulk.
*
*
The classes in this package are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*/
package org.springframework.beans;
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
index edb9aca7b3c..669bd05f43f 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
@@ -34,7 +34,7 @@
XML documents that conform to this DTD should declare the following doctype:
+ "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
-->
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
index 509c0eeaeee..e5be655ccaf 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
index eb04ecff4a5..b76bfe3d799 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
index 287e31ba81c..ad4c9daceed 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
index 9b5774a46c4..4cf6f846ec8 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd
index f7a754aa6c2..e24d757f64a 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd
index 40f34f9f216..939c3fd2549 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd
index 836c4a95b0c..94499792147 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd
index 67651bcee17..8361f9ba901 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
index 5099a6cec7a..8dc92e7eec1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -572,7 +572,7 @@ public class ExtendedBeanInfoTests {
* IntrospectionException regarding a "type mismatch between indexed and non-indexed
* methods" intermittently (approximately one out of every four times) under JDK 7
* due to non-deterministic results from {@link Class#getDeclaredMethods()}.
- * See http://bugs.sun.com/view_bug.do?bug_id=7023180
+ * See https://bugs.java.com/view_bug.do?bug_id=7023180
* @see #cornerSpr9702()
*/
@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index f0bd263ebdf..b2ccb6f5fca 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1654,7 +1654,7 @@ public class DefaultListableBeanFactoryTests {
/**
* Verifies that a dependency on a {@link FactoryBean} can be autowired
* by type, specifically addressing the JIRA issue raised in SPR-4040.
*/
@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index 185a1871f05..0cacbea69a3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -1207,7 +1207,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
* Verifies that a dependency on a {@link FactoryBean} can be autowired via
* {@link Autowired @Autowired}, specifically addressing the JIRA issue
* raised in SPR-4040.
*/
@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index 4b86e8d0752..1d58f06ea45 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -551,7 +551,7 @@ public class InjectAnnotationBeanPostProcessorTests {
* Verifies that a dependency on a {@link org.springframework.beans.factory.FactoryBean} can be autowired via
* {@link org.springframework.beans.factory.annotation.Autowired @Inject}, specifically addressing the JIRA issue
* raised in SPR-4040.
*/
@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index 377d77907b5..f989ac071c5 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -650,7 +650,7 @@ public class BeanFactoryGenericsTests {
new ClassPathResource("genericBeanTests.xml", getClass()));
UrlSet us = (UrlSet) bf.getBean("setBean");
assertEquals(1, us.size());
- assertEquals(new URL("http://www.springframework.org"), us.iterator().next());
+ assertEquals(new URL("https://www.springframework.org"), us.iterator().next());
}
/**
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
index 75fd185bcfa..ed72c6fedcc 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URIEditorTests.java
@@ -52,22 +52,22 @@ public class URIEditorTests {
@Test
public void standardURL() throws Exception {
- doTestURI("http://www.springframework.org");
+ doTestURI("https://www.springframework.org");
}
@Test
public void standardURLWithFragment() throws Exception {
- doTestURI("http://www.springframework.org#1");
+ doTestURI("https://www.springframework.org#1");
}
@Test
public void standardURLWithWhitespace() throws Exception {
PropertyEditor uriEditor = new URIEditor();
- uriEditor.setAsText(" http://www.springframework.org ");
+ uriEditor.setAsText(" https://www.springframework.org ");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
URI uri = (URI) value;
- assertEquals("http://www.springframework.org", uri.toString());
+ assertEquals("https://www.springframework.org", uri.toString());
}
@Test
@@ -122,23 +122,23 @@ public class URIEditorTests {
@Test
public void encodeURI() throws Exception {
PropertyEditor uriEditor = new URIEditor();
- uriEditor.setAsText("http://example.com/spaces and \u20AC");
+ uriEditor.setAsText("https://example.com/spaces and \u20AC");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
- assertEquals("http://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
+ assertEquals("https://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
}
@Test
public void encodeAlreadyEncodedURI() throws Exception {
PropertyEditor uriEditor = new URIEditor(false);
- uriEditor.setAsText("http://example.com/spaces%20and%20%E2%82%AC");
+ uriEditor.setAsText("https://example.com/spaces%20and%20%E2%82%AC");
Object value = uriEditor.getValue();
assertTrue(value instanceof URI);
URI uri = (URI) value;
assertEquals(uri.toString(), uriEditor.getAsText());
- assertEquals("http://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
+ assertEquals("https://example.com/spaces%20and%20%E2%82%AC", uri.toASCIIString());
}
}
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
index 29a6dae2ff0..e083f3dfdd6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/URLEditorTests.java
@@ -44,7 +44,7 @@ public final class URLEditorTests {
@Test
public void testStandardURL() throws Exception {
PropertyEditor urlEditor = new URLEditor();
- urlEditor.setAsText("http://www.springframework.org");
+ urlEditor.setAsText("https://www.springframework.org");
Object value = urlEditor.getValue();
assertTrue(value instanceof URL);
URL url = (URL) value;
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
index edb951a4ce5..39d81029a96 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/package-info.java
@@ -1,6 +1,6 @@
/**
* Support classes for the open source cache
- * EhCache 2.x,
+ * EhCache 2.x,
* allowing to set up an EhCache CacheManager and Caches
* as beans in a Spring context.
*
diff --git a/spring-context-support/src/main/java/org/springframework/cache/guava/package-info.java b/spring-context-support/src/main/java/org/springframework/cache/guava/package-info.java
index 6f892820a98..6668c00c5eb 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/guava/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/guava/package-info.java
@@ -1,6 +1,6 @@
/**
* Support classes for the open source cache in Google's
- * Guava library,
+ * Guava library,
* allowing to set up Guava caches within Spring's cache abstraction.
*/
package org.springframework.cache.guava;
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
index 7fa9d5b587f..d6b298b0d9d 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
@@ -116,7 +116,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
* realized through adding the {@code @PersistJobDataAfterExecution} and
* {@code @DisallowConcurrentExecution} markers.
* More information on stateful versus stateless jobs can be found
- * here.
+ * here.
*
The default setting is to run jobs concurrently.
*/
public void setConcurrent(boolean concurrent) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
index df50ca80d70..a6935a81800 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java
@@ -1,6 +1,6 @@
/**
* Support classes for the open source scheduler
- * Quartz,
+ * Quartz,
* allowing to set up Quartz Schedulers, JobDetails and
* Triggers as beans in a Spring context. Also provides
* convenience classes for implementing Quartz Jobs.
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
index 28fbe3bf516..56b6bba0aba 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java
@@ -1,6 +1,6 @@
/**
* Support classes for setting up
- * FreeMarker
+ * FreeMarker
* within a Spring application context.
*/
package org.springframework.ui.freemarker;
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
index 36409cf3940..f41e9c1cad2 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java
@@ -1,6 +1,6 @@
/**
* Support classes for setting up
- * Velocity
+ * Velocity
* within a Spring application context.
*/
package org.springframework.ui.velocity;
diff --git a/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types b/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types
index 08b43938d48..1e9ce6776de 100644
--- a/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types
+++ b/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types
@@ -47,7 +47,7 @@ video/x-msvideo avi
################################################################################
#
# Additional file types adapted from
-# http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html
+# https://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html
# kindly re-licensed to Apache Software License 2.0 by Ian Graham.
#
################################################################################
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
index 487956b5788..95ca35dee33 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
@@ -31,7 +31,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
* target implements. Exists primarily for third-party framework integration.
* Users should favor the {@code cache:} XML namespace
* {@link org.springframework.cache.annotation.Cacheable @Cacheable} annotation.
- * See the declarative annotation-based caching section
+ * See the declarative annotation-based caching section
* of the Spring reference documentation for more information.
*
* @author Costin Leau
diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
index 1e8b5c043a7..8003c999b95 100644
--- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
+++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
@@ -41,7 +41,7 @@ import org.springframework.core.NamedThreadLocal;
*
*
Thanks to Eugene Kuleshov for submitting the original prototype for a thread scope!
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
index 523280e2e41..90f3c27142d 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
@@ -12,7 +12,7 @@
* affecting code using business objects.
*
*
However, the implementation and naming of classes in this package has changed.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
index 49adace5743..55be70d9e44 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
@@ -34,8 +34,8 @@ import org.springframework.jmx.MBeanServerNotFoundException;
* which uses standard JMX 1.2 API to access the platform's MBeanServer.
*
*
See the javadocs for WebSphere's
- * {@code AdminServiceFactory}
- * and {@code MBeanFactory}.
+ * {@code AdminServiceFactory}
+ * and {@code MBeanFactory}.
*
* @author Juergen Hoeller
* @author Rob Harrop
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
index 7cf7870b1cf..1761e979dba 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
@@ -28,7 +28,7 @@ import org.springframework.core.env.PropertySource;
* {@link JndiLocatorDelegate#setResourceRef(boolean) "resourceRef"} property set to
* {@code true}, meaning that names looked up will automatically be prefixed with
* "java:comp/env/" in alignment with published
- * JNDI
+ * JNDI
* naming conventions. To override this setting or to change the prefix, manually
* configure a {@code JndiLocatorDelegate} and provide it to one of the constructors here
* that accepts it. The same applies when providing custom JNDI properties. These should
diff --git a/spring-context/src/main/java/org/springframework/jndi/package-info.java b/spring-context/src/main/java/org/springframework/jndi/package-info.java
index 55bbba27ce4..dc4b5ad2c92 100644
--- a/spring-context/src/main/java/org/springframework/jndi/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jndi/package-info.java
@@ -4,7 +4,7 @@
* and provide useful superclasses for JNDI access classes.
*
*
The classes in this package are discussed in Chapter 11 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*/
package org.springframework.jndi;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
index ca74697904c..81dcc1ef691 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
@@ -179,7 +179,7 @@ public abstract class RmiClientInterceptorUtils {
* connection failure.
*
This is relevant on the IBM JVM, in particular for WebSphere EJB clients.
*
{@code jsr166.jar}, containing {@code java.util.concurrent} updates for Java 6, can be obtained
* from the concurrency interest website.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
index c096ee8fbc6..f7953ae9d8e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
/**
* Date sequence generator for a
- * Crontab pattern,
+ * Crontab pattern,
* allowing clients to specify a pattern that the sequence matches.
*
*
If you run into the "Unsupported protocol: jmxmp" error, you will need to
- * download the JMX
+ * download the JMX
* Remote API 1.0.1_04 Reference Implementation from Oracle and extract
* {@code jmxremote_optional.jar} into your classpath, for example in the {@code lib/ext}
* folder of your JVM.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
index 395b106701d..f8fbdd64e9c 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
@@ -74,7 +74,7 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler
}
/*
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2754
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2754
*/
@Test
public void testIsNotIgnoredDoesntIgnoreUnspecifiedBeanMethods() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
index 1110206e149..b9377b3877a 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
@@ -1,7 +1,7 @@
package org.springframework.scripting.jruby;
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-3026
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-3026
*
* @author Rick Evans
*/
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
index a7f613bd4be..854d20faff2 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
@@ -19,7 +19,7 @@ package org.springframework.scripting.jruby;
import java.util.Map;
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-3038
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-3038
*
* @author Rick Evans
*/
diff --git a/spring-core/src/main/java/org/springframework/asm/package-info.java b/spring-core/src/main/java/org/springframework/asm/package-info.java
index 98c9a0d8ca8..423d2860b26 100644
--- a/spring-core/src/main/java/org/springframework/asm/package-info.java
+++ b/spring-core/src/main/java/org/springframework/asm/package-info.java
@@ -1,6 +1,6 @@
/**
* Spring's repackaging of
- * org.objectweb.asm 5.0
+ * org.objectweb.asm 5.0
* (for internal use only).
*
*
This repackaging technique avoids any potential conflicts with
@@ -9,7 +9,7 @@
*
*
As this repackaging happens at the class file level, sources
* and javadocs are not available here. See the original ObjectWeb
- * ASM 5.0 javadocs
+ * ASM 5.0 javadocs
* for details when working with these classes.
*/
package org.springframework.asm;
diff --git a/spring-core/src/main/java/org/springframework/cglib/package-info.java b/spring-core/src/main/java/org/springframework/cglib/package-info.java
index 78ef762beed..c2280f974e9 100644
--- a/spring-core/src/main/java/org/springframework/cglib/package-info.java
+++ b/spring-core/src/main/java/org/springframework/cglib/package-info.java
@@ -9,7 +9,7 @@
*
*
As this repackaging happens at the class file level, sources
* and javadocs are not available here. See the original
- * CGLIB 3.2 javadocs
+ * CGLIB 3.2 javadocs
* for details when working with these classes.
*/
package org.springframework.cglib;
diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
index 8d946c6845a..a77a0380ac0 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -36,7 +36,7 @@ import org.springframework.util.ReflectionUtils;
* When attempting to locate annotations on {@link Method Methods}, it is wise to check
* for bridge {@link Method Methods} as appropriate and find the bridged {@link Method}.
*
- *
See
* The Java Language Specification for more details on the use of bridge methods.
*
* @author Rob Harrop
@@ -203,8 +203,8 @@ public abstract class BridgeMethodResolver {
/**
* Compare the signatures of the bridge method and the method which it bridges. If
* the parameter and return types are the same, it is a 'visibility' bridge method
- * introduced in Java 6 to fix http://bugs.sun.com/view_bug.do?bug_id=6342411.
- * See also http://stas-blogspot.blogspot.com/2010/03/java-bridge-methods-explained.html
+ * introduced in Java 6 to fix https://bugs.java.com/view_bug.do?bug_id=6342411.
+ * See also https://stas-blogspot.blogspot.com/2010/03/java-bridge-methods-explained.html
* @return whether signatures match as described
*/
public static boolean isVisibilityBridgeMethodPair(Method bridgeMethod, Method bridgedMethod) {
diff --git a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
index ed0263c89bf..c49cae6a1a1 100644
--- a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
* @author Arjen Poutsma
* @author Rossen Stoyanchev
* @since 3.2
- * @see Neal Gafter on Super Type Tokens
+ * @see Neal Gafter on Super Type Tokens
*/
public abstract class ParameterizedTypeReference {
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index 602ac06bd62..6b466088b96 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
/**
* {@link PathMatcher} implementation for Ant-style path patterns.
*
- *
Part of this mapping code has been kindly borrowed from Apache Ant.
+ *
Part of this mapping code has been kindly borrowed from Apache Ant.
*
*
The mapping matches URLs using the following rules:
*
diff --git a/spring-core/src/main/java/org/springframework/util/Assert.java b/spring-core/src/main/java/org/springframework/util/Assert.java
index 78db1a2c499..d5cb0847f68 100644
--- a/spring-core/src/main/java/org/springframework/util/Assert.java
+++ b/spring-core/src/main/java/org/springframework/util/Assert.java
@@ -43,7 +43,7 @@ import java.util.Map;
* Assert.isTrue(i > 0, "The value must be greater than zero");
*
*
Mainly for internal use within the framework; consider
- * Apache's Commons Lang
+ * Apache's Commons Lang
* for a more comprehensive suite of {@code String} utilities.
*
* @author Keith Donald
diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
index 6745107caf7..e7633e0afed 100644
--- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
@@ -25,7 +25,7 @@ import java.security.NoSuchAlgorithmException;
* Miscellaneous methods for calculating digests.
*
*
Mainly for internal use within the framework; consider
- * Apache Commons Codec
+ * Apache Commons Codec
* for a more comprehensive suite of digest utilities.
*
* @author Arjen Poutsma
diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java
index 97af97eee68..929d58e7361 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeType.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeType.java
@@ -177,7 +177,7 @@ public class MimeType implements Comparable, Serializable {
* Checks the given token string for illegal characters, as defined in RFC 2616,
* section 2.2.
* @throws IllegalArgumentException in case of illegal characters
- * @see HTTP 1.1, section 2.2
+ * @see HTTP 1.1, section 2.2
*/
private void checkToken(String token) {
for (int i = 0; i < token.length(); i++ ) {
diff --git a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
index bfe29d27643..0e90bcc84f6 100644
--- a/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
@@ -322,7 +322,7 @@ public abstract class MimeTypeUtils {
*
audio/basic == text/html
audio/basic ==
* audio/wave
* @param mimeTypes the list of mime types to be sorted
- * @see HTTP 1.1: Semantics
+ * @see HTTP 1.1: Semantics
* and Content, section 5.3.2
*/
public static void sortBySpecificity(List mimeTypes) {
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 76672d1f4f9..f2a16dbd827 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -35,7 +35,7 @@ import java.util.TimeZone;
* Miscellaneous {@link String} utility methods.
*
*
Mainly for internal use within the framework; consider
- * Apache's Commons Lang
+ * Apache's Commons Lang
* for a more comprehensive suite of {@code String} utilities.
*
*
This class delivers some simple functionality that should really be
diff --git a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
index 3904faaac9c..b2bb40edc0d 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
@@ -66,7 +66,7 @@ public abstract class TransformerUtils {
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
try {
// Xalan-specific, but this is the most common XSLT engine in any case
- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", String.valueOf(indentAmount));
+ transformer.setOutputProperty("{https://xml.apache.org/xslt}indent-amount", String.valueOf(indentAmount));
}
catch (IllegalArgumentException ignored) {
}
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
index 2ec796015d7..56102feaaa0 100644
--- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -395,12 +395,12 @@ public class StandardEnvironmentTests {
SecurityManager securityManager = new SecurityManager() {
@Override
public void checkPropertiesAccess() {
- // see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperties()
+ // see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperties()
throw new AccessControlException("Accessing the system properties is disallowed");
}
@Override
public void checkPropertyAccess(String key) {
- // see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperty(java.lang.String)
+ // see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperty(java.lang.String)
if (DISALLOWED_PROPERTY_NAME.equals(key)) {
throw new AccessControlException(
String.format("Accessing the system property [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
@@ -462,11 +462,11 @@ public class StandardEnvironmentTests {
SecurityManager securityManager = new SecurityManager() {
@Override
public void checkPermission(Permission perm) {
- //see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv()
+ //see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv()
if ("getenv.*".equals(perm.getName())) {
throw new AccessControlException("Accessing the system environment is disallowed");
}
- //see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv(java.lang.String)
+ //see https://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv(java.lang.String)
if (("getenv."+DISALLOWED_PROPERTY_NAME).equals(perm.getName())) {
throw new AccessControlException(
String.format("Accessing the system environment variable [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
index 64fbfdaad07..e763f21f09d 100644
--- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
@@ -180,7 +180,7 @@ public class ResourceTests {
@Ignore @Test // this test is quite slow. TODO: re-enable with JUnit categories
public void testNonFileResourceExists() throws Exception {
- Resource resource = new UrlResource("http://www.springframework.org");
+ Resource resource = new UrlResource("https://www.springframework.org");
assertTrue(resource.exists());
}
diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
index 85f0b45240c..c829b1d905e 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
@@ -44,7 +44,7 @@ public abstract class AbstractStaxHandlerTestCase {
private static final String COMPLEX_XML =
"" +
- "" +
+ "" +
"characters " +
"" +
"";
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 091d4197da4..be297f287eb 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
@@ -50,7 +50,7 @@ public class SimpleNamespaceContextTests {
@Test
public void getNamespaceURI() {
context.bindNamespaceUri(XMLConstants.XMLNS_ATTRIBUTE, additionalNamespaceUri);
- assertThat("Always returns \"http://www.w3.org/2000/xmlns/\" for \"xmlns\"",
+ assertThat("Always returns \"https://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 \"http://www.w3.org/XML/1998/namespace\" for \"xml\"",
@@ -76,7 +76,7 @@ public class SimpleNamespaceContextTests {
@Test
public void getPrefix() {
- assertThat("Always returns \"xmlns\" for \"http://www.w3.org/2000/xmlns/\"",
+ assertThat("Always returns \"xmlns\" for \"https://www.w3.org/2000/xmlns/\"",
context.getPrefix(XMLConstants.XMLNS_ATTRIBUTE_NS_URI), is(XMLConstants.XMLNS_ATTRIBUTE));
assertThat("Always returns \"xml\" for \"http://www.w3.org/XML/1998/namespace\"",
context.getPrefix(XMLConstants.XML_NS_URI), is(XMLConstants.XML_NS_PREFIX));
@@ -103,7 +103,7 @@ public class SimpleNamespaceContextTests {
@Test
public void getPrefixes() {
- assertThat("Returns only \"xmlns\" for \"http://www.w3.org/2000/xmlns/\"",
+ assertThat("Returns only \"xmlns\" for \"https://www.w3.org/2000/xmlns/\"",
getItemSet(context.getPrefixes(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)),
is(makeSet(XMLConstants.XMLNS_ATTRIBUTE)));
assertThat("Returns only \"xml\" for \"http://www.w3.org/XML/1998/namespace\"",
diff --git a/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
index 119ac7b9607..4fe5e1f6e70 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
@@ -42,7 +42,7 @@ public class TransformerUtilsTests {
String indent = transformer.getOutputProperty(OutputKeys.INDENT);
assertNotNull(indent);
assertEquals("yes", indent);
- String indentAmount = transformer.getOutputProperty("{http://xml.apache.org/xslt}indent-amount");
+ String indentAmount = transformer.getOutputProperty("{https://xml.apache.org/xslt}indent-amount");
assertNotNull(indentAmount);
assertEquals(String.valueOf(TransformerUtils.DEFAULT_INDENT_AMOUNT), indentAmount);
}
@@ -55,7 +55,7 @@ public class TransformerUtilsTests {
String indent = transformer.getOutputProperty(OutputKeys.INDENT);
assertNotNull(indent);
assertEquals("yes", indent);
- String indentAmount = transformer.getOutputProperty("{http://xml.apache.org/xslt}indent-amount");
+ String indentAmount = transformer.getOutputProperty("{https://xml.apache.org/xslt}indent-amount");
assertNotNull(indentAmount);
assertEquals(indentAmountProperty, indentAmount);
}
diff --git a/spring-expression/readme.txt b/spring-expression/readme.txt
index f374935be6c..ea0720e5961 100644
--- a/spring-expression/readme.txt
+++ b/spring-expression/readme.txt
@@ -31,7 +31,7 @@ Syntax
- Need to agree on a standard date format for 'default' processing of dates. Currently it is:
formatter = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss z", Locale.UK);
// this is something of this format: "Wed, 4 Jul 2001 12:08:56 GMT"
- // http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html
+ // https://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html
- See LiteralTests for Date (4,5,6) - should date take an expression rather than be hardcoded in the grammar
to take 2 strings only?
- when doing arithmetic, eg. 8.4 / 4 and the user asks for an Integer return type - do we silently coerce or
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index 90a8e96157a..c9ae44eeeef 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -31,7 +31,7 @@ import org.springframework.util.NumberUtils;
* Implements the {@code multiply} operator.
*
*
If any of the operands is of a reference type, unboxing conversion (Section 5.1.8)
diff --git a/spring-framework-bom/spring-framework-bom.txt b/spring-framework-bom/spring-framework-bom.txt
index 4799dfae8a5..eebed5a73bd 100644
--- a/spring-framework-bom/spring-framework-bom.txt
+++ b/spring-framework-bom/spring-framework-bom.txt
@@ -1,4 +1,4 @@
This meta-project is used to generate a bill-of-materials POM that contains the other
projects in a dependencyManagement section.
-
+
diff --git a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
index 2323f973840..ad5ed41671d 100644
--- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
+++ b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
@@ -30,8 +30,8 @@ import org.springframework.instrument.classloading.WeavingTransformer;
* to loaded classes without the need to use a VM-wide agent.
*
*
To be registered using a
- * {@code Loader} tag
- * in Tomcat's {@code Context}
+ * {@code Loader} tag
+ * in Tomcat's {@code Context}
* definition in the {@code server.xml} file, with the Spring-provided "spring-instrument-tomcat.jar"
* file deployed into Tomcat's "lib" directory. The required configuration tag looks as follows:
*
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
index 0bf0d9705b6..f791b8eaba3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
@@ -53,8 +53,8 @@ import org.springframework.util.ClassUtils;
* bean definition to a local DataSource (which is simpler and thus recommended).
*
*
If you need a "real" connection pool outside of a J2EE container, consider
- * Apache Commons DBCP
- * or C3P0.
+ * Apache Commons DBCP
+ * or C3P0.
* Commons DBCP's BasicDataSource and C3P0's ComboPooledDataSource are full
* connection pool beans, supporting the same basic properties as this class
* plus specific settings (such as minimal/maximal pool size etc).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
index ea6af514f8d..51bf48ed9b4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
@@ -40,8 +40,8 @@ import org.springframework.util.Assert;
* for seamless switching to and from a local DataSource bean like this class.
*
*
If you need a "real" connection pool outside of a J2EE container, consider
- * Apache Commons DBCP
- * or C3P0.
+ * Apache Commons DBCP
+ * or C3P0.
* Commons DBCP's BasicDataSource and C3P0's ComboPooledDataSource are full
* connection pool beans, supporting the same basic properties as this class
* plus specific settings (such as minimal/maximal pool size etc).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
index 4f3681e67f8..8b0134bbda3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
*
*
Uses IBM-specific API to get a JDBC Connection with a specific isolation
* level (and read-only flag) from a WebSphere DataSource
- * (IBM code example).
+ * (IBM code example).
* Supports the transaction-specific isolation level exposed by
* {@link org.springframework.transaction.support.TransactionSynchronizationManager#getCurrentTransactionIsolationLevel()}.
* It's also possible to specify a default isolation level, to be applied when the
@@ -147,8 +147,8 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter
* Create a WebSphere {@code JDBCConnectionSpec} object for the given charateristics.
*
The default implementation uses reflection to apply the given settings.
* Can be overridden in subclasses to customize the JDBCConnectionSpec object
- * (JDBCConnectionSpec javadoc;
- * IBM developerWorks article).
+ * (JDBCConnectionSpec javadoc;
+ * IBM developerWorks article).
* @param isolationLevel the isolation level to apply (or {@code null} if none)
* @param readOnlyFlag the read-only flag to apply (or {@code null} if none)
* @param username the username to apply ({@code null} or empty indicates the default)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
index 1dfc47c03d4..81f2b6984c6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
@@ -28,10 +28,10 @@ public enum EmbeddedDatabaseType {
/** The Hypersonic Embedded Java SQL Database (http://hsqldb.org) */
HSQL,
- /** The H2 Embedded Java SQL Database Engine (http://h2database.com) */
+ /** The H2 Embedded Java SQL Database Engine (https://h2database.com) */
H2,
- /** The Apache Derby Embedded SQL Database (http://db.apache.org/derby) */
+ /** The Apache Derby Embedded SQL Database (https://db.apache.org/derby) */
DERBY
}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
index 6bbe5166b95..2b0b52d2826 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
@@ -11,7 +11,7 @@
* RDBMS-specific error handling.
*
*
This package and related packages are discussed in Chapter 9 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*/
package org.springframework.jdbc.object;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
index 1a05b52b1b2..ae386277539 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
@@ -14,7 +14,7 @@
*
*
*
This package and related packages are discussed in Chapter 9 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*/
package org.springframework.jdbc;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
index 2723fc8a89b..13b8ed978dc 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
@@ -134,7 +134,7 @@ public class OracleLobHandler extends AbstractLobHandler {
*
A common choice is {@code SimpleNativeJdbcExtractor}, whose Connection unwrapping
* (which is what OracleLobHandler needs) will work with many connection pools.
* See {@code SimpleNativeJdbcExtractor} and
- *
+ *
* oracle.jdbc.OracleConnection javadoc for details.
* @see org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor#getNativeConnectionFromStatement
* @see org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor
@@ -150,8 +150,8 @@ public class OracleLobHandler extends AbstractLobHandler {
*
*/
public void setReleaseResourcesAfterRead(boolean releaseResources) {
@@ -187,12 +187,12 @@ public class OracleLobHandler extends AbstractLobHandler {
* DURATION_SESSION, MODE_READWRITE and MODE_READONLY constants defined there.
*
* @param con the Oracle Connection, for using the exact same class loader
* that the Oracle driver was loaded with
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
index 1b1ad19b609..11ced40bd68 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
index 9b8edee5ac6..38d6cbd64d1 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd
index a6618a59188..c170c578cf6 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd
index 7ff5db8b5ee..d87d159d7ea 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd
index 60d395843ea..24d2e0c8dbb 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd
index c5f03511f4f..b6cd0c9f53c 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
index 5976262b65a..a96e33402fc 100644
--- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
+++ b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
@@ -7,7 +7,7 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ * @see
* STOMP Specification 1.2 DISCONNECT
*/
private void afterDisconnectSent(StompHeaderAccessor accessor) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompClientSupport.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompClientSupport.java
index 268f4fa262a..2c10f7aa379 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompClientSupport.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompClientSupport.java
@@ -95,8 +95,8 @@ public abstract class StompClientSupport {
* that default and for example set it to "0,0" if they require a
* TaskScheduler to be configured first.
* @param heartbeat the value for the CONNECT "heart-beat" header
- * @see
- * http://stomp.github.io/stomp-specification-1.2.html#Heart-beating
+ * @see
+ * https://stomp.github.io/stomp-specification-1.2.html#Heart-beating
*/
public void setDefaultHeartbeat(long[] heartbeat) {
if (heartbeat == null || heartbeat.length != 2 || heartbeat[0] < 0 || heartbeat[1] < 0) {
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
index 6ff8778c8c4..1c2a0d7d030 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
@@ -245,7 +245,7 @@ public class StompDecoder {
/**
* See STOMP Spec 1.2:
- * "Value Encoding".
+ * "Value Encoding".
*/
private String unescape(String inString) {
StringBuilder sb = new StringBuilder(inString.length());
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
index e43003f03cc..efed32d501b 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
@@ -153,7 +153,7 @@ public class StompEncoder {
/**
* See STOMP Spec 1.2:
- * "Value Encoding".
+ * "Value Encoding".
*/
private String escape(String inString) {
StringBuilder sb = new StringBuilder(inString.length());
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
index 90c4bf16929..8c830fc8c47 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
@@ -45,8 +45,8 @@ import org.springframework.util.StringUtils;
*
* @author Rossen Stoyanchev
* @since 4.2
- * @see
- * http://stomp.github.io/stomp-specification-1.2.html#Frames_and_Headers
+ * @see
+ * https://stomp.github.io/stomp-specification-1.2.html#Frames_and_Headers
*/
public class StompHeaders implements MultiValueMap, Serializable {
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
index 888b8596943..d5d4ad4eaac 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
@@ -74,7 +74,7 @@ public class SimpMessagingTemplateTests {
@Test
public void convertAndSendToUserWithEncoding() {
- this.messagingTemplate.convertAndSendToUser("http://joe.openid.example.org/", "/queue/foo", "data");
+ this.messagingTemplate.convertAndSendToUser("https://joe.openid.example.org/", "/queue/foo", "data");
List> messages = this.messageChannel.getMessages();
assertEquals(1, messages.size());
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
index 4f21f074790..737d829270b 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
@@ -151,7 +151,7 @@ public class DefaultUserDestinationResolverTests {
@Test
public void handleMessageEncodedUserName() {
- String userName = "http://joe.openid.example.org/";
+ String userName = "https://joe.openid.example.org/";
TestSimpUser simpUser = new TestSimpUser(userName);
simpUser.addSessions(new TestSimpSession("openid123"));
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java
index 7b2fc619030..11cb546f664 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java
@@ -1,6 +1,6 @@
/**
* Package providing integration of
- * Hibernate 4.x
+ * Hibernate 4.x
* with Spring concepts.
*
*
Contains an implementation of Spring's transaction SPI for local Hibernate transactions.
diff --git a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java
index 1211ac0098f..7ed747c228a 100644
--- a/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java
+++ b/spring-orm-hibernate5/src/main/java/org/springframework/orm/hibernate5/package-info.java
@@ -1,6 +1,6 @@
/**
* Package providing integration of
- * Hibernate 5.x
+ * Hibernate 5.x
* with Spring concepts.
*
*
Contains an implementation of Spring's transaction SPI for local Hibernate transactions.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
index 347980f8e0b..7f607fa36e4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
@@ -1,6 +1,6 @@
/**
* Package providing integration of
- * Hibernate 3.x
+ * Hibernate 3.x
* with Spring concepts.
*
*
Contains SessionFactory helper classes, a template plus callback
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index 17b8b8e7c19..55a36b4b660 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -62,7 +62,7 @@ import org.springframework.util.StringUtils;
*
*
When using Xerces, make sure a post 2.0.2 version is available on the classpath
* to avoid a critical
- * bug
+ * bug
* that leads to StackOverflow. Maven users are likely to encounter this problem since
* 2.0.2 is used by default.
*
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
index 3c019402923..1c59aa1ff87 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java
@@ -1,5 +1,5 @@
/**
- * Package providing integration of Castor
+ * Package providing integration of Castor
* within Spring's O/X Mapping support.
*/
package org.springframework.oxm.castor;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 01c2329d02b..c198190dd79 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -589,7 +589,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi
supportsInternal(classArgument, false));
}
else if (typeArgument instanceof GenericArrayType) {
- // Only on JDK 6 - see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784
+ // Only on JDK 6 - see https://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784
GenericArrayType arrayType = (GenericArrayType) typeArgument;
return (Byte.TYPE == arrayType.getGenericComponentType());
}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
index 8d0d6c2457a..f007460c653 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java
@@ -1,5 +1,5 @@
/**
- * Package providing integration of JAXB
+ * Package providing integration of JAXB
* with Spring's O/X Mapping support.
*/
package org.springframework.oxm.jaxb;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
index 730341079f2..1fd20186ee5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
@@ -24,23 +24,23 @@ import javax.activation.DataHandler;
*
* @author Arjen Poutsma
* @since 3.0
- * @see XML-binary Optimized Packaging
+ * @see XML-binary Optimized Packaging
*/
public interface MimeContainer {
/**
* Indicate whether this container is a XOP package.
* @return {@code true} when the constraints specified in
- * Identifying XOP Documents
+ * Identifying XOP Documents
* are met
- * @see XOP Packages
+ * @see XOP Packages
*/
boolean isXopPackage();
/**
* Turn this message into a XOP package.
* @return {@code true} when the message actually is a XOP package
- * @see XOP Packages
+ * @see XOP Packages
*/
boolean convertToXopPackage();
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
index 48569c583bb..ab730071ed0 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeMarshaller.java
@@ -28,8 +28,8 @@ import org.springframework.oxm.XmlMappingException;
*
* @author Arjen Poutsma
* @since 3.0
- * @see SOAP Message Transmission Optimization Mechanism
- * @see XML-binary Optimized Packaging
+ * @see SOAP Message Transmission Optimization Mechanism
+ * @see XML-binary Optimized Packaging
*/
public interface MimeMarshaller extends Marshaller {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
index 331b78b2c42..96d527ac5fb 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeUnmarshaller.java
@@ -28,8 +28,8 @@ import org.springframework.oxm.XmlMappingException;
*
* @author Arjen Poutsma
* @since 3.0
- * @see SOAP Message Transmission Optimization Mechanism
- * @see XML-binary Optimized Packaging
+ * @see SOAP Message Transmission Optimization Mechanism
+ * @see XML-binary Optimized Packaging
*/
public interface MimeUnmarshaller extends Unmarshaller {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
index e7910a93e9d..ae63d99f226 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java
@@ -1,5 +1,5 @@
/**
- * Package providing integration of XMLBeans
+ * Package providing integration of XMLBeans
* with Spring's O/X Mapping support.
*/
package org.springframework.oxm.xmlbeans;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
index 5a4ab71cf5f..cbe9aca3d3a 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java
@@ -1,5 +1,5 @@
/**
- * Package providing integration of XStream
+ * Package providing integration of XStream
* with Spring's O/X Mapping support.
*/
package org.springframework.oxm.xstream;
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
index c8442c5a0b4..aa9862862fb 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd
@@ -5,8 +5,8 @@
targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
index b3807913ceb..2c9b7e02ecb 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd
@@ -5,8 +5,8 @@
targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd
index 74eaedead88..b9c3197bab2 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd
@@ -5,8 +5,8 @@
targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd
index 353b1b4bae2..ddf767f362d 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd
@@ -6,8 +6,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.1.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.1.xsd
index 666a2850394..8f58e1d64fb 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.1.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.1.xsd
@@ -6,8 +6,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd
index 8e63fdb7ae1..30ef5961f52 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd
@@ -6,8 +6,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
index 436356de2a7..225decbd045 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
@@ -79,7 +79,7 @@ public abstract class AbstractMarshallerTests {
marshaller.marshal(flights, domResult);
Document expected = builder.newDocument();
Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
- Attr namespace = expected.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:tns");
+ Attr namespace = expected.createAttributeNS("https://www.w3.org/2000/xmlns/", "xmlns:tns");
namespace.setNodeValue("http://samples.springframework.org/flight");
flightsElement.setAttributeNode(namespace);
expected.appendChild(flightsElement);
@@ -103,7 +103,7 @@ public abstract class AbstractMarshallerTests {
Document result = (Document) domResult.getNode();
Document expected = builder.newDocument();
Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
- Attr namespace = expected.createAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:tns");
+ Attr namespace = expected.createAttributeNS("https://www.w3.org/2000/xmlns/", "xmlns:tns");
namespace.setNodeValue("http://samples.springframework.org/flight");
flightsElement.setAttributeNode(namespace);
expected.appendChild(flightsElement);
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
index 6f37fa461c3..7c8901f9f07 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
@@ -82,7 +82,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests" +
"" +
"test8";
@@ -97,7 +97,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests" +
"" +
"" +
"test8";
@@ -107,7 +107,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests" +
"" +
"test8";
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
index 7f5fd105aa9..c821ad90688 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
@@ -191,7 +191,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests flightTypeJAXBElement = new JAXBElement(new QName("http://springframework.org", "flight"), FlightType.class,
+ JAXBElement flightTypeJAXBElement = new JAXBElement(new QName("https://springframework.org", "flight"), FlightType.class,
new FlightType());
assertTrue("Jaxb2Marshaller does not support JAXBElement", marshaller.supports(flightTypeJAXBElement.getClass()));
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
index 513a4e24535..919d9b4504a 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -91,9 +91,9 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests")).willReturn(dataHandler);
given(mimeContainer.getAttachment("696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png")).willReturn(dataHandler);
String content = "" + "" +
- "" +
+ "" +
"" + "" +
- "" +
+ "" +
"" +
"696cfb9a-4d2d-402f-bb5c-59fa69e7f0b3@spring-ws.png" +
"";
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
index 455c00637a1..974d4dcfd77 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
*/
public class Primitives {
- private static final QName NAME = new QName("http://springframework.org/oxm-test", "primitives");
+ private static final QName NAME = new QName("https://springframework.org/oxm-test", "primitives");
// following methods are used to test support for primitives
public JAXBElement primitiveBoolean() {
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
index 039b8e1c08e..8ce0062ec55 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
@@ -43,7 +43,7 @@ import javax.xml.namespace.QName;
*/
public class StandardClasses {
- private static final QName NAME = new QName("http://springframework.org/oxm-test", "standard-classes");
+ private static final QName NAME = new QName("https://springframework.org/oxm-test", "standard-classes");
private DatatypeFactory factory;
@@ -90,7 +90,7 @@ public class StandardClasses {
}
public JAXBElement standardClassURI() {
- return new JAXBElement(NAME, URI.class, URI.create("http://springframework.org"));
+ return new JAXBElement(NAME, URI.class, URI.create("https://springframework.org"));
}
public JAXBElement standardClassXMLGregorianCalendar() throws DatatypeConfigurationException {
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd b/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
index 92eee80e41a..bf8d3718eb6 100644
--- a/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/order.xsd
@@ -1,7 +1,7 @@
+ targetNamespace="https://samples.springframework.org/order"
+ xmlns:tns="https://samples.springframework.org/order">
diff --git a/spring-test/src/main/java/org/springframework/mock/web/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
index 720f52f5afb..eb1a1f1275c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
@@ -5,7 +5,7 @@
*
Useful for testing web contexts and controllers.
*
*
More convenient to use than dynamic mock objects
- * (EasyMock) or
+ * (EasyMock) or
* existing Servlet API mock objects
* (MockObjects).
*/
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
index 526481c681f..040710fee90 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
@@ -4,7 +4,7 @@
* Useful for testing web contexts and controllers.
*
*
More convenient to use than dynamic mock objects
- * (EasyMock) or
+ * (EasyMock) or
* existing Portlet API mock objects.
*/
package org.springframework.mock.web.portlet;
diff --git a/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
index ddb5d67f8f2..081a7044aca 100644
--- a/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
+++ b/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
@@ -22,7 +22,7 @@ import org.skyscreamer.jsonassert.JSONAssert;
* A helper class for assertions on JSON content.
*
*
Use of this class requires the JSONassert library.
+ * href="https://jsonassert.skyscreamer.org/">JSONassert library.
*
* @author Sebastien Deleuze
* @since 4.1
diff --git a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
index 72c88addd77..793d866ddba 100644
--- a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
+++ b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
@@ -58,7 +58,7 @@ public class XmlExpectationsHelper {
/**
* Parse the content as {@link DOMSource} and apply a {@link Matcher}.
- * @see xml-matchers
+ * @see xml-matchers
*/
public void assertSource(String content, Matcher matcher) throws Exception {
Document document = parseXmlString(content);
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 7c82bb78d13..e0af1f25989 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -168,7 +168,7 @@ public class ContentRequestMatchers {
/**
* Parse the request content as {@link DOMSource} and apply the given {@link Matcher}.
- * @see http://code.google.com/p/xml-matchers/
+ * @see https://code.google.com/p/xml-matchers/
*/
public RequestMatcher source(final Matcher matcher) {
return new AbstractXmlRequestMatcher() {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcher.java
index 93a19fb7582..18e30a885cd 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcher.java
@@ -43,7 +43,7 @@ import com.gargoylesoftware.htmlunit.WebRequest;
*
*
WebRequestMatcher cdnMatcher = new HostMatcher("code.jquery.com:80");
*
- *
The above {@code cdnMatcher} would match {@code "http://code.jquery.com/jquery.js"}
+ *
The above {@code cdnMatcher} would match {@code "https://code.jquery.com/jquery.js"}
* which has a default port of {@code 80} and {@code "http://code.jquery.com:80/jquery.js"}.
* However, it would not match {@code "https://code.jquery.com/jquery.js"}
* which has a default port of {@code 443}.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index 2f0b6103102..fcf959cece3 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -377,7 +377,7 @@ public class MockHttpServletRequestBuilder
* the requestURI. This is because most applications don't actually depend
* on the name under which they're deployed. If specified here, the context
* path must start with a "/" and must not end with a "/".
- * @see HttpServletRequest.getContextPath()
+ * @see HttpServletRequest.getContextPath()
*/
public MockHttpServletRequestBuilder contextPath(String contextPath) {
if (StringUtils.hasText(contextPath)) {
@@ -399,7 +399,7 @@ public class MockHttpServletRequestBuilder
* {@code "/accounts/1"} as opposed to {@code "/main/accounts/1"}.
* If specified here, the servletPath must start with a "/" and must not
* end with a "/".
- * @see HttpServletRequest.getServletPath()
+ * @see HttpServletRequest.getServletPath()
*/
public MockHttpServletRequestBuilder servletPath(String servletPath) {
if (StringUtils.hasText(servletPath)) {
@@ -417,7 +417,7 @@ public class MockHttpServletRequestBuilder
* requestURI and using any remaining part. If specified here, the pathInfo
* must start with a "/".
*
If specified, the pathInfo will be used as is.
- * @see HttpServletRequest.getServletPath()
+ * @see HttpServletRequest.getServletPath()
*/
public MockHttpServletRequestBuilder pathInfo(String pathInfo) {
if (StringUtils.hasText(pathInfo)) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index bd28eb47063..55c9c09bc6b 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -200,7 +200,7 @@ public class ContentResultMatchers {
/**
* Parse the response content as {@link DOMSource} and apply the given
* Hamcrest {@link Matcher}.
- * @see xml-matchers
+ * @see xml-matchers
*/
public ResultMatcher source(final Matcher matcher) {
return new ResultMatcher() {
@@ -237,7 +237,7 @@ public class ContentResultMatchers {
*
*
*
Use of this matcher requires the JSONassert library.
+ * href="https://jsonassert.skyscreamer.org/">JSONassert library.
*
* @param jsonContent the expected JSON content
* @param strict enables strict checking
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
index 7fc28b0aea2..7dd67870744 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockServletContextTests.java
@@ -83,7 +83,7 @@ public class MockServletContextTests {
/**
* Introduced to dispel claims in a thread on Stack Overflow:
- * Testing Spring managed servlet
+ * Testing Spring managed servlet
*/
@Test
public void getMimeTypeWithCustomConfiguredType() {
diff --git a/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesTestPropertySourceTests.java b/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesTestPropertySourceTests.java
index 7b8d8ea4197..ff902c6619e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesTestPropertySourceTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesTestPropertySourceTests.java
@@ -41,7 +41,7 @@ import static org.springframework.test.context.support.TestPropertySourceUtils.*
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@TestPropertySource(properties = { "", "foo = bar", "baz quux", "enigma: 42", "x.y.z = a=b=c",
- "server.url = http://example.com", "key.value.1: key=value", "key.value.2 key=value", "key.value.3 key:value" })
+ "server.url = https://example.com", "key.value.1: key=value", "key.value.2 key=value", "key.value.3 key:value" })
public class InlinedPropertiesTestPropertySourceTests {
@Autowired
@@ -61,7 +61,7 @@ public class InlinedPropertiesTestPropertySourceTests {
// Values containing key/value delimiters (":", "=", " ")
assertThat(property("x.y.z"), is("a=b=c"));
- assertThat(property("server.url"), is("http://example.com"));
+ assertThat(property("server.url"), is("https://example.com"));
assertThat(property("key.value.1"), is("key=value"));
assertThat(property("key.value.2"), is("key=value"));
assertThat(property("key.value.3"), is("key:value"));
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java
index b2413a373c3..d91a83b4871 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java
@@ -47,7 +47,7 @@ import static org.junit.Assert.*;
* {@link BeforeTransaction @BeforeTransaction} and
* {@link AfterTransaction @AfterTransaction} methods can fail a test in a
* TestNG environment, as requested in SPR-3960.
*
*
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
index 7a341f57306..97274401f0f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.*;
* JUnit 4 based integration test for verifying support for the
* {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
* {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
index a7279025019..efd60eadbc3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.*;
* JUnit 4 based integration test for verifying support for the
* {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
* {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
index 8bb0eabec8e..d4eb3a0291f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
* JUnit 4 based integration test for verifying support for the
* {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
* {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
index e2540cfabb6..a282649a6f4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
* JUnit 4 based integration test for verifying support for the
* {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
* {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
index 71692c80faa..f3b75c99c96 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
* JUnit 4 based integration test for verifying support for the
* {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
* {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
index 6508935647c..2f3da5a432d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
* JUnit 4 based integration test for verifying support for the
* {@link ContextConfiguration#inheritLocations() inheritLocations} flag of
* {@link ContextConfiguration @ContextConfiguration} indirectly proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
index 9c59b53fa20..2e9b6e9cbb2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
@@ -22,7 +22,7 @@ import org.junit.runners.Suite.SuiteClasses;
/**
* JUnit 4 based test suite for functionality proposed in SPR-3896.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
index 1385da61a2c..5c32bdfe37d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
/**
* Integration tests to verify claims made in SPR-6128.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
index 063a24c7161..0b33689dd0f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
@@ -101,7 +101,7 @@ public class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigur
/**
* Introduced to investigate claims made in a discussion on
- * Stack Overflow.
+ * Stack Overflow.
*/
@Test
public void buildMergedConfigWithAtWebAppConfigurationWithAnnotationAndClassesOnSuperclass() {
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
index ce647d6bbf9..753e10addbe 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
* {@link AbstractGenericContextLoader} are able to customize the
* newly created {@code ApplicationContext}. Specifically, this test
* addresses the issues raised in SPR-4008: Supply an opportunity to customize context
* before calling refresh in ContextLoaders.
*
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
index 4730d4eabbf..d36983847e4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.*;
* {@code resource locations} by a {@link GenericXmlContextLoader}
* configured via {@link ContextConfiguration @ContextConfiguration}.
* Specifically, this test addresses the issues raised in SPR-3949:
* ContextConfiguration annotation should accept not only classpath resources.
*
@@ -77,12 +77,12 @@ public class GenericXmlContextLoaderResourceLocationsTests {
class ExplicitFileLocationsTestCase {
}
- @ContextConfiguration("http://example.com/context.xml")
+ @ContextConfiguration("https://example.com/context.xml")
class ExplicitUrlLocationsTestCase {
}
@ContextConfiguration({ "context1.xml", "classpath:context2.xml", "/context3.xml",
- "file:/testing/directory/context.xml", "http://example.com/context.xml" })
+ "file:/testing/directory/context.xml", "https://example.com/context.xml" })
class ExplicitMixedPathTypesLocationsTestCase {
}
@@ -103,13 +103,13 @@ public class GenericXmlContextLoaderResourceLocationsTests {
{ ExplicitFileLocationsTestCase.class.getSimpleName(), new String[] { "file:/testing/directory/context.xml" } },
- { ExplicitUrlLocationsTestCase.class.getSimpleName(), new String[] { "http://example.com/context.xml" } },
+ { ExplicitUrlLocationsTestCase.class.getSimpleName(), new String[] { "https://example.com/context.xml" } },
{
ExplicitMixedPathTypesLocationsTestCase.class.getSimpleName(),
new String[] { "classpath:/org/springframework/test/context/support/context1.xml",
"classpath:context2.xml", "classpath:/context3.xml", "file:/testing/directory/context.xml",
- "http://example.com/context.xml" } }
+ "https://example.com/context.xml" } }
});
}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
index 0af0fbc2855..66cb01be63a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
@@ -29,7 +29,7 @@ import static org.testng.Assert.*;
/**
*
* TestNG based integration test to assess the claim in SPR-3880 that a "context marked dirty using
* {@link DirtiesContext @DirtiesContext} in [a] TestNG based test is not
* reloaded in subsequent tests".
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
index c35a40e9fc7..39c7e22b633 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
@@ -25,7 +25,7 @@ import static org.springframework.test.transaction.TransactionTestUtils.*;
/**
* Timed integration tests for
* {@link AbstractTransactionalTestNGSpringContextTests}; used to verify claim
- * raised in SPR-6124.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java
index 68479f8d845..bec9e5439e6 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java
@@ -39,21 +39,21 @@ public class MockRestRequestMatchersTests {
@Test
public void requestTo() throws Exception {
- this.request.setURI(new URI("http://foo.com/bar"));
+ this.request.setURI(new URI("http://www.foo.com/bar"));
- MockRestRequestMatchers.requestTo("http://foo.com/bar").match(this.request);
+ MockRestRequestMatchers.requestTo("http://www.foo.com/bar").match(this.request);
}
@Test(expected = AssertionError.class)
public void requestToNoMatch() throws Exception {
- this.request.setURI(new URI("http://foo.com/bar"));
+ this.request.setURI(new URI("http://www.foo.com/bar"));
- MockRestRequestMatchers.requestTo("http://foo.com/wrong").match(this.request);
+ MockRestRequestMatchers.requestTo("http://www.foo.com/wrong").match(this.request);
}
@Test
public void requestToContains() throws Exception {
- this.request.setURI(new URI("http://foo.com/bar"));
+ this.request.setURI(new URI("http://www.foo.com/bar"));
MockRestRequestMatchers.requestTo(containsString("bar")).match(this.request);
}
diff --git a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
index aed503ee866..aec32742bc4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatchersIntegrationTests.java
@@ -51,7 +51,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
public class XpathRequestMatchersIntegrationTests {
private static final Map NS =
- Collections.singletonMap("ns", "http://example.org/music/people");
+ Collections.singletonMap("ns", "https://example.org/music/people");
private MockRestServiceServer mockServer;
@@ -192,7 +192,7 @@ public class XpathRequestMatchersIntegrationTests {
@SuppressWarnings("unused")
- @XmlRootElement(name="people", namespace="http://example.org/music/people")
+ @XmlRootElement(name="people", namespace="https://example.org/music/people")
@XmlAccessorType(XmlAccessType.FIELD)
private static class PeopleWrapper {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
index 6e8673c84b7..4a134d71417 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
@@ -138,7 +138,7 @@ public class DelegatingWebConnectionTests {
webClient.setWebConnection(webConnection);
- Page page = webClient.getPage("http://code.jquery.com/jquery-1.11.0.min.js");
+ Page page = webClient.getPage("https://code.jquery.com/jquery-1.11.0.min.js");
assertThat(page.getWebResponse().getStatusCode(), equalTo(200));
assertThat(page.getWebResponse().getContentAsString(), not(isEmptyString()));
}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java
index ecf4f245918..1e5c5edd722 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HostRequestMatcherTests.java
@@ -31,14 +31,14 @@ public class HostRequestMatcherTests extends AbstractWebRequestMatcherTests {
public void localhost() throws Exception {
WebRequestMatcher matcher = new HostRequestMatcher("localhost");
assertMatches(matcher, "http://localhost/jquery-1.11.0.min.js");
- assertDoesNotMatch(matcher, "http://example.com/jquery-1.11.0.min.js");
+ assertDoesNotMatch(matcher, "https://example.com/jquery-1.11.0.min.js");
}
@Test
public void multipleHosts() throws Exception {
WebRequestMatcher matcher = new HostRequestMatcher("localhost", "example.com");
assertMatches(matcher, "http://localhost/jquery-1.11.0.min.js");
- assertMatches(matcher, "http://example.com/jquery-1.11.0.min.js");
+ assertMatches(matcher, "https://example.com/jquery-1.11.0.min.js");
}
@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index 21152474763..2b1e812ee8e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -155,7 +155,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestContextPathUsesNoFirstSegmentWithDefault() throws MalformedURLException {
- webRequest.setUrl(new URL("http://example.com/"));
+ webRequest.setUrl(new URL("https://example.com/"));
String contextPath = requestBuilder.buildRequest(servletContext).getContextPath();
assertThat(contextPath, equalTo(""));
@@ -400,7 +400,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestParameterMapFromSingleQueryParam() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?name=value"));
+ webRequest.setUrl(new URL("https://example.com/example/?name=value"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -410,7 +410,7 @@ public class HtmlUnitRequestBuilderTests {
@Test // SPR-14177
public void buildRequestParameterMapDecodesParameterName() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?row%5B0%5D=value"));
+ webRequest.setUrl(new URL("https://example.com/example/?row%5B0%5D=value"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -420,7 +420,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestParameterMapDecodesParameterValue() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?name=row%5B0%5D"));
+ webRequest.setUrl(new URL("https://example.com/example/?name=row%5B0%5D"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -430,7 +430,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestParameterMapFromSingleQueryParamWithoutValueAndWithoutEqualsSign() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?name"));
+ webRequest.setUrl(new URL("https://example.com/example/?name"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -440,7 +440,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestParameterMapFromSingleQueryParamWithoutValueButWithEqualsSign() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?name="));
+ webRequest.setUrl(new URL("https://example.com/example/?name="));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -450,7 +450,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestParameterMapFromSingleQueryParamWithValueSetToEncodedSpace() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?name=%20"));
+ webRequest.setUrl(new URL("https://example.com/example/?name=%20"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -460,7 +460,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestParameterMapFromMultipleQueryParams() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example/?name=value¶m2=value+2"));
+ webRequest.setUrl(new URL("https://example.com/example/?name=value¶m2=value+2"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -478,7 +478,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestPathInfoNull() throws Exception {
- webRequest.setUrl(new URL("http://example.com/example"));
+ webRequest.setUrl(new URL("https://example.com/example"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -487,7 +487,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestAndAntPathRequestMatcher() throws Exception {
- webRequest.setUrl(new URL("http://example.com/app/login/authenticate"));
+ webRequest.setUrl(new URL("https://example.com/app/login/authenticate"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -506,7 +506,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestQueryWithSingleQueryParam() throws Exception {
String expectedQuery = "param=value";
- webRequest.setUrl(new URL("http://example.com/example?" + expectedQuery));
+ webRequest.setUrl(new URL("https://example.com/example?" + expectedQuery));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -516,7 +516,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestQueryWithSingleQueryParamWithoutValueAndWithoutEqualsSign() throws Exception {
String expectedQuery = "param";
- webRequest.setUrl(new URL("http://example.com/example?" + expectedQuery));
+ webRequest.setUrl(new URL("https://example.com/example?" + expectedQuery));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -526,7 +526,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestQueryWithSingleQueryParamWithoutValueButWithEqualsSign() throws Exception {
String expectedQuery = "param=";
- webRequest.setUrl(new URL("http://example.com/example?" + expectedQuery));
+ webRequest.setUrl(new URL("https://example.com/example?" + expectedQuery));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -536,7 +536,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestQueryWithSingleQueryParamWithValueSetToEncodedSpace() throws Exception {
String expectedQuery = "param=%20";
- webRequest.setUrl(new URL("http://example.com/example?" + expectedQuery));
+ webRequest.setUrl(new URL("https://example.com/example?" + expectedQuery));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -546,7 +546,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestQueryWithMultipleQueryParams() throws Exception {
String expectedQuery = "param1=value1¶m2=value2";
- webRequest.setUrl(new URL("http://example.com/example?" + expectedQuery));
+ webRequest.setUrl(new URL("https://example.com/example?" + expectedQuery));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -587,7 +587,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestRemotePort8080() throws Exception {
- webRequest.setUrl(new URL("http://example.com:8080/"));
+ webRequest.setUrl(new URL("https://example.com:8080/"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -596,7 +596,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestRemotePort80WithDefault() throws Exception {
- webRequest.setUrl(new URL("http://example.com/"));
+ webRequest.setUrl(new URL("https://example.com/"));
MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
@@ -628,7 +628,7 @@ public class HtmlUnitRequestBuilderTests {
@Test
public void buildRequestUrl() {
String uri = requestBuilder.buildRequest(servletContext).getRequestURL().toString();
- assertThat(uri, equalTo("http://example.com/test/this/here"));
+ assertThat(uri, equalTo("https://example.com/test/this/here"));
}
@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java
index fc245628a12..fcae7df148b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java
@@ -91,13 +91,13 @@ public class MockMvcConnectionBuilderSupportTests {
.createConnection(delegateConnection);
assertMvcProcessed("http://localhost/");
- assertDelegateProcessed("http://example.com/");
+ assertDelegateProcessed("https://example.com/");
}
@Test
public void mockMvc() throws Exception {
assertMvcProcessed("http://localhost/");
- assertDelegateProcessed("http://example.com/");
+ assertDelegateProcessed("https://example.com/");
}
@Test
@@ -107,7 +107,7 @@ public class MockMvcConnectionBuilderSupportTests {
.createConnection(delegateConnection);
assertMvcProcessed("http://localhost/");
- assertMvcProcessed("http://example.com/");
+ assertMvcProcessed("https://example.com/");
assertDelegateProcessed("http://other.com/");
}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
index 690bd3cde4e..a218983c138 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
@@ -85,7 +85,7 @@ public class MockMvcWebClientBuilderTests {
this.webClient = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build();
assertMvcProcessed("http://localhost/test");
- Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/"));
+ Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("https://example.com/"));
}
@Test
@@ -94,7 +94,7 @@ public class MockMvcWebClientBuilderTests {
this.webClient = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).withDelegate(otherClient).build();
assertMvcProcessed("http://localhost/test");
- Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/"));
+ Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("https://example.com/"));
}
private void assertMvcProcessed(String url) throws Exception {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
index 1ee3e95dab7..e08e27d75ad 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
@@ -30,7 +30,7 @@ public class UrlRegexRequestMatcherTests extends AbstractWebRequestMatcherTests
@Test
public void verifyExampleInClassLevelJavadoc() throws Exception {
WebRequestMatcher cdnMatcher = new UrlRegexRequestMatcher(".*?//code.jquery.com/.*");
- assertMatches(cdnMatcher, "http://code.jquery.com/jquery-1.11.0.min.js");
+ assertMatches(cdnMatcher, "https://code.jquery.com/jquery-1.11.0.min.js");
assertDoesNotMatch(cdnMatcher, "http://localhost/jquery-1.11.0.min.js");
}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
index 94a1d373ff3..992ed727799 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java
@@ -85,7 +85,7 @@ public class MockMvcHtmlUnitDriverBuilderTests {
this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).withDelegate(otherDriver).build();
assertMvcProcessed("http://localhost/test");
- Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/"));
+ Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("https://example.com/"));
}
@Test
@@ -93,7 +93,7 @@ public class MockMvcHtmlUnitDriverBuilderTests {
this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
assertMvcProcessed("http://localhost/test");
- Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/"));
+ Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("https://example.com/"));
}
@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index e2684e41097..f533d18d92b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -61,10 +61,10 @@ public class FlashAttributeAssertionTests {
this.mockMvc.perform(post("/persons"))
.andExpect(flash().attribute("one", "1"))
.andExpect(flash().attribute("two", 2.222))
- .andExpect(flash().attribute("three", new URL("http://example.com")))
+ .andExpect(flash().attribute("three", new URL("https://example.com")))
.andExpect(flash().attribute("one", equalTo("1"))) // Hamcrest...
.andExpect(flash().attribute("two", equalTo(2.222)))
- .andExpect(flash().attribute("three", equalTo(new URL("http://example.com"))));
+ .andExpect(flash().attribute("three", equalTo(new URL("https://example.com"))));
}
@Test
@@ -83,7 +83,7 @@ public class FlashAttributeAssertionTests {
public String save(RedirectAttributes redirectAttrs) throws Exception {
redirectAttrs.addFlashAttribute("one", "1");
redirectAttrs.addFlashAttribute("two", 2.222);
- redirectAttrs.addFlashAttribute("three", new URL("http://example.com"));
+ redirectAttrs.addFlashAttribute("three", new URL("https://example.com"));
return "redirect:/person/1";
}
}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
index 404983de553..6dd0ff66665 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
@@ -53,7 +53,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.*;
public class XpathAssertionTests {
private static final Map musicNamespace =
- Collections.singletonMap("ns", "http://example.org/music/people");
+ Collections.singletonMap("ns", "https://example.org/music/people");
private MockMvc mockMvc;
@@ -160,7 +160,7 @@ public class XpathAssertionTests {
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_ATOM_XML))
.andExpect(xpath("//feed/title").string("Test Feed"))
- .andExpect(xpath("//feed/icon").string("http://www.example.com/favicon.ico"));
+ .andExpect(xpath("//feed/icon").string("https://www.example.com/favicon.ico"));
}
@@ -185,7 +185,7 @@ public class XpathAssertionTests {
}
@SuppressWarnings("unused")
- @XmlRootElement(name="people", namespace="http://example.org/music/people")
+ @XmlRootElement(name="people", namespace="https://example.org/music/people")
@XmlAccessorType(XmlAccessType.FIELD)
private static class PeopleWrapper {
@@ -224,7 +224,7 @@ public class XpathAssertionTests {
return "\r\n"
+ "\r\n"
+ " Test Feed\r\n"
- + " http://www.example.com/favicon.ico\r\n"
+ + " https://www.example.com/favicon.ico\r\n"
+ "\r\n\r\n";
}
}
diff --git a/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
index dc3f6216ae0..51499dabc98 100644
--- a/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
+++ b/spring-test/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
@@ -1,6 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-
+
diff --git a/spring-test/src/test/webapp/WEB-INF/layouts/main.jsp b/spring-test/src/test/webapp/WEB-INF/layouts/main.jsp
index 408d8fc932a..a3f3f6584ae 100644
--- a/spring-test/src/test/webapp/WEB-INF/layouts/main.jsp
+++ b/spring-test/src/test/webapp/WEB-INF/layouts/main.jsp
@@ -1,6 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
-
+
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
index f0aa02bd438..93d3eec5385 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
@@ -20,7 +20,7 @@ import org.springframework.core.NestedRuntimeException;
/**
* Root of the hierarchy of data access exceptions discussed in
- * Expert One-On-One J2EE Design and Development.
+ * Expert One-On-One J2EE Design and Development.
* Please see Chapter 9 of this book for detailed discussion of the
* motivation for this package.
*
diff --git a/spring-tx/src/main/java/org/springframework/dao/package-info.java b/spring-tx/src/main/java/org/springframework/dao/package-info.java
index 4e9a18651ed..89febbf04bd 100644
--- a/spring-tx/src/main/java/org/springframework/dao/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/dao/package-info.java
@@ -10,7 +10,7 @@
* leave them uncaught and treat all data access exceptions as fatal.
*
*
The classes in this package are discussed in Chapter 9 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*/
package org.springframework.dao;
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 a0cbae1a803..ea54eb0c8ce 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
@@ -70,7 +70,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-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
index 5708c2c619e..558d1c498c7 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
@@ -39,7 +39,7 @@ import org.springframework.transaction.PlatformTransactionManager;
* target object with a transactional proxy, proxying all the interfaces that the target
* implements. However, in Spring versions 2.0 and beyond, the functionality provided here
* is superseded by the more convenient {@code tx:} XML namespace. See the declarative transaction management section of the
+ * href="https://bit.ly/qUwvwz">declarative transaction management section of the
* Spring reference documentation to understand the modern options for managing
* transactions in Spring applications. For these reasons, users should favor of
* the {@code tx:} XML namespace as well as
diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
index 2d3837e7961..ad6e3ce4a07 100644
--- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
+++ b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
@@ -8,8 +8,8 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified">
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+ this forum post.
+ * See this forum post.
*/
@Test
public void testConflictingRulesToDetermineExactContract() {
diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
index b5edb26901c..789a9742e3b 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -28,11 +28,11 @@ import org.springframework.util.ObjectUtils;
* HttpHeaders headers = new HttpHeaders();
* headers.setContentType(MediaType.TEXT_PLAIN);
* HttpEntity<String> entity = new HttpEntity<String>(helloWorld, headers);
- * URI location = template.postForLocation("http://example.com", entity);
+ * URI location = template.postForLocation("https://example.com", entity);
*
If you would like to provide a URI template with variables, consider using
* {@link org.springframework.web.util.UriTemplate}:
*
- * URI uri = new UriTemplate("http://example.com/{foo}").expand("bar");
+ * URI uri = new UriTemplate("https://example.com/{foo}").expand("bar");
* RequestEntity<MyRequest> request = RequestEntity.post(uri).accept(MediaType.APPLICATION_JSON).body(body);
*
The following snippet shows how to do a file upload:
@@ -74,7 +74,7 @@ import org.springframework.util.StringUtils;
* MultiValueMap<String, Object> parts = new LinkedMultiValueMap<String, Object>();
* parts.add("field 1", "value 1");
* parts.add("file", new ClassPathResource("myFile.jpg"));
- * template.postForLocation("http://example.com/myFileUpload", parts);
+ * template.postForLocation("https://example.com/myFileUpload", parts);
*
*
*
Some methods in this class were inspired by
@@ -127,7 +127,7 @@ public class FormHttpMessageConverter implements HttpMessageConverterIf not set file names will be encoded as US-ASCII.
* @param multipartCharset the charset to use
* @since 4.1.1
- * @see Encoded-Word
+ * @see Encoded-Word
*/
public void setMultipartCharset(Charset multipartCharset) {
this.multipartCharset = multipartCharset;
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
index dac07a6a56e..8ce1b859325 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -25,7 +25,7 @@ import org.springframework.http.MediaType;
/**
* Implementation of {@link org.springframework.http.converter.HttpMessageConverter} that can read and
- * write JSON using Jackson 2.x's {@link ObjectMapper}.
+ * write JSON using Jackson 2.x's {@link ObjectMapper}.
*
*
This converter can be used to bind to typed beans, or untyped {@code HashMap} instances.
*
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
index 8767711684e..c8980c83160 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
*
*
Burlap is a slim, XML-based RPC protocol.
* For information on Burlap, see the
- * Burlap website
+ * Burlap website
*
*
Note: There is no requirement for services accessed with this proxy factory
* to have been exported using Spring's {@link BurlapServiceExporter}, as there is
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
index 9cfc40822bd..022039aeaff 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
*
*
Burlap is a slim, XML-based RPC protocol.
* For information on Burlap, see the
- * Burlap website.
+ * Burlap website.
* This exporter requires Burlap 3.x.
*
* @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
index 9530cf29379..c57f0e83d35 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.FactoryBean;
*
*
Burlap is a slim, XML-based RPC protocol.
* For information on Burlap, see the
- * Burlap website
+ * Burlap website
*
*
The service URL must be an HTTP URL exposing a Burlap service.
* For details, see the {@link BurlapClientInterceptor} javadoc.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
index 39efb35e7f3..28083de4b9e 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
@@ -34,7 +34,7 @@ import org.springframework.web.util.NestedServletException;
*
*
Burlap is a slim, XML-based RPC protocol.
* For information on Burlap, see the
- * Burlap website.
+ * Burlap website.
* This exporter requires Burlap 3.x.
*
*
Note: Burlap services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index 04af59064bc..60c3c43ccfe 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website
+ * Hessian website
* Note: As of Spring 4.0, this client requires Hessian 4.0 or above.
*
*
Note: There is no requirement for services accessed with this proxy factory
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
index b808443f9f9..f4e94b30f0c 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
@@ -45,7 +45,7 @@ import org.springframework.util.CommonsLogWriter;
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
* Note: As of Spring 4.0, this exporter requires Hessian 4.0 or above.
*
* @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
index 7c594329830..961eb366b91 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.FactoryBean;
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website
+ * Hessian website
* Note: As of Spring 4.0, this proxy factory requires Hessian 4.0 or above.
*
*
The service URL must be an HTTP URL exposing a Hessian service.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
index ff57f70f532..7d8aecc2866 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
@@ -34,7 +34,7 @@ import org.springframework.web.util.NestedServletException;
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
* Note: As of Spring 4.0, this exporter requires Hessian 4.0 or above.
*
*
Hessian services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
index 1dd0e16d3ab..67e7a35f0df 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
@@ -33,7 +33,7 @@ import org.springframework.util.FileCopyUtils;
*
*
Burlap is a slim, XML-based RPC protocol.
* For information on Burlap, see the
- * Burlap website.
+ * Burlap website.
* This exporter requires Burlap 3.x.
*
*
Note: Burlap services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
index 967622ae436..96c27722cdd 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
@@ -33,7 +33,7 @@ import org.springframework.util.FileCopyUtils;
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
* Note: As of Spring 4.0, this exporter requires Hessian 4.0 or above.
*
*
Hessian services exported with this class can be accessed by
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
index e630835f262..6dba86bc3be 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
@@ -5,6 +5,6 @@
*
*
Hessian is a slim, binary RPC protocol over HTTP.
* For information on Hessian, see the
- * Hessian website
+ * Hessian website
*/
package org.springframework.remoting.caucho;
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
index 1e1b16c9b08..ac3bb260f43 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpComponentsHttpInvokerRequestExecutor.java
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
/**
* {@link org.springframework.remoting.httpinvoker.HttpInvokerRequestExecutor} implementation that uses
- * Apache HttpComponents HttpClient
+ * Apache HttpComponents HttpClient
* to execute POST requests.
*
*
Allows to use a pre-configured {@link org.apache.http.client.HttpClient}
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 02c1688c3b2..3dc0787c010 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -41,7 +41,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
* the JAR Services API {@link ServiceLoader#load(Class)} method detecting the
* {@code spring-web} module's {@code META-INF/services/javax.servlet.ServletContainerInitializer}
* service provider configuration file. See the
- *
+ *
* JAR Services API documentation as well as section 8.2.4 of the Servlet 3.0
* Final Draft specification for complete details.
*
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
index a9149592291..756bac9d153 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
@@ -55,7 +55,7 @@ public @interface CrossOrigin {
String[] value() default {};
/**
- * List of allowed origins, e.g. {@code "http://domain1.com"}.
+ * List of allowed origins, e.g. {@code "https://domain1.com"}.
*
These values are placed in the {@code Access-Control-Allow-Origin}
* header of both the pre-flight response and the actual response.
* {@code "*"} means that all origins are allowed.
diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
index 5e1c38d1205..807bf09ce4c 100644
--- a/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
+++ b/spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
@@ -345,7 +345,7 @@ public interface AsyncRestOperations {
* information:
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -431,7 +431,7 @@ public interface RestOperations {
* The given {@link ParameterizedTypeReference} is used to pass generic type information:
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -450,7 +450,7 @@ public interface RestOperations {
* The given {@link ParameterizedTypeReference} is used to pass generic type information:
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -468,7 +468,7 @@ public interface RestOperations {
* with the static builder methods on {@code RequestEntity}, for instance:
*
* @param requestEntity the entity to write to the request
@@ -484,7 +484,7 @@ public interface RestOperations {
* {@link ParameterizedTypeReference} is used to pass generic type information:
*
For each HTTP method there are three variants: two accept a URI template string
* and URI variables (array or map) while a third accepts a {@link URI}.
* Note that for URI templates it is assumed encoding is necessary, e.g.
- * {@code restTemplate.getForObject("http://example.com/hotel list")} becomes
- * {@code "http://example.com/hotel%20list"}. This also means if the URI template
+ * {@code restTemplate.getForObject("https://example.com/hotel list")} becomes
+ * {@code "https://example.com/hotel%20list"}. This also means if the URI template
* or URI variables are already encoded, double encoding will occur, e.g.
- * {@code http://example.com/hotel%20list} becomes
- * {@code http://example.com/hotel%2520list}). To avoid that use a {@code URI} method
+ * {@code https://example.com/hotel%20list} becomes
+ * {@code https://example.com/hotel%2520list}). To avoid that use a {@code URI} method
* variant to provide (or re-use) a previously encoded URI. To prepare such an URI
* with full control over encoding, consider using
* {@link org.springframework.web.util.UriComponentsBuilder}.
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 9be3b462a82..6d1d5361087 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
@@ -33,7 +33,7 @@ import org.springframework.util.StringUtils;
* @author Rossen Stoyanchev
* @author Sam Brannen
* @since 4.2
- * @see CORS W3C recommendation
+ * @see CORS W3C recommendation
*/
public class CorsConfiguration {
@@ -116,7 +116,7 @@ public class CorsConfiguration {
/**
- * Set the origins to allow, e.g. {@code "http://domain1.com"}.
+ * Set the origins to allow, e.g. {@code "https://domain1.com"}.
*
The special value {@code "*"} allows all domains.
*
By default this is not set.
*/
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 4d07b139a1c..e9879ade9a4 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
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
* @author Sebastien Deleuze
* @author Rossen Stoyanchev
* @since 4.2
- * @see CORS W3C recommandation
+ * @see CORS W3C recommandation
* @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 a64bcce9774..56234b85f8c 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 recommandation.
+ * CORS W3C recommandation.
*
* @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 2b1abdf39f4..a03f8ccdf4a 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
@@ -38,7 +38,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/filter/CorsFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CorsFilter.java
index 658bc50bb6e..d85fce5505a 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/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index aeb0542b3fa..c8d7b642391 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* A strategy interface for multipart file upload resolution in accordance
- * with RFC 1867.
+ * with RFC 1867.
* Implementations are typically usable both within an application context
* and standalone.
*
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
index 9fea4a4220c..ee7b2f6f9b9 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
@@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
/**
* Servlet-based {@link MultipartResolver} implementation for
- * Apache Commons FileUpload
+ * Apache Commons FileUpload
* 1.2 or above.
*
*
Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
index 001283a1fe9..fbc333b974f 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
@@ -1,5 +1,5 @@
/**
* MultipartResolver implementation for
- * Apache Commons FileUpload.
+ * Apache Commons FileUpload.
*/
package org.springframework.web.multipart.commons;
diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
index 9e1f518215b..4c4abe7a639 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
* @author Rossen Stoyanchev
* @author Phillip Webb
* @since 3.1.3
- * @see Hierarchical URIs
+ * @see Hierarchical URIs
*/
@SuppressWarnings("serial")
final class HierarchicalUriComponents extends UriComponents {
@@ -480,7 +480,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Enumeration used to identify the allowed characters per URI component.
*
Contains methods to indicate whether a given character is valid in a specific URI component.
- * @see RFC 3986
+ * @see RFC 3986
*/
enum Type {
@@ -570,7 +570,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code ALPHA} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isAlpha(int c) {
return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z';
@@ -578,7 +578,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code DIGIT} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isDigit(int c) {
return c >= '0' && c <= '9';
@@ -586,7 +586,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code gen-delims} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isGenericDelimiter(int c) {
return ':' == c || '/' == c || '?' == c || '#' == c || '[' == c || ']' == c || '@' == c;
@@ -594,7 +594,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code sub-delims} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isSubDelimiter(int c) {
return '!' == c || '$' == c || '&' == c || '\'' == c || '(' == c || ')' == c || '*' == c || '+' == c ||
@@ -603,7 +603,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code reserved} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isReserved(int c) {
return isGenericDelimiter(c) || isSubDelimiter(c);
@@ -611,7 +611,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code unreserved} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isUnreserved(int c) {
return isAlpha(c) || isDigit(c) || '-' == c || '.' == c || '_' == c || '~' == c;
@@ -619,7 +619,7 @@ final class HierarchicalUriComponents extends UriComponents {
/**
* Indicates whether the given character is in the {@code pchar} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isPchar(int c) {
return isUnreserved(c) || isSubDelimiter(c) || ':' == c || '@' == c;
diff --git a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
index be329162c8e..115b8a07dc3 100644
--- a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
@@ -32,7 +32,7 @@ import org.springframework.util.ObjectUtils;
* @author Arjen Poutsma
* @author Phillip Webb
* @since 3.2
- * @see Hierarchical vs Opaque URIs
+ * @see Hierarchical vs Opaque URIs
*/
@SuppressWarnings("serial")
final class OpaqueUriComponents extends UriComponents {
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 ad62b20eb66..8a914cd7f5d 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
@@ -274,7 +274,7 @@ public class UriComponentsBuilder implements Cloneable {
/**
* Create a new {@code UriComponents} object from the URI associated with
* the given HttpRequest while also overlaying with values from the headers
- * "Forwarded" (RFC 7239,
+ * "Forwarded" (RFC 7239,
* or "X-Forwarded-Host", "X-Forwarded-Port", and "X-Forwarded-Proto" if
* "Forwarded" is not found.
* @param request the source request
@@ -664,7 +664,7 @@ public class UriComponentsBuilder implements Cloneable {
/**
* Adapt this builder's scheme+host+port from the given headers, specifically
- * "Forwarded" (RFC 7239,
+ * "Forwarded" (RFC 7239,
* or "X-Forwarded-Host", "X-Forwarded-Port", and "X-Forwarded-Proto" if
* "Forwarded" is not found.
* @param headers the HTTP headers to consider
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 8c977986371..428ac545769 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
* @author Juergen Hoeller
* @author Rossen Stoyanchev
* @since 3.0
- * @see URI Templates
+ * @see URI Templates
*/
@SuppressWarnings("serial")
public class UriTemplate implements Serializable {
@@ -81,13 +81,13 @@ public class UriTemplate implements Serializable {
* the Map values variable values. The order of variables is not significant.
*
* @param uriVariables the map of URI variables
* @return the expanded URI
* @throws IllegalArgumentException if {@code uriVariables} is {@code null};
@@ -104,10 +104,10 @@ public class UriTemplate implements Serializable {
* The order of variables is significant.
*
Example:
*
- * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ * UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
* System.out.println(template.expand("Rest & Relax", 42));
*
* @param uriVariableValues the array of URI variables
* @return the expanded URI
* @throws IllegalArgumentException if {@code uriVariables} is {@code null}
@@ -137,8 +137,8 @@ public class UriTemplate implements Serializable {
* values are variable values, as occurred in the given URI.
*
