diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b635ae9ba9ec..a18cea9e27bd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -160,7 +160,7 @@ public class Spr8954Tests {
Use `git rebase --interactive`, `git add --patch` and other tools to "squash"
multiple commits into atomic changes. In addition to the man pages for git,
there are many resources online to help you understand how these tools work.
-Here is one: http://book.git-scm.com/4_interactive_rebasing.html.
+Here is one: https://book.git-scm.com/4_interactive_rebasing.html.
## Use real name in git commits
@@ -286,10 +286,10 @@ Note that you can always force push (`git push -f`) reworked / rebased commits
against the branch used to submit your pull request. i.e. 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.springsource.org/browse/SPR
[spring-framework-contrib]: https://groups.google.com/forum/#!forum/spring-framework-contrib
[SpringSource CLA form]: https://support.springsource.com/spring_committer_signup
[fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
-[commit guidelines section of Pro Git]: http://progit.org/book/ch5-2.html#commit_guidelines
+[commit guidelines section of Pro Git]: https://progit.org/book/ch5-2.html#commit_guidelines
[building from source]: https://github.com/SpringSource/spring-framework#building-from-source
diff --git a/README.md b/README.md
index 12cfb2710819..0bc1978aaf32 100644
--- a/README.md
+++ b/README.md
@@ -66,31 +66,31 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
[Spring Integration]: https://github.com/SpringSource/spring-integration
[Spring Batch]: https://github.com/SpringSource/spring-batch
-[family of projects]: http://springsource.org/projects
+[family of projects]: https://springsource.org/projects
[SpringSource organization]: https://github.com/SpringSource
[.NET]: https://github.com/SpringSource/spring-net
[Python]: https://github.com/SpringSource/spring-python
[downloading Spring artifacts]: https://github.com/SpringSource/spring-framework/wiki/Downloading-Spring-artifacts
[building a distribution with dependencies]: https://github.com/SpringSource/spring-framework/wiki/Building-a-distribution-with-dependencies
-[Javadoc]: http://static.springsource.org/spring-framework/docs/current/javadoc-api
-[reference docs]: http://static.springsource.org/spring-framework/docs/current/spring-framework-reference
-[Spring forums]: http://forum.springsource.org
-[spring tag]: http://stackoverflow.com/questions/tagged/spring
-[spring-mvc tag]: http://stackoverflow.com/questions/tagged/spring-mvc
-[Stack Overflow]: http://stackoverflow.com/faq
-[Commercial support]: http://springsource.com/support/springsupport
-[Spring Framework JIRA]: http://jira.springsource.org/browse/SPR
+[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 forums]: https://forum.spring.io/
+[spring tag]: https://stackoverflow.com/questions/tagged/spring
+[spring-mvc tag]: https://stackoverflow.com/questions/tagged/spring-mvc
+[Stack Overflow]: https://stackoverflow.com/faq
+[Commercial support]: https://springsource.com/support/springsupport
+[Spring Framework JIRA]: https://jira.springsource.org/browse/SPR
[the lifecycle of an issue]: https://github.com/cbeams/spring-framework/wiki/The-Lifecycle-of-an-Issue
[spring-framework-issues]: https://github.com/SpringSource/spring-framework-issues#readme
[readme]: https://github.com/SpringSource/spring-framework-issues#readme
-[Gradle]: http://gradle.org
-[`./gradlew`]: http://vimeo.com/34436402
-[Git]: http://help.github.com/set-up-git-redirect
+[Gradle]: https://gradle.org
+[`./gradlew`]: https://vimeo.com/34436402
+[Git]: https://help.github.com/set-up-git-redirect
[Gradle build and release FAQ]: https://github.com/SpringSource/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/SpringSource/spring-framework/blob/master/CONTRIBUTING.md
-[@springframework]: http://twitter.com/springframework
-[team members]: http://twitter.com/springframework/team/members
-[team blog]: http://blog.springsource.org
-[news feed]: http://www.springsource.org/news-events
+[@springframework]: https://twitter.com/springframework
+[team members]: https://twitter.com/springframework/team/members
+[team blog]: https://blog.springsource.org
+[news feed]: https://www.springsource.org/news-events
[Apache License]: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/gradle/jdiff/README.txt b/gradle/jdiff/README.txt
index 9f7529e2864c..ed49a1b92315 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 5c46f967b9ec..d242fb8a4953 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 @@
SYNOPSIS
-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 @@
SYNOPSIS
-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 @@
SYNOPSIS
-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 @@
ADDING COMMENTS TO A REPORT
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 @@
diff --git a/import-into-idea.md b/import-into-idea.md
index a2f752e7261e..14159d743a6d 100644
--- a/import-into-idea.md
+++ b/import-into-idea.md
@@ -13,7 +13,7 @@ _Within your locally cloned spring-framework working directory:_
## Known issues
1. `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'
module has been excluded from the overall project to avoid compilation errors.
2. 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
@@ -27,6 +27,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 22fd8fc5095b..894ebe39954f 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
@@ -8,8 +8,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
@@ -138,7 +138,7 @@ private List findCandidateWriteMethods(MethodDescriptor[] methodDescript
}
// 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() {
public int compare(Method m1, Method m2) {
return m2.toString().compareTo(m1.toString());
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 3fa565e656f3..2dc3a0d4b376 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
@@ -110,7 +110,7 @@
* {@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>
*
@@ -140,7 +140,7 @@
* 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 -->
@@ -233,7 +233,7 @@
* {@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 -->
@@ -254,7 +254,7 @@
* 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/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
index 026604058d44..bc255301b9bd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
@@ -24,7 +24,7 @@
/**
* Factory bean for
- * commons-logging
+ * commons-logging
* {@link org.apache.commons.logging.Log} instances.
*
*
Useful for sharing Log instances among multiple beans instead of using
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 d4454c46ee6d..d81a225d3e56 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
@@ -8,7 +8,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).
*
*/
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 85002456524a..f40371a4fc78 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
@@ -1468,7 +1468,7 @@ private BeanDefinitionHolder decorateIfRequired(
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 6d46441c8c3a..f47cfd5528e5 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
@@ -34,7 +34,7 @@
*
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 11d8730cd96f..e27b85f7a89b 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
@@ -8,7 +8,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).
*
*/
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 edb9aca7b3c7..669bd05f43f7 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-beans.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
index fe521abffb51..71a79d692a88 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
@@ -34,7 +34,7 @@
XML documents that conform to this DTD should declare the following doctype:
+ "https://www.springframework.org/dtd/spring-beans.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 509c0eeaeee3..e5be655ccaf2 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 eb04ecff4a50..b76bfe3d799d 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 287e31ba81c9..ad4c9daceed7 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 9b5774a46c40..4cf6f846ec81 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 f7a754aa6c24..e24d757f64a4 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/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
index d269e5d5d7da..5c7676cd8ca2 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -569,7 +569,7 @@ class C {
* 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 f877d1ab59c7..e75af7c8727d 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
@@ -1362,7 +1362,7 @@ public void testAutowireBeanByType() {
/**
* 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 918df5c66562..67abf172426e 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
@@ -942,7 +942,7 @@ public void testCustomAnnotationOptionalMethodResourceInjectionWhenMultipleDepen
* 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 41eeb424d58f..73a4ec2d3916 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
@@ -550,7 +550,7 @@ public void testObjectFactoryWithTypedMapMethod() throws Exception {
* 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 935bc2703302..a467f6ba627f 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
@@ -649,7 +649,7 @@ public void testSetBean() throws Exception {
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 f77eddb4787d..d5cdd5d0d09b 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
@@ -51,22 +51,22 @@ public void withNonExistentResource() throws Exception {
@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
@@ -121,23 +121,23 @@ public void getAsTextReturnsEmptyStringIfValueNotSet() throws Exception {
@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 303384841ac2..58cd58cf99ee 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
@@ -43,7 +43,7 @@ public void testStandardURI() throws Exception {
@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 3263df5a36a4..cdd40231dd51 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,
+ * EhCache,
* 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/mail/javamail/mime.types b/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
index 08b43938d489..1e9ce6776dee 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types
+++ b/spring-context-support/src/main/java/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-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
index 3e625f0c791d..28d3fcfd6c7e 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
@@ -146,7 +146,7 @@ public void setGroup(String group) {
* fashion. The behavior when one does not want concurrent jobs to be
* executed is realized through adding the {@link StatefulJob} interface.
* 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 4b8a70a18212..d3df1714af0c 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
@@ -2,7 +2,7 @@
/**
*
* 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 b64940311be7..f2ad4f0bfaa2 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
@@ -2,7 +2,7 @@
/**
*
* Support classes for setting up
- * FreeMarker
+ * FreeMarker
* within a Spring application context.
*
*/
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 5553de946398..4df19fcb7ad5 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
@@ -2,7 +2,7 @@
/**
*
* Support classes for setting up
- * Velocity
+ * Velocity
* within a Spring application context.
*
*/
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 b398dcd83980..b42a94679d37 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 @@
* 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 9d4556b2c253..469e963875a4 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
@@ -36,7 +36,7 @@
*
*
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 9615bb81469f..74b31e223f08 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
@@ -14,7 +14,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 3a4732fe0465..a57d3bf4051d 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 @@
* This FactoryBean is a direct alternative to {@link MBeanServerFactoryBean},
* which uses standard JMX 1.2 API to access the platform's MBeanServer.
*
- *
See Javadoc for WebSphere's {@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 8f2465fd9cc0..456fd90785a3 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 @@
* {@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 eb6ebde08a8b..a5efc5a45f26 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
@@ -6,7 +6,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).
*
*/
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 c85ac5a04a39..7c87c0906240 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
@@ -221,7 +221,7 @@ public static boolean isConnectFailure(RemoteException ex) {
* connection failure.
*
This is relevant on the IBM JVM, in particular for WebSphere EJB clients.
*
For details on the ForkJoinPool API and its use with RecursiveActions, see the
- * JDK 7 javadoc.
+ * JDK 7 javadoc.
*
*
{@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 c096ee8fbc65..f7953ae9d8ef 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 @@
/**
* Date sequence generator for a
- * Crontab pattern,
+ * Crontab pattern,
* allowing clients to specify a pattern that the sequence matches.
*
*
* JUnit-3.8-based unit test which verifies expected init and
* destroy bean lifecycle behavior as requested in SPR-3775.
*
*
diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
index d7f16f87fb28..b2011be0a9a8 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
@@ -37,7 +37,7 @@
* run only if {@link TestGroup#JMXMP} is enabled. If you wish to run these tests, follow
* the instructions in the TestGroup class to enable JMXMP tests. If you run into the
* "Unsupported protocol: jmxmp" error, you will need to 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 b5abac2c9519..df7e33b791e9 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 void testSupermanIsReadOnly() throws Exception {
}
/*
- * 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/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index 5569165c945b..9aaa7ed6aeb2 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -315,7 +315,7 @@ public void testGetScriptedObjectDoesChokeOnNullScriptSourceBeingPassedIn() thro
}
@Ignore
- // see http://build.springframework.org/browse/SPR-TRUNKQUICK-908
+ // see https://build.springframework.org/browse/SPR-TRUNKQUICK-908
@Test
public void testResourceScriptFromTag() throws Exception {
ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
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 1110206e149f..b9377b3877a1 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 a7f613bd4be9..854d20faff2b 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 @@
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 9ced53eaa376..0ae1905bc5c6 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,7 +1,7 @@
/**
* 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
@@ -10,7 +10,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.
*
* @since 3.2
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 0d48d06332d8..4420ad2bd389 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
@@ -22,7 +22,7 @@
* libraries and frameworks.
*
As this repackaging happens at the classfile level, sources and Javadoc
* are not available here. See the original
- * CGLIB 3 Javadoc
+ * CGLIB 3 Javadoc
* for details when working with these classes.
*
* @since 3.2
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 dbbf21bf44dc..ffaf62aa310f 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -39,7 +39,7 @@
* 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
@@ -213,8 +213,8 @@ private static Method searchForMatch(Class type, Method bridgeMethod) {
/**
* 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 c8d145ee3ed2..2522e0ef1558 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 @@
* @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 d9a743c90cc5..ede8c6d6d817 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 @@
/**
* PathMatcher implementation for Ant-style path patterns. Examples are provided below.
*
- *
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:
Mainly for internal use within the framework; consider
- * Apache Commons Codec for a
+ * 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/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index d3d655963547..a12810c90a80 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -34,7 +34,7 @@
* Miscellaneous {@link String} utility methods.
*
*
This class delivers some simple functionality that should really
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 3904faaac9c6..b2bb40edc0d4 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 static void enableIndenting(Transformer transformer, int indentAmount) {
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 2ec796015d73..56102feaaa09 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 void getSystemProperties_withAndWithoutSecurityManager() {
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 void getSystemEnvironment_withAndWithoutSecurityManager() {
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 62ccb219b17a..38d0a0482ab9 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
@@ -177,7 +177,7 @@ public void testUrlResourceWithRelativePath() throws IOException {
@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/TransformerUtilsTests.java b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
index 3ac4ee5ca8be..bebf5c096a56 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 void enableIndentingSunnyDay() throws Exception {
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 void enableIndentingSunnyDayWithCustomKosherIndentAmount() throws Excepti
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 f374935be6c3..ea0720e5961a 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 df994a703287..e70c7b45a091 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
@@ -25,7 +25,7 @@
* Implements the {@code multiply} operator.
*
*
If any of the operands is of a reference type, unboxing conversion (Section 5.1.8) is performed. Then:
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 4f341ea30817..ad7799b4a9b3 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 @@
* 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 "server/lib" (for Tomcat 5.x) or "lib" (for Tomcat 6.x) 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 e7f28f1ae8a4..9d538e7baaab 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 @@
* 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's Jakarta Commons DBCP
- * or C3P0.
+ * Apache's Jakarta 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 342066926cc8..325acbd90e9b 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 @@
* 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's Jakarta Commons DBCP
- * or C3P0.
+ * Apache's Jakarta 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 ad0047895874..4a031eef0f2a 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 @@
*
*
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 @@ protected Connection doGetConnection(String username, String password) throws SQ
* 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 1dfc47c03d4a..81f2b6984c6b 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 267a785b4d8d..2a3f709e05af 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
@@ -12,7 +12,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).
*
*/
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 a58744a9fabf..7f8f6caebd67 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
@@ -16,7 +16,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).
*
*/
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 42862a61d834..c848c30852be 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 void setNativeJdbcExtractor(NativeJdbcExtractor nativeJdbcExtractor) {
*
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 306abce3488f..a622a5dac8f6 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,7 +1,7 @@
/**
*
* 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/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
index f3aedcd4400a..e0abdef7676e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
@@ -31,7 +31,7 @@
* @see SqlMapClientTemplate
* @see org.springframework.jdbc.datasource.DataSourceTransactionManager
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public interface SqlMapClientCallback {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
index 8cbc23bb12f5..5a1a833f559b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
@@ -67,7 +67,7 @@
* @see SqlMapClientTemplate#setSqlMapClient
* @see SqlMapClientTemplate#setDataSource
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public class SqlMapClientFactoryBean implements FactoryBean, InitializingBean {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
index f70cab545ac1..63d530dd62a0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
@@ -39,7 +39,7 @@
* @see com.ibatis.sqlmap.client.SqlMapClient
* @see com.ibatis.sqlmap.client.SqlMapExecutor
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public interface SqlMapClientOperations {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
index 2dfbad5dc098..a391813f9bc3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
@@ -81,7 +81,7 @@
* @see com.ibatis.sqlmap.client.SqlMapClient#getDataSource
* @see com.ibatis.sqlmap.client.SqlMapExecutor
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public class SqlMapClientTemplate extends JdbcAccessor implements SqlMapClientOperations {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
index b76167a271c7..ac5d0ff04973 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
@@ -2,7 +2,7 @@
/**
*
* Package providing integration of
- * iBATIS Database Layer
+ * iBATIS Database Layer
* with Spring concepts.
*
*
Contains resource helper classes and template classes for
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
index 5096d1a2f7db..174bb8909c5a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
@@ -47,7 +47,7 @@
* @see org.springframework.jdbc.support.lob.LobCreator
* @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
index d272797f5f36..2c5e9825e1c8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
@@ -36,7 +36,7 @@
* @since 1.1.5
* @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public class BlobByteArrayTypeHandler extends AbstractLobTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
index ee696fcadbb3..9763c749caf9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
@@ -41,7 +41,7 @@
* @since 1.1.5
* @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public class BlobSerializableTypeHandler extends AbstractLobTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
index 74ef0dc37305..697d4dc35a51 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
@@ -39,7 +39,7 @@
* @since 1.1.5
* @see org.springframework.orm.ibatis.SqlMapClientFactoryBean#setLobHandler
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public class ClobStringTypeHandler extends AbstractLobTypeHandler {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
index 8cc665eeda04..7d7a73ecbc77 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
@@ -41,7 +41,7 @@
* @see org.springframework.orm.ibatis.SqlMapClientTemplate
* @see org.springframework.orm.ibatis.SqlMapClientTemplate#setExceptionTranslator
* @deprecated as of Spring 3.2, in favor of the native Spring support
- * in the Mybatis follow-up project (http://code.google.com/p/mybatis/)
+ * in the Mybatis follow-up project (https://code.google.com/p/mybatis/)
*/
@Deprecated
public abstract class SqlMapClientDaoSupport extends DaoSupport {
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 d258e390b488..241603a1c53e 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
@@ -60,7 +60,7 @@
*
*
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 1f1167ab09e1..70bcc8049a47 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,7 +1,7 @@
/**
*
- * Package providing integration of Castor within Springs O/X Mapping
+ * Package providing integration of Castor within Springs O/X Mapping
* support
*
*/
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 691156710f23..f34ef2bc342c 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
@@ -590,7 +590,7 @@ public boolean supports(Type genericType) {
}
else if (JdkVersion.getMajorJavaVersion() <= JdkVersion.JAVA_16 &&
typeArgument instanceof GenericArrayType) {
- // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784
+ // see https://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784
GenericArrayType arrayType = (GenericArrayType) typeArgument;
return arrayType.getGenericComponentType().equals(Byte.TYPE);
}
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 1b3f9b3baece..181e42d23639 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,7 +1,7 @@
/**
*
- * Package providing integration of JAXB with Springs O/X Mapping
+ * Package providing integration of JAXB with Springs O/X Mapping
* support
*
*/
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 730341079f29..1fd20186ee5f 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 @@
*
* @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 48569c583bb5..ab730071ed08 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 @@
*
* @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 331b78b2c42e..96d527ac5fb5 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 @@
*
* @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 38de2465cadd..93f95911887b 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,7 +1,7 @@
/**
*
- * Package providing integration of XMLBeans with Springs O/X Mapping support
+ * Package providing integration of XMLBeans with Springs 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 9ddd6e25a9ce..5afdcbd22fbd 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,7 +1,7 @@
/**
*
- * Package providing integration of XStream with Springs O/X Mapping support
+ * Package providing integration of XStream with Springs 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 c8442c5a0b41..aa9862862fb4 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 b3807913cebe..2c9b7e02ecb3 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 74eaedead886..b9c3197bab25 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/test/java/org/springframework/oxm/AbstractMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
index 904080ab4fe9..dac51837633a 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java
@@ -74,7 +74,7 @@ public void marshalDOMResult() throws Exception {
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);
@@ -98,7 +98,7 @@ public void marshalEmptyDOMResult() throws Exception {
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 a66615ec7536..ced9a0de8dd6 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
@@ -79,7 +79,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
*/
private static final String XSI_EXPECTED_STRING = "" +
"" +
"test8";
@@ -94,7 +94,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
*/
private static final String ROOT_WITH_XSI_EXPECTED_STRING = "" +
"" +
"" +
"test8";
@@ -104,7 +104,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
*/
private static final String ROOT_WITHOUT_XSI_EXPECTED_STRING = "" +
"" +
"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 b89c119a6090..718efd031e42 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
@@ -187,7 +187,7 @@ private void testSupports() throws Exception {
marshaller.supports(method.getGenericReturnType()));
marshaller.setSupportJaxbElementClass(true);
- JAXBElement 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 05e8f9bd161a..01d7a03b2a60 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
@@ -77,9 +77,9 @@ public void marshalAttachments() throws Exception {
given(mimeContainer.getAttachment("<99bd1592-0521-41a2-9688-a8bfb40192fb@http://springframework.org/spring-ws>")).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 455c00637a1d..974d4dcfd772 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 @@
*/
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 039b8e1c08e7..8ce0062ec551 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 @@
*/
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 JAXBElement standardClassQName() {
}
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 92eee80e41ad..bf8d3718eb6b 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-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
index 4facc6aa0ace..7e244b323ccc 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
@@ -28,7 +28,7 @@
/**
* Helper class to configure Tiles 1.x for the Spring Framework. See
- * http://struts.apache.org
+ * https://struts.apache.org
* for more information about Struts Tiles, which basically is a templating
* mechanism for JSP-based web applications.
*
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
index d49ed27ea602..f3cff3c538fd 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
@@ -1,6 +1,6 @@
/**
* Support classes for the integration of
- * Tiles
+ * Tiles
* (included in Struts) as Spring web view technology.
* Contains a View implementation for Tiles definitions.
*/
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index d00b32575a0f..d733c108c63a 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -82,7 +82,7 @@
* Struts module, specifying appropriate "contextConfigLocation" parameters.
*
*
Note: The idea of delegating to Spring-managed Struts Actions originated in
- * Don Brown's Spring Struts Plugin.
+ * Don Brown's Spring Struts Plugin.
* ContextLoaderPlugIn and DelegatingActionProxy constitute a clean-room
* implementation of the same idea, essentially superseding the original plugin.
* Many thanks to Don Brown and Matt Raible for the original work and for the
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
index dffb21bc3ff9..f65d060262ac 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
@@ -81,7 +81,7 @@
* {@link DelegatingTilesRequestProcessor}.
*
*
Note: The idea of delegating to Spring-managed Struts Actions originated in
- * Don Brown's Spring Struts Plugin.
+ * Don Brown's Spring Struts Plugin.
* {@code ContextLoaderPlugIn} and {@code DelegatingActionProxy}
* constitute a clean-room implementation of the same idea, essentially
* superseding the original plugin. Many thanks to Don Brown and Matt Raible
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
index 2334e424fc64..3515ffd1853e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
@@ -58,7 +58,7 @@ private Document parseXmlString(String xml) throws Exception {
/**
* 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-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 9cb991f65f3a..b7d9edfebd00 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -163,7 +163,7 @@ protected void matchInternal(MockClientHttpRequest request) throws Exception {
/**
* 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-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
index 1939523544fc..5ce8cb3907ac 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
@@ -28,7 +28,7 @@
/**
* Factory methods for request content {@code RequestMatcher}'s using a
- * JSONPath expression.
+ * JSONPath expression.
* An instance of this class is typically accessed via
* {@code RequestMatchers.jsonPath(..)}.
*
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
index bcafc3d4ced4..2889833fea57 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
@@ -158,7 +158,7 @@ public static ContentRequestMatchers content() {
/**
* Access to request body matchers using a
- * JSONPath expression to
+ * JSONPath expression to
* inspect a specific subset of the body. The JSON path expression can be a
* parameterized string using formatting specifiers as defined in
* {@link String#format(String, Object...)}.
@@ -171,7 +171,7 @@ public static JsonPathRequestMatchers jsonPath(String expression, Object ... arg
/**
* Access to request body matchers using a
- * JSONPath expression to
+ * JSONPath expression to
* inspect a specific subset of the body and a Hamcrest match for asserting
* the value found at the JSON path.
* @param expression the JSON path expression
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index a4d62d27a9de..614f76d3c81d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -320,7 +320,7 @@ public MockHttpServletRequestBuilder principal(Principal principal) {
* 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)) {
@@ -342,7 +342,7 @@ public MockHttpServletRequestBuilder contextPath(String contextPath) {
* {@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)) {
@@ -360,7 +360,7 @@ public MockHttpServletRequestBuilder servletPath(String servletPath) {
* 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-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index e04c32b8f3f2..1cbdf4bedbca 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -190,7 +190,7 @@ public void match(MvcResult result) throws Exception {
* 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() {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
index a89bc87a8591..7aaed4bcd93f 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
@@ -23,7 +23,7 @@
/**
* Factory for assertions on the response content using JSONPath expressions.
+ * href="https://goessner.net/articles/JsonPath/">JSONPath expressions.
* An instance of this class is typically accessed via
* {@link MockMvcResultMatchers#jsonPath}.
*
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
index 2657b6384231..c1e9d755acb6 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
@@ -121,7 +121,7 @@ public static ContentResultMatchers content() {
/**
* Access to response body assertions using a JSONPath expression to
+ * href="https://goessner.net/articles/JsonPath/">JSONPath expression to
* inspect a specific subset of the body. The JSON path expression can be a
* parameterized string using formatting specifiers as defined in
* {@link String#format(String, Object...)}.
@@ -135,7 +135,7 @@ public static JsonPathResultMatchers jsonPath(String expression, Object ... args
/**
* Access to response body assertions using a JSONPath expression to
+ * href="https://goessner.net/articles/JsonPath/">JSONPath expression to
* inspect a specific subset of the body and a Hamcrest match for asserting
* the value found at the JSON path.
*
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
index fa5d55474c6d..a83cebf8f6b4 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java
@@ -43,21 +43,21 @@ public void setUp() {
@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-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
index 0f561b088375..aacfc192125a 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
@@ -42,7 +42,7 @@
/**
* Examples of defining expectations on JSON request content with
- * JSONPath expressions.
+ * JSONPath expressions.
*
* @author Rossen Stoyanchev
*/
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
index 9819e51cfeae..8967ce08b3b8 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java
@@ -56,7 +56,7 @@
public class XpathRequestMatcherTests {
private static final Map NS =
- Collections.singletonMap("ns", "http://example.org/music/people");
+ Collections.singletonMap("ns", "https://example.org/music/people");
private MockRestServiceServer mockServer;
@@ -200,7 +200,7 @@ public void testNodeCount() throws Exception {
@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-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index b5a9e7015d83..6ac31c4226d9 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -64,10 +64,10 @@ public void testEqualTo() throws Exception {
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
@@ -86,7 +86,7 @@ private static class PersonController {
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-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
index a83999fe91de..a28688c33d90 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java
@@ -42,7 +42,7 @@
/**
* Examples of defining expectations on JSON response content with
- * JSONPath expressions.
+ * JSONPath expressions.
*
* @author Rossen Stoyanchev
*
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
index 552d7ae8b28f..b33ded3e0717 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
@@ -58,7 +58,7 @@
public class XpathAssertionTests {
private static final Map NS =
- Collections.singletonMap("ns", "http://example.org/music/people");
+ Collections.singletonMap("ns", "https://example.org/music/people");
private MockMvc mockMvc;
@@ -174,7 +174,7 @@ private static class MusicController {
}
@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-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp b/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
index dc3f6216ae03..51499dabc981 100644
--- a/spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp
+++ b/spring-test-mvc/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-mvc/src/test/webapp/WEB-INF/layouts/main.jsp b/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp
index 408d8fc932a1..a3f3f6584ae9 100644
--- a/spring-test-mvc/src/test/webapp/WEB-INF/layouts/main.jsp
+++ b/spring-test-mvc/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-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 be8cb8601c87..bb7c5ac77f15 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
@@ -6,7 +6,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 3c28fee42b43..275f1f195405 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
@@ -6,7 +6,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.
*
*/
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index 240ebccf3bf3..b6f94c7d16e4 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -60,7 +60,7 @@
*
*
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-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
index 4933c8b194cd..8c906690afdc 100644
--- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
@@ -22,7 +22,7 @@
/**
* Abstract JUnit 3.8 based unit test which verifies new functionality requested
- * in SPR-3350.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
index 1f7b131fabd0..7631485ea4f3 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
@@ -18,7 +18,7 @@
/**
* JUnit 3.8 based unit test which verifies new functionality requested in SPR-3264.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
index a06397426ea2..697c1bae0118 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
@@ -18,7 +18,7 @@
/**
* JUnit 3.8 based unit test which verifies new functionality requested in SPR-3264.
*
* @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
index 00a519a5bf6b..b66a61932242 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
@@ -30,7 +30,7 @@
*
Proper registering of {@link TestExecutionListener listeners} in
* conjunction with a {@link TestContextManager}
*
*
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
index a57619d6da49..308ce66b949d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
@@ -44,7 +44,7 @@
* {@link BeforeTransaction @BeforeTransaction} and
* {@link AfterTransaction @AfterTransaction} methods can fail a test in a JUnit
* 3.8 environment, as requested in SPR-3960.
*
*
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
index 7bddfecab78b..f2a45552c078 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
@@ -42,7 +42,7 @@
* {@link BeforeTransaction @BeforeTransaction} and
* {@link AfterTransaction @AfterTransaction} methods can fail a test in a
* JUnit 4.4 environment, as requested in SPR-3960.
*
*
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
index b2f7401f0549..d5902aec2d87 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
@@ -149,7 +149,7 @@ public void repeatedFiveTimes() throws Exception {
/**
* Unit tests for claims raised in SPR-6011.
*/
@Ignore("TestCase classes are run manually by the enclosing test class")
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 93a4ee3de06c..4f6d52475242 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 @@
* 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 fc25f0b0db5c..1df3d9d894f9 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 @@
* 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 34a0c47fd18b..05d8e920d507 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 @@
* 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 c8b97e91c2cf..6ee211418f17 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 @@
* 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 401d66924e71..ac40f263734b 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 @@
* 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 cdd2d47b9a53..54f60cbcb83e 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 @@
* 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 9c59b53fa205..2e9b6e9cbb2c 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 @@
/**
* 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 157da6ec7c03..9739812fbfb0 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
@@ -28,7 +28,7 @@
/**
* 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/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
index 0b5b0428ef63..304828f7c160 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
@@ -28,7 +28,7 @@
* {@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 7dd753421cfb..2b407e4a9dd0 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
@@ -38,7 +38,7 @@
* {@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.
*
@@ -81,12 +81,12 @@ class ExplicitClasspathLocationsTestCase {
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 {
}
@@ -107,13 +107,13 @@ class ExplicitMixedPathTypesLocationsTestCase {
{ ExplicitFileLocationsTestCase.class, new String[] { "file:/testing/directory/context.xml" } },
- { ExplicitUrlLocationsTestCase.class, new String[] { "http://example.com/context.xml" } },
+ { ExplicitUrlLocationsTestCase.class, new String[] { "https://example.com/context.xml" } },
{
ExplicitMixedPathTypesLocationsTestCase.class,
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 a668c8c1c6a6..be05abe4a9dd 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
@@ -30,7 +30,7 @@
/**
*
* 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/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
index 39d0f64f628a..6f0b6fbb8d59 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
@@ -44,7 +44,7 @@
* {@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/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
index 53f4bd0a604d..15b932c63e37 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
@@ -24,7 +24,7 @@
/**
* Timed integration tests for
* {@link AbstractTransactionalTestNGSpringContextTests}; used to verify claim
- * raised in SPR-6124.
*
* @author Sam Brannen
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 f0aa02bd4388..93d3eec5385c 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 @@
/**
* 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 dd36227a3578..fe5c99a68033 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
@@ -12,7 +12,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).
*
*/
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 c784930cdcf5..c779c18172cf 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 @@
* <?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 dc1bb258513a..1411291a6034 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
@@ -38,7 +38,7 @@
* 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 2d3837e79614..ad6e3ce4a07e 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 761c69aaf4d2..4d0fb58fd842 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -27,11 +27,11 @@
* 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);
*
Some methods in this class were inspired by {@link org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity}.
*
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 a0a2e8884e56..66e560a097a1 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
@@ -40,7 +40,7 @@
/**
* Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
- * that can read and write JSON using Jackson 2's {@link ObjectMapper}.
+ * that can read and write JSON using Jackson 2's {@link ObjectMapper}.
*
*
This converter can be used to bind to typed beans, or untyped {@link java.util.HashMap HashMap} instances.
*
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
index 16cdf2097f01..aab52f905b0c 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -39,7 +39,7 @@
/**
* Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that
- * can read and write JSON using Jackson 1.x's {@link ObjectMapper}.
+ * can read and write JSON using Jackson 1.x's {@link ObjectMapper}.
*
*
This converter can be used to bind to typed beans, or untyped {@link java.util.HashMap 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 45f4a095b634..44751d781a68 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 @@
*
*
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 9e9237cf06bd..b30a33707f38 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 @@
*
*
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 e83eca06881a..93331bf9c05f 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 @@
*
*
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 8950257d4e72..e46de027c122 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
@@ -35,7 +35,7 @@
*
*
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 31d14d24407d..2dfa00ccab3b 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
@@ -43,7 +43,7 @@
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website
+ * Hessian website
*
*
Note: There is no requirement for services accessed with this proxy factory
* to have been exported using Spring's {@link HessianServiceExporter}, as there is
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 d6b0ab7e7d14..60496af1c99c 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
@@ -44,7 +44,7 @@
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
* Note: As of Spring 3.0, this exporter requires Hessian 3.2 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 4b40bb6a0e49..501aeb891f76 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 @@
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website
+ * Hessian website
*
*
The service URL must be an HTTP URL exposing a Hessian service.
* For details, see the {@link HessianClientInterceptor} javadoc.
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 dddbb3f4a9c0..96cda77bec45 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 @@
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
* Note: As of Spring 3.0, this exporter requires Hessian 3.2 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 bff3d645db2a..15f336d94386 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
@@ -32,7 +32,7 @@
*
*
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 125ebeb8257c..8f1e29bb9e82 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
@@ -32,7 +32,7 @@
*
*
Hessian is a slim, binary RPC protocol.
* For information on Hessian, see the
- * Hessian website.
+ * Hessian website.
* Note: As of Spring 3.0, this exporter requires Hessian 3.2 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 68e2b0ee5bff..2c560b39fe3a 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
@@ -7,11 +7,11 @@
*
*
Hessian is a slim, binary RPC protocol over HTTP.
* For information on Hessian, see the
- * Hessian website
+ * Hessian website
*
*
Burlap is a slim, XML-based RPC protocol over HTTP.
* For information on Burlap, see the
- * Burlap website
+ * Burlap website
*
*/
package org.springframework.remoting.caucho;
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
index 8ec9fcfe12c0..4fe50eeda826 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
@@ -36,7 +36,7 @@
/**
* {@link HttpInvokerRequestExecutor} implementation that uses
- * Jakarta Commons HttpClient
+ * Jakarta Commons HttpClient
* to execute POST requests. Requires Commons HttpClient 3.0 or higher.
*
*
Allows to use a pre-configured {@link org.apache.commons.httpclient.HttpClient}
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 58c27eb92b04..0e3ed9e36dfa 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
@@ -44,7 +44,7 @@
/**
* {@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 801e065076b6..112be0677c41 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 @@
* 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/client/RestOperations.java b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
index a60de73c1549..ef8db606b84d 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
@@ -409,7 +409,7 @@ ResponseEntity exchange(URI url, HttpMethod method, HttpEntity request
* The given {@link ParameterizedTypeReference} is used to pass generic type information:
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -429,7 +429,7 @@ ResponseEntity exchange(String url,HttpMethod method, HttpEntity reque
* The given {@link ParameterizedTypeReference} is used to pass generic type information:
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
@@ -448,7 +448,7 @@ ResponseEntity exchange(String url, HttpMethod method, HttpEntity requ
* The given {@link ParameterizedTypeReference} is used to pass generic type information:
*
* @param url the URL
* @param method the HTTP method (GET, POST, etc)
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 4601722eb226..bb331f14d2a2 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -81,27 +81,27 @@
* in that URL using either a {@code String} variable arguments array, or a {@code Map}.
* The string varargs variant expands the given template variables in order, so that
*
- * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
+ * String result = restTemplate.getForObject("https://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
* "21");
*
- * will perform a GET on {@code http://example.com/hotels/42/bookings/21}. The map variant expands the template based
+ * will perform a GET on {@code https://example.com/hotels/42/bookings/21}. The map variant expands the template based
* on variable name, and is therefore more useful when using many variables, or when a single variable is used multiple
* times. For example:
*
* Map<String, String> vars = Collections.singletonMap("hotel", "42");
- * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
+ * String result = restTemplate.getForObject("https://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
*
- * will perform a GET on {@code http://example.com/hotels/42/rooms/42}. Alternatively, there are {@link URI} variant
+ * will perform a GET on {@code https://example.com/hotels/42/rooms/42}. Alternatively, there are {@link URI} variant
* methods ({@link #getForObject(URI, Class)}), which do not allow for URI templates, but allow you to reuse a single,
* expanded URI multiple times.
*
*
Furthermore, the {@code String}-argument methods assume that the URL String is unencoded. This means that
*
- * will perform a GET on {@code http://example.com/hotel%20list}. As a result, any URL passed that is already encoded
- * will be encoded twice (i.e. {@code http://example.com/hotel%20list} will become {@code
- * http://example.com/hotel%2520list}). If this behavior is undesirable, use the {@code URI}-argument methods, which
+ * will perform a GET on {@code https://example.com/hotel%20list}. As a result, any URL passed that is already encoded
+ * will be encoded twice (i.e. {@code https://example.com/hotel%20list} will become {@code
+ * https://example.com/hotel%2520list}). If this behavior is undesirable, use the {@code URI}-argument methods, which
* will not perform any URL encoding.
*
*
Objects passed to and returned from these methods are converted to and from HTTP messages by
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 aeb0542b3fa9..c8d7b6423911 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 @@
/**
* 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 9cf21593605c..722708b6d7d7 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 @@
/**
* 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 001283a1fe9f..fbc333b974f5 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 8e34931b4895..cec39b3f220c 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
@@ -41,7 +41,7 @@
* @author Arjen Poutsma
* @author Phillip Webb
* @since 3.1.3
- * @see Hierarchical URIs
+ * @see Hierarchical URIs
*/
@SuppressWarnings("serial")
final class HierarchicalUriComponents extends UriComponents {
@@ -441,7 +441,7 @@ public int hashCode() {
/**
* Enumeration used to identify the parts of a URI.
*
Contains methods to indicate whether a given character is valid in a specific URI component.
- * @see RFC 3986
+ * @see RFC 3986
*/
static enum Type {
@@ -519,7 +519,7 @@ public boolean isAllowed(int c) {
/**
* 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';
@@ -527,7 +527,7 @@ protected boolean isAlpha(int c) {
/**
* 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';
@@ -535,7 +535,7 @@ protected boolean isDigit(int c) {
/**
* 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;
@@ -543,7 +543,7 @@ protected boolean isGenericDelimiter(int c) {
/**
* 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 ||
@@ -552,7 +552,7 @@ protected boolean isSubDelimiter(int c) {
/**
* Indicates whether the given character is in the {@code reserved} set.
- * @see RFC 3986, appendix A
+ * @see RFC 3986, appendix A
*/
protected boolean isReserved(char c) {
return isGenericDelimiter(c) || isReserved(c);
@@ -560,7 +560,7 @@ protected boolean isReserved(char c) {
/**
* 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;
@@ -568,7 +568,7 @@ protected boolean isUnreserved(int c) {
/**
* 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 bce4655edacf..43486813ea84 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 @@
* @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/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 565ba94c3fbf..e2b0a03514da 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 @@
* @author Arjen Poutsma
* @author Juergen Hoeller
* @since 3.0
- * @see URI Templates
+ * @see URI Templates
*/
@SuppressWarnings("serial")
public class UriTemplate implements Serializable {
@@ -85,13 +85,13 @@ public List getVariableNames() {
* 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};
@@ -108,10 +108,10 @@ public URI expand(Map uriVariables) {
* 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}
@@ -141,8 +141,8 @@ public boolean matches(String uri) {
* values are variable values, as occurred in the given URI.
*
* @param uri the URI to match to
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
index 0f1f6222a58d..ade6b47f84de 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
@@ -37,7 +37,7 @@
*
* @author Arjen Poutsma
* @since 3.0
- * @see RFC 3986
+ * @see RFC 3986
*/
public abstract class UriUtils {
diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
index 21d8c2bd6756..5061c14eb103 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -115,10 +115,10 @@ public void contentType() {
@Test
public void location() throws URISyntaxException {
- URI location = new URI("http://www.example.com/hotels");
+ URI location = new URI("https://www.example.com/hotels");
headers.setLocation(location);
assertEquals("Invalid Location header", location, headers.getLocation());
- assertEquals("Invalid Location header", "http://www.example.com/hotels", headers.getFirst("Location"));
+ assertEquals("Invalid Location header", "https://www.example.com/hotels", headers.getFirst("Location"));
}
@Test
diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
index 48c6052d625e..3e49573703e6 100644
--- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
@@ -65,7 +65,7 @@ public void basic() throws Exception {
interceptors.add(new NoOpInterceptor());
requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, interceptors);
- ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+ ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
ClientHttpResponse response = request.execute();
assertTrue(((NoOpInterceptor) interceptors.get(0)).invoked);
@@ -89,7 +89,7 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttp
interceptors.add(new NoOpInterceptor());
requestFactory = new InterceptingClientHttpRequestFactory(requestFactoryMock, interceptors);
- ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+ ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
ClientHttpResponse response = request.execute();
assertFalse(((NoOpInterceptor) interceptors.get(1)).invoked);
@@ -128,13 +128,13 @@ public ClientHttpResponse execute() throws IOException {
requestFactory =
new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
- ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+ ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
request.execute();
}
@Test
public void changeURI() throws Exception {
- final URI changedUri = new URI("http://example.com/2");
+ final URI changedUri = new URI("https://example.com/2");
ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
@@ -161,7 +161,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
requestFactory =
new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
- ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+ ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
request.execute();
}
@@ -194,7 +194,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
requestFactory =
new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
- ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+ ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
request.execute();
}
@@ -213,7 +213,7 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttp
requestFactory =
new InterceptingClientHttpRequestFactory(requestFactoryMock, Collections.singletonList(interceptor));
- ClientHttpRequest request = requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET);
+ ClientHttpRequest request = requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET);
request.execute();
assertTrue(Arrays.equals(changedBody, requestMock.body.toByteArray()));
}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
index c6e46f649132..df0c0c51df8c 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
@@ -72,7 +72,7 @@ public void read() throws IOException {
inputMessage.getHeaders().setContentType(new MediaType("application", "rss+xml", utf8));
Channel result = converter.read(Channel.class, inputMessage);
assertEquals("title", result.getTitle());
- assertEquals("http://example.com", result.getLink());
+ assertEquals("https://example.com", result.getLink());
assertEquals("description", result.getDescription());
List items = result.getItems();
@@ -89,7 +89,7 @@ public void read() throws IOException {
public void write() throws IOException, SAXException {
Channel channel = new Channel("rss_2.0");
channel.setTitle("title");
- channel.setLink("http://example.com");
+ channel.setLink("https://example.com");
channel.setDescription("description");
Item item1 = new Item();
@@ -109,7 +109,7 @@ public void write() throws IOException, SAXException {
assertEquals("Invalid content-type", new MediaType("application", "rss+xml", utf8),
outputMessage.getHeaders().getContentType());
String expected = "" +
- "titlehttp://example.comdescription" +
+ "titlehttps://example.comdescription" +
"title1" +
"title2" +
"";
@@ -120,7 +120,7 @@ public void write() throws IOException, SAXException {
public void writeOtherCharset() throws IOException, SAXException {
Channel channel = new Channel("rss_2.0");
channel.setTitle("title");
- channel.setLink("http://example.com");
+ channel.setLink("https://example.com");
channel.setDescription("description");
String encoding = "ISO-8859-1";
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index 1f95148c80dc..3a715e7e086c 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -112,7 +112,7 @@ public void readXmlType() throws Exception {
@Test
public void readXmlRootElementExternalEntityDisabled() throws Exception {
Resource external = new ClassPathResource("external.txt", getClass());
- String content = "\n" +
" ]>" +
" &ext;";
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
index 2abb91ea7345..96dd63df5252 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
@@ -70,7 +70,7 @@ public class SourceHttpMessageConverterTests {
public void setUp() throws IOException {
converter = new SourceHttpMessageConverter();
Resource external = new ClassPathResource("external.txt", getClass());
- bodyExternal = "\n" +
" ]>&ext;";
}
diff --git a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
index a5220ff90f36..05bce08de80d 100644
--- a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
@@ -56,7 +56,7 @@ public void getMethod() throws Exception {
@Test
public void getURI() throws Exception {
- URI uri = new URI("http://example.com/path?query");
+ URI uri = new URI("https://example.com/path?query");
mockRequest.setServerName(uri.getHost());
mockRequest.setServerPort(uri.getPort());
mockRequest.setRequestURI(uri.getPath());
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
index 9fafa1d30ea9..2fd22c6aa136 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
@@ -75,7 +75,7 @@ public void setUp() {
@Test
public void varArgsTemplateVariables() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com/hotels/42/bookings/21"), HttpMethod.GET))
+ given(requestFactory.createRequest(new URI("https://example.com/hotels/42/bookings/21"), HttpMethod.GET))
.willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
@@ -83,7 +83,7 @@ public void varArgsTemplateVariables() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- template.execute("http://example.com/hotels/{hotel}/bookings/{booking}", HttpMethod.GET, null, null, "42",
+ template.execute("https://example.com/hotels/{hotel}/bookings/{booking}", HttpMethod.GET, null, null, "42",
"21");
verify(response).close();
@@ -91,7 +91,7 @@ public void varArgsTemplateVariables() throws Exception {
@Test
public void varArgsNullTemplateVariable() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com/-foo"), HttpMethod.GET))
+ given(requestFactory.createRequest(new URI("https://example.com/-foo"), HttpMethod.GET))
.willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
@@ -99,14 +99,14 @@ public void varArgsNullTemplateVariable() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- template.execute("http://example.com/{first}-{last}", HttpMethod.GET, null, null, null, "foo");
+ template.execute("https://example.com/{first}-{last}", HttpMethod.GET, null, null, null, "foo");
verify(response).close();
}
@Test
public void mapTemplateVariables() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com/hotels/42/bookings/42"), HttpMethod.GET))
+ given(requestFactory.createRequest(new URI("https://example.com/hotels/42/bookings/42"), HttpMethod.GET))
.willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
@@ -115,14 +115,14 @@ public void mapTemplateVariables() throws Exception {
given(response.getStatusText()).willReturn(status.getReasonPhrase());
Map vars = Collections.singletonMap("hotel", "42");
- template.execute("http://example.com/hotels/{hotel}/bookings/{hotel}", HttpMethod.GET, null, null, vars);
+ template.execute("https://example.com/hotels/{hotel}/bookings/{hotel}", HttpMethod.GET, null, null, vars);
verify(response).close();
}
@Test
public void mapNullTemplateVariable() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com/-foo"), HttpMethod.GET))
+ given(requestFactory.createRequest(new URI("https://example.com/-foo"), HttpMethod.GET))
.willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
@@ -133,14 +133,14 @@ public void mapNullTemplateVariable() throws Exception {
Map vars = new HashMap(2);
vars.put("first", null);
vars.put("last", "foo");
- template.execute("http://example.com/{first}-{last}", HttpMethod.GET, null, null, vars);
+ template.execute("https://example.com/{first}-{last}", HttpMethod.GET, null, null, vars);
verify(response).close();
}
@Test
public void errorHandling() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET)).willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(true);
given(response.getStatusCode()).willReturn(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -148,7 +148,7 @@ public void errorHandling() throws Exception {
willThrow(new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR)).given(errorHandler).handleError(response);
try {
- template.execute("http://example.com", HttpMethod.GET, null, null);
+ template.execute("https://example.com", HttpMethod.GET, null, null);
fail("HttpServerErrorException expected");
}
catch (HttpServerErrorException ex) {
@@ -163,7 +163,7 @@ public void getForObject() throws Exception {
given(converter.canRead(String.class, null)).willReturn(true);
MediaType textPlain = new MediaType("text", "plain");
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -180,7 +180,7 @@ public void getForObject() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- String result = template.getForObject("http://example.com", String.class);
+ String result = template.getForObject("https://example.com", String.class);
assertEquals("Invalid GET result", expected, result);
assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
@@ -192,7 +192,7 @@ public void getUnsupportedMediaType() throws Exception {
given(converter.canRead(String.class, null)).willReturn(true);
MediaType supportedMediaType = new MediaType("foo", "bar");
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(supportedMediaType));
- given(requestFactory.createRequest(new URI("http://example.com/resource"), HttpMethod.GET)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com/resource"), HttpMethod.GET)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -209,7 +209,7 @@ public void getUnsupportedMediaType() throws Exception {
given(response.getStatusText()).willReturn(status.getReasonPhrase());
try {
- template.getForObject("http://example.com/{p}", String.class, "resource");
+ template.getForObject("https://example.com/{p}", String.class, "resource");
fail("UnsupportedMediaTypeException expected");
}
catch (RestClientException ex) {
@@ -225,7 +225,7 @@ public void getForEntity() throws Exception {
given(converter.canRead(String.class, null)).willReturn(true);
MediaType textPlain = new MediaType("text", "plain");
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.GET)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -243,7 +243,7 @@ public void getForEntity() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- ResponseEntity result = template.getForEntity("http://example.com", String.class);
+ ResponseEntity result = template.getForEntity("https://example.com", String.class);
assertEquals("Invalid GET result", expected, result.getBody());
assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
assertEquals("Invalid Content-Type header", textPlain, result.getHeaders().getContentType());
@@ -255,7 +255,7 @@ public void getForEntity() throws Exception {
@Test
public void headForHeaders() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.HEAD)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.HEAD)).willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
@@ -264,7 +264,7 @@ public void headForHeaders() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- HttpHeaders result = template.headForHeaders("http://example.com");
+ HttpHeaders result = template.headForHeaders("https://example.com");
assertSame("Invalid headers returned", responseHeaders, result);
@@ -273,21 +273,21 @@ public void headForHeaders() throws Exception {
@Test
public void postForLocation() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
String helloWorld = "Hello World";
given(converter.canWrite(String.class, null)).willReturn(true);
converter.write(helloWorld, null, request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
- URI expected = new URI("http://example.com/hotels");
+ URI expected = new URI("https://example.com/hotels");
responseHeaders.setLocation(expected);
given(response.getHeaders()).willReturn(responseHeaders);
HttpStatus status = HttpStatus.OK;
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- URI result = template.postForLocation("http://example.com", helloWorld);
+ URI result = template.postForLocation("https://example.com", helloWorld);
assertEquals("Invalid POST result", expected, result);
verify(response).close();
@@ -295,7 +295,7 @@ public void postForLocation() throws Exception {
@Test
public void postForLocationEntityContentType() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
String helloWorld = "Hello World";
MediaType contentType = MediaType.TEXT_PLAIN;
given(converter.canWrite(String.class, contentType)).willReturn(true);
@@ -305,7 +305,7 @@ public void postForLocationEntityContentType() throws Exception {
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
- URI expected = new URI("http://example.com/hotels");
+ URI expected = new URI("https://example.com/hotels");
responseHeaders.setLocation(expected);
given(response.getHeaders()).willReturn(responseHeaders);
HttpStatus status = HttpStatus.OK;
@@ -316,7 +316,7 @@ public void postForLocationEntityContentType() throws Exception {
entityHeaders.setContentType(contentType);
HttpEntity entity = new HttpEntity(helloWorld, entityHeaders);
- URI result = template.postForLocation("http://example.com", entity);
+ URI result = template.postForLocation("https://example.com", entity);
assertEquals("Invalid POST result", expected, result);
verify(response).close();
@@ -324,7 +324,7 @@ public void postForLocationEntityContentType() throws Exception {
@Test
public void postForLocationEntityCustomHeader() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
String helloWorld = "Hello World";
given(converter.canWrite(String.class, null)).willReturn(true);
HttpHeaders requestHeaders = new HttpHeaders();
@@ -333,7 +333,7 @@ public void postForLocationEntityCustomHeader() throws Exception {
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
- URI expected = new URI("http://example.com/hotels");
+ URI expected = new URI("https://example.com/hotels");
responseHeaders.setLocation(expected);
given(response.getHeaders()).willReturn(responseHeaders);
HttpStatus status = HttpStatus.OK;
@@ -344,7 +344,7 @@ public void postForLocationEntityCustomHeader() throws Exception {
entityHeaders.set("MyHeader", "MyValue");
HttpEntity entity = new HttpEntity(helloWorld, entityHeaders);
- URI result = template.postForLocation("http://example.com", entity);
+ URI result = template.postForLocation("https://example.com", entity);
assertEquals("Invalid POST result", expected, result);
assertEquals("No custom header set", "MyValue", requestHeaders.getFirst("MyHeader"));
@@ -353,7 +353,7 @@ public void postForLocationEntityCustomHeader() throws Exception {
@Test
public void postForLocationNoLocation() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
String helloWorld = "Hello World";
given(converter.canWrite(String.class, null)).willReturn(true);
converter.write(helloWorld, null, request);
@@ -365,7 +365,7 @@ public void postForLocationNoLocation() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- URI result = template.postForLocation("http://example.com", helloWorld);
+ URI result = template.postForLocation("https://example.com", helloWorld);
assertNull("Invalid POST result", result);
verify(response).close();
@@ -373,7 +373,7 @@ public void postForLocationNoLocation() throws Exception {
@Test
public void postForLocationNull() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -384,7 +384,7 @@ public void postForLocationNull() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- template.postForLocation("http://example.com", null);
+ template.postForLocation("https://example.com", null);
assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
verify(response).close();
@@ -395,7 +395,7 @@ public void postForObject() throws Exception {
MediaType textPlain = new MediaType("text", "plain");
given(converter.canRead(Integer.class, null)).willReturn(true);
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
HttpHeaders requestHeaders = new HttpHeaders();
given(this.request.getHeaders()).willReturn(requestHeaders);
String request = "Hello World";
@@ -415,7 +415,7 @@ public void postForObject() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- Integer result = template.postForObject("http://example.com", request, Integer.class);
+ Integer result = template.postForObject("https://example.com", request, Integer.class);
assertEquals("Invalid POST result", expected, result);
assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
@@ -427,7 +427,7 @@ public void postForEntity() throws Exception {
MediaType textPlain = new MediaType("text", "plain");
given(converter.canRead(Integer.class, null)).willReturn(true);
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
HttpHeaders requestHeaders = new HttpHeaders();
given(this.request.getHeaders()).willReturn(requestHeaders);
String request = "Hello World";
@@ -448,7 +448,7 @@ public void postForEntity() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- ResponseEntity result = template.postForEntity("http://example.com", request, Integer.class);
+ ResponseEntity result = template.postForEntity("https://example.com", request, Integer.class);
assertEquals("Invalid POST result", expected, result.getBody());
assertEquals("Invalid Content-Type", textPlain, result.getHeaders().getContentType());
assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
@@ -462,7 +462,7 @@ public void postForObjectNull() throws Exception {
MediaType textPlain = new MediaType("text", "plain");
given(converter.canRead(Integer.class, null)).willReturn(true);
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -478,7 +478,7 @@ public void postForObjectNull() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- Integer result = template.postForObject("http://example.com", null, Integer.class);
+ Integer result = template.postForObject("https://example.com", null, Integer.class);
assertNull("Invalid POST result", result);
assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
@@ -490,7 +490,7 @@ public void postForEntityNull() throws Exception {
MediaType textPlain = new MediaType("text", "plain");
given(converter.canRead(Integer.class, null)).willReturn(true);
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(textPlain));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -507,7 +507,7 @@ public void postForEntityNull() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- ResponseEntity result = template.postForEntity("http://example.com", null, Integer.class);
+ ResponseEntity result = template.postForEntity("https://example.com", null, Integer.class);
assertFalse("Invalid POST result", result.hasBody());
assertEquals("Invalid Content-Type", textPlain, result.getHeaders().getContentType());
assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
@@ -519,7 +519,7 @@ public void postForEntityNull() throws Exception {
@Test
public void put() throws Exception {
given(converter.canWrite(String.class, null)).willReturn(true);
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.PUT)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.PUT)).willReturn(request);
String helloWorld = "Hello World";
converter.write(helloWorld, null, request);
given(request.execute()).willReturn(response);
@@ -528,14 +528,14 @@ public void put() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- template.put("http://example.com", helloWorld);
+ template.put("https://example.com", helloWorld);
verify(response).close();
}
@Test
public void putNull() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.PUT)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.PUT)).willReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
given(request.getHeaders()).willReturn(requestHeaders);
given(request.execute()).willReturn(response);
@@ -544,7 +544,7 @@ public void putNull() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- template.put("http://example.com", null);
+ template.put("https://example.com", null);
assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
verify(response).close();
@@ -552,21 +552,21 @@ public void putNull() throws Exception {
@Test
public void delete() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.DELETE)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.DELETE)).willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
HttpStatus status = HttpStatus.OK;
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- template.delete("http://example.com");
+ template.delete("https://example.com");
verify(response).close();
}
@Test
public void optionsForAllow() throws Exception {
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.OPTIONS)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.OPTIONS)).willReturn(request);
given(request.execute()).willReturn(response);
given(errorHandler.hasError(response)).willReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
@@ -577,7 +577,7 @@ public void optionsForAllow() throws Exception {
given(response.getStatusCode()).willReturn(status);
given(response.getStatusText()).willReturn(status.getReasonPhrase());
- Set result = template.optionsForAllow("http://example.com");
+ Set result = template.optionsForAllow("https://example.com");
assertEquals("Invalid OPTIONS result", expected, result);
verify(response).close();
@@ -588,12 +588,12 @@ public void ioException() throws Exception {
given(converter.canRead(String.class, null)).willReturn(true);
MediaType mediaType = new MediaType("foo", "bar");
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(mediaType));
- given(requestFactory.createRequest(new URI("http://example.com/resource"), HttpMethod.GET)).willReturn(request);
+ given(requestFactory.createRequest(new URI("https://example.com/resource"), HttpMethod.GET)).willReturn(request);
given(request.getHeaders()).willReturn(new HttpHeaders());
given(request.execute()).willThrow(new IOException());
try {
- template.getForObject("http://example.com/resource", String.class);
+ template.getForObject("https://example.com/resource", String.class);
fail("RestClientException expected");
}
catch (ResourceAccessException ex) {
@@ -605,7 +605,7 @@ public void ioException() throws Exception {
public void exchange() throws Exception {
given(converter.canRead(Integer.class, null)).willReturn(true);
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
HttpHeaders requestHeaders = new HttpHeaders();
given(this.request.getHeaders()).willReturn(requestHeaders);
given(converter.canWrite(String.class, null)).willReturn(true);
@@ -629,7 +629,7 @@ public void exchange() throws Exception {
HttpHeaders entityHeaders = new HttpHeaders();
entityHeaders.set("MyHeader", "MyValue");
HttpEntity requestEntity = new HttpEntity(body, entityHeaders);
- ResponseEntity result = template.exchange("http://example.com", HttpMethod.POST, requestEntity, Integer.class);
+ ResponseEntity result = template.exchange("https://example.com", HttpMethod.POST, requestEntity, Integer.class);
assertEquals("Invalid POST result", expected, result.getBody());
assertEquals("Invalid Content-Type", MediaType.TEXT_PLAIN, result.getHeaders().getContentType());
assertEquals("Invalid Accept header", MediaType.TEXT_PLAIN_VALUE, requestHeaders.getFirst("Accept"));
@@ -647,7 +647,7 @@ public void exchangeParameterizedType() throws Exception {
ParameterizedTypeReference> intList = new ParameterizedTypeReference>() {};
given(converter.canRead(intList.getType(), null, null)).willReturn(true);
given(converter.getSupportedMediaTypes()).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
- given(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).willReturn(this.request);
+ given(requestFactory.createRequest(new URI("https://example.com"), HttpMethod.POST)).willReturn(this.request);
HttpHeaders requestHeaders = new HttpHeaders();
given(this.request.getHeaders()).willReturn(requestHeaders);
given(converter.canWrite(String.class, null)).willReturn(true);
@@ -671,7 +671,7 @@ public void exchangeParameterizedType() throws Exception {
HttpHeaders entityHeaders = new HttpHeaders();
entityHeaders.set("MyHeader", "MyValue");
HttpEntity requestEntity = new HttpEntity(requestBody, entityHeaders);
- ResponseEntity> result = template.exchange("http://example.com", HttpMethod.POST, requestEntity, intList);
+ ResponseEntity> result = template.exchange("https://example.com", HttpMethod.POST, requestEntity, intList);
assertEquals("Invalid POST result", expected, result.getBody());
assertEquals("Invalid Content-Type", MediaType.TEXT_PLAIN, result.getHeaders().getContentType());
assertEquals("Invalid Accept header", MediaType.TEXT_PLAIN_VALUE, requestHeaders.getFirst("Accept"));
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
index a409f3194cfb..a48110a7d499 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
@@ -57,7 +57,7 @@ public void getMethod() throws Exception {
@Test
public void getURI() throws Exception {
- URI uri = new URI("http://example.com/path?query");
+ URI uri = new URI("https://example.com/path?query");
mockRequest.setServerName(uri.getHost());
mockRequest.setServerPort(uri.getPort());
mockRequest.setRequestURI(uri.getPath());
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
index 97e7d6900d3b..905ac0798023 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -48,7 +48,7 @@ public void plain() throws URISyntaxException {
assertEquals("bar", result.getQuery());
assertEquals("baz", result.getFragment());
- URI expected = new URI("http://example.com/foo?bar#baz");
+ URI expected = new URI("https://example.com/foo?bar#baz");
assertEquals("Invalid result URI", expected, result.toUri());
}
@@ -62,7 +62,7 @@ public void multipleFromSameBuilder() throws URISyntaxException {
assertEquals("http", result1.getScheme());
assertEquals("example.com", result1.getHost());
assertEquals("/foo", result1.getPath());
- URI expected = new URI("http://example.com/foo");
+ URI expected = new URI("https://example.com/foo");
assertEquals("Invalid result URI", expected, result1.toUri());
assertEquals("http", result2.getScheme());
@@ -70,7 +70,7 @@ public void multipleFromSameBuilder() throws URISyntaxException {
assertEquals("/foo/foo2", result2.getPath());
assertEquals("bar", result2.getQuery());
assertEquals("baz", result2.getFragment());
- expected = new URI("http://example.com/foo/foo2?bar#baz");
+ expected = new URI("https://example.com/foo/foo2?bar#baz");
assertEquals("Invalid result URI", expected, result2.toUri());
}
@@ -95,7 +95,7 @@ public void fromPath() throws URISyntaxException {
@Test
public void fromHierarchicalUri() throws URISyntaxException {
- URI uri = new URI("http://example.com/foo?bar#baz");
+ URI uri = new URI("https://example.com/foo?bar#baz");
UriComponents result = UriComponentsBuilder.fromUri(uri).build();
assertEquals("http", result.getScheme());
assertEquals("example.com", result.getHost());
@@ -121,7 +121,7 @@ public void fromOpaqueUri() throws URISyntaxException {
@Test
public void fromUriEncodedQuery() throws URISyntaxException {
- URI uri = new URI("http://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
+ URI uri = new URI("https://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0);
String fromUriString = UriComponentsBuilder.fromUriString(uri.toString()).build().getQueryParams().get("param").get(0);
@@ -130,7 +130,7 @@ public void fromUriEncodedQuery() throws URISyntaxException {
@Test
public void fromUriString() {
- UriComponents result = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc3986.txt").build();
+ UriComponents result = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc3986.txt").build();
assertEquals("http", result.getScheme());
assertNull(result.getUserInfo());
assertEquals("www.ietf.org", result.getHost());
@@ -141,7 +141,7 @@ public void fromUriString() {
assertNull(result.getFragment());
result = UriComponentsBuilder.fromUriString(
- "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)")
+ "https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)")
.build();
assertEquals("http", result.getScheme());
assertEquals("arjen:foobar", result.getUserInfo());
@@ -178,7 +178,7 @@ public void fromUriString() {
@Test
public void fromUriStringQueryParamWithReservedCharInValue() throws URISyntaxException {
- String uri = "http://www.google.com/ig/calculator?q=1USD=?EUR";
+ String uri = "https://www.google.com/ig/calculator?q=1USD=?EUR";
UriComponents result = UriComponentsBuilder.fromUriString(uri).build();
assertEquals("q=1USD=?EUR", result.getQuery());
@@ -197,7 +197,7 @@ public void fromHttpUrlStringCaseInsesitiveScheme() {
@Test
public void fromUriStringNoPathWithReservedCharInQuery() {
- UriComponents result = UriComponentsBuilder.fromUriString("http://example.com?foo=bar@baz").build();
+ UriComponents result = UriComponentsBuilder.fromUriString("https://example.com?foo=bar@baz").build();
assertTrue(StringUtils.isEmpty(result.getUserInfo()));
assertEquals("example.com", result.getHost());
assertTrue(result.getQueryParams().containsKey("foo"));
@@ -269,32 +269,32 @@ public void pathSegmentsSomeEmpty() {
@Test
public void replacePath() {
- UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc2396.txt");
+ UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc2396.txt");
builder.replacePath("/rfc/rfc3986.txt");
UriComponents result = builder.build();
- assertEquals("http://www.ietf.org/rfc/rfc3986.txt", result.toUriString());
+ assertEquals("https://www.ietf.org/rfc/rfc3986.txt", result.toUriString());
- builder = UriComponentsBuilder.fromUriString("http://www.ietf.org/rfc/rfc2396.txt");
+ builder = UriComponentsBuilder.fromUriString("https://www.ietf.org/rfc/rfc2396.txt");
builder.replacePath(null);
result = builder.build();
- assertEquals("http://www.ietf.org", result.toUriString());
+ assertEquals("https://www.ietf.org", result.toUriString());
}
@Test
public void replaceQuery() {
- UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("http://example.com/foo?foo=bar&baz=qux");
+ UriComponentsBuilder builder = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar&baz=qux");
builder.replaceQuery("baz=42");
UriComponents result = builder.build();
- assertEquals("http://example.com/foo?baz=42", result.toUriString());
+ assertEquals("https://example.com/foo?baz=42", result.toUriString());
- builder = UriComponentsBuilder.fromUriString("http://example.com/foo?foo=bar&baz=qux");
+ builder = UriComponentsBuilder.fromUriString("https://example.com/foo?foo=bar&baz=qux");
builder.replaceQuery(null);
result = builder.build();
- assertEquals("http://example.com/foo", result.toUriString());
+ assertEquals("https://example.com/foo", result.toUriString());
}
@Test
@@ -361,41 +361,41 @@ public void buildAndExpandOpaque() {
@Test
public void queryParamWithValueWithEquals() throws Exception {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo?bar=baz").build();
- assertThat(uriComponents.toUriString(), equalTo("http://example.com/foo?bar=baz"));
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=baz").build();
+ assertThat(uriComponents.toUriString(), equalTo("https://example.com/foo?bar=baz"));
}
@Test
public void queryParamWithoutValueWithEquals() throws Exception {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo?bar=").build();
- assertThat(uriComponents.toUriString(), equalTo("http://example.com/foo?bar="));
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=").build();
+ assertThat(uriComponents.toUriString(), equalTo("https://example.com/foo?bar="));
}
@Test
public void queryParamWithoutValueWithoutEquals() throws Exception {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo?bar").build();
- assertThat(uriComponents.toUriString(), equalTo("http://example.com/foo?bar"));
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar").build();
+ assertThat(uriComponents.toUriString(), equalTo("https://example.com/foo?bar"));
}
@Test
public void relativeUrls() throws Exception {
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build().toString(), equalTo("http://example.com/foo/../bar"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build().toUriString(), equalTo("http://example.com/foo/../bar"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build().toString(), equalTo("https://example.com/foo/../bar"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build().toUriString(), equalTo("https://example.com/foo/../bar"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
assertThat(UriComponentsBuilder.fromUriString("../../").build().toString(), equalTo("../../"));
assertThat(UriComponentsBuilder.fromUriString("../../").build().toUriString(), equalTo("../../"));
assertThat(UriComponentsBuilder.fromUriString("../../").build().toUri().getPath(), equalTo("../../"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com").path("foo/../bar").build().toString(), equalTo("http://example.com/foo/../bar"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com").path("foo/../bar").build().toUriString(), equalTo("http://example.com/foo/../bar"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com").path("foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com").path("foo/../bar").build().toString(), equalTo("https://example.com/foo/../bar"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com").path("foo/../bar").build().toUriString(), equalTo("https://example.com/foo/../bar"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com").path("foo/../bar").build().toUri().getPath(), equalTo("/foo/../bar"));
}
@Test
public void emptySegments() throws Exception {
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").path("/x/y/z").build().toString(), equalTo("http://example.com/abc/x/y/z"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").pathSegment("x", "y", "z").build().toString(), equalTo("http://example.com/abc/x/y/z"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").path("/x/").path("/y/z").build().toString(), equalTo("http://example.com/abc/x/y/z"));
- assertThat(UriComponentsBuilder.fromUriString("http://example.com/abc/").pathSegment("x").path("y").build().toString(), equalTo("http://example.com/abc/x/y"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").path("/x/y/z").build().toString(), equalTo("https://example.com/abc/x/y/z"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").pathSegment("x", "y", "z").build().toString(), equalTo("https://example.com/abc/x/y/z"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").path("/x/").path("/y/z").build().toString(), equalTo("https://example.com/abc/x/y/z"));
+ assertThat(UriComponentsBuilder.fromUriString("https://example.com/abc/").pathSegment("x").path("y").build().toString(), equalTo("https://example.com/abc/x/y"));
}
@Test
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
index 5fc269208a16..a5d75571b19c 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
@@ -45,23 +45,23 @@ public void encode() {
@Test
public void toUriEncoded() throws URISyntaxException {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/hotel list/Z\u00fcrich").build();
UriComponents encoded = uriComponents.encode();
- assertEquals(new URI("http://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri());
+ assertEquals(new URI("https://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri());
}
@Test
public void toUriNotEncoded() throws URISyntaxException {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
- assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/hotel list/Z\u00fcrich").build();
+ assertEquals(new URI("https://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
}
@Test
public void expand() {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo} {bar}").build();
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo} {bar}").build();
uriComponents = uriComponents.expand("1 2", "3 4");
assertEquals("/1 2 3 4", uriComponents.getPath());
- assertEquals("http://example.com/1 2 3 4", uriComponents.toUriString());
+ assertEquals("https://example.com/1 2 3 4", uriComponents.toUriString());
}
@Test(expected = IllegalStateException.class)
@@ -81,14 +81,14 @@ public void invalidEncodedSequence() {
@Test
public void normalize() {
- UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/foo/../bar").build();
- assertEquals("http://example.com/bar", uriComponents.normalize().toString());
+ UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo/../bar").build();
+ assertEquals("https://example.com/bar", uriComponents.normalize().toString());
}
@Test
public void serializable() throws Exception {
UriComponents uriComponents = UriComponentsBuilder.fromUriString(
- "http://example.com").path("/{foo}").query("bar={baz}").build();
+ "https://example.com").path("/{foo}").query("bar={baz}").build();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(uriComponents);
@@ -99,9 +99,9 @@ public void serializable() throws Exception {
@Test
public void equalsHierarchicalUriComponents() throws Exception {
- UriComponents uriComponents1 = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo}").query("bar={baz}").build();
- UriComponents uriComponents2 = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo}").query("bar={baz}").build();
- UriComponents uriComponents3 = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo}").query("bin={baz}").build();
+ UriComponents uriComponents1 = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo}").query("bar={baz}").build();
+ UriComponents uriComponents2 = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo}").query("bar={baz}").build();
+ UriComponents uriComponents3 = UriComponentsBuilder.fromUriString("https://example.com").path("/{foo}").query("bin={baz}").build();
assertThat(uriComponents1, instanceOf(HierarchicalUriComponents.class));
assertThat(uriComponents1, equalTo(uriComponents1));
assertThat(uriComponents1, equalTo(uriComponents2));
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
index e23b82a51514..82211d7bcd05 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
@@ -35,21 +35,21 @@ public class UriTemplateTests {
@Test
public void getVariableNames() throws Exception {
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
List variableNames = template.getVariableNames();
assertEquals("Invalid variable names", Arrays.asList("hotel", "booking"), variableNames);
}
@Test
public void expandVarArgs() throws Exception {
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
URI result = template.expand("1", "42");
- assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+ assertEquals("Invalid expanded template", new URI("https://example.com/hotels/1/bookings/42"), result);
}
@Test(expected = IllegalArgumentException.class)
public void expandVarArgsNotEnoughVariables() throws Exception {
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
template.expand("1");
}
@@ -58,9 +58,9 @@ public void expandMap() throws Exception {
Map uriVariables = new HashMap(2);
uriVariables.put("booking", "42");
uriVariables.put("hotel", "1");
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
URI result = template.expand(uriVariables);
- assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+ assertEquals("Invalid expanded template", new URI("https://example.com/hotels/1/bookings/42"), result);
}
@Test
@@ -76,17 +76,17 @@ public void expandMapNonString() throws Exception {
Map uriVariables = new HashMap(2);
uriVariables.put("booking", 42);
uriVariables.put("hotel", 1);
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
URI result = template.expand(uriVariables);
- assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+ assertEquals("Invalid expanded template", new URI("https://example.com/hotels/1/bookings/42"), result);
}
@Test
public void expandMapEncoded() throws Exception {
Map uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich");
- UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");
+ UriTemplate template = new UriTemplate("https://example.com/hotel list/{hotel}");
URI result = template.expand(uriVariables);
- assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
+ assertEquals("Invalid expanded template", new URI("https://example.com/hotel%20list/Z%C3%BCrich"), result);
}
@Test(expected = IllegalArgumentException.class)
@@ -94,31 +94,31 @@ public void expandMapUnboundVariables() throws Exception {
Map uriVariables = new HashMap(2);
uriVariables.put("booking", "42");
uriVariables.put("bar", "1");
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
template.expand(uriVariables);
}
@Test
public void expandEncoded() throws Exception {
- UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");
+ UriTemplate template = new UriTemplate("https://example.com/hotel list/{hotel}");
URI result = template.expand("Z\u00fcrich");
- assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
+ assertEquals("Invalid expanded template", new URI("https://example.com/hotel%20list/Z%C3%BCrich"), result);
}
@Test
public void matches() throws Exception {
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
- assertTrue("UriTemplate does not match", template.matches("http://example.com/hotels/1/bookings/42"));
- assertFalse("UriTemplate matches", template.matches("http://example.com/hotels/bookings"));
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
+ assertTrue("UriTemplate does not match", template.matches("https://example.com/hotels/1/bookings/42"));
+ assertFalse("UriTemplate matches", template.matches("https://example.com/hotels/bookings"));
assertFalse("UriTemplate matches", template.matches(""));
assertFalse("UriTemplate matches", template.matches(null));
}
@Test
public void matchesCustomRegex() throws Exception {
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel:\\d+}");
- assertTrue("UriTemplate does not match", template.matches("http://example.com/hotels/42"));
- assertFalse("UriTemplate matches", template.matches("http://example.com/hotels/foo"));
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel:\\d+}");
+ assertTrue("UriTemplate does not match", template.matches("https://example.com/hotels/42"));
+ assertFalse("UriTemplate matches", template.matches("https://example.com/hotels/foo"));
}
@Test
@@ -127,8 +127,8 @@ public void match() throws Exception {
expected.put("booking", "42");
expected.put("hotel", "1");
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
- Map result = template.match("http://example.com/hotels/1/bookings/42");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel}/bookings/{booking}");
+ Map result = template.match("https://example.com/hotels/1/bookings/42");
assertEquals("Invalid match", expected, result);
}
@@ -138,8 +138,8 @@ public void matchCustomRegex() throws Exception {
expected.put("booking", "42");
expected.put("hotel", "1");
- UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel:\\d}/bookings/{booking:\\d+}");
- Map result = template.match("http://example.com/hotels/1/bookings/42");
+ UriTemplate template = new UriTemplate("https://example.com/hotels/{hotel:\\d}/bookings/{booking:\\d+}");
+ Map result = template.match("https://example.com/hotels/1/bookings/42");
assertEquals("Invalid match", expected, result);
}
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
index 368cf386ab97..5a795d847b2b 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
@@ -108,53 +108,53 @@ public void decodeInvalidSequence() throws UnsupportedEncodingException {
@Test
@Deprecated
public void encodeUri() throws UnsupportedEncodingException {
- assertEquals("Invalid encoded URI", "http://www.ietf.org/rfc/rfc3986.txt",
- UriUtils.encodeUri("http://www.ietf.org/rfc/rfc3986.txt", ENC));
assertEquals("Invalid encoded URI", "https://www.ietf.org/rfc/rfc3986.txt",
UriUtils.encodeUri("https://www.ietf.org/rfc/rfc3986.txt", ENC));
- assertEquals("Invalid encoded URI", "http://www.google.com/?q=Z%C3%BCrich",
- UriUtils.encodeUri("http://www.google.com/?q=Z\u00fcrich", ENC));
+ assertEquals("Invalid encoded URI", "https://www.ietf.org/rfc/rfc3986.txt",
+ UriUtils.encodeUri("https://www.ietf.org/rfc/rfc3986.txt", ENC));
+ assertEquals("Invalid encoded URI", "https://www.google.com/?q=Z%C3%BCrich",
+ UriUtils.encodeUri("https://www.google.com/?q=Z\u00fcrich", ENC));
assertEquals("Invalid encoded URI",
- "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
+ "https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
UriUtils.encodeUri(
- "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
+ "https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)",
ENC));
- assertEquals("Invalid encoded URI", "http://java.sun.com/j2se/1.3/",
- UriUtils.encodeUri("http://java.sun.com/j2se/1.3/", ENC));
+ assertEquals("Invalid encoded URI", "https://java.sun.com/j2se/1.3/",
+ UriUtils.encodeUri("https://java.sun.com/j2se/1.3/", ENC));
assertEquals("Invalid encoded URI", "docs/guide/collections/designfaq.html#28",
UriUtils.encodeUri("docs/guide/collections/designfaq.html#28", ENC));
assertEquals("Invalid encoded URI", "../../../demo/jfc/SwingSet2/src/SwingSet2.java",
UriUtils.encodeUri("../../../demo/jfc/SwingSet2/src/SwingSet2.java", ENC));
assertEquals("Invalid encoded URI", "file:///~/calendar", UriUtils.encodeUri("file:///~/calendar", ENC));
- assertEquals("Invalid encoded URI", "http://example.com/query=foo@bar",
- UriUtils.encodeUri("http://example.com/query=foo@bar", ENC));
+ assertEquals("Invalid encoded URI", "https://example.com/query=foo@bar",
+ UriUtils.encodeUri("https://example.com/query=foo@bar", ENC));
// SPR-8974
- assertEquals("http://example.org?format=json&url=http://another.com?foo=bar",
- UriUtils.encodeUri("http://example.org?format=json&url=http://another.com?foo=bar", ENC));
+ assertEquals("https://example.org?format=json&url=http://another.com?foo=bar",
+ UriUtils.encodeUri("https://example.org?format=json&url=http://another.com?foo=bar", ENC));
}
@Test
@Deprecated
public void encodeHttpUrl() throws UnsupportedEncodingException {
- assertEquals("Invalid encoded HTTP URL", "http://www.ietf.org/rfc/rfc3986.txt",
- UriUtils.encodeHttpUrl("http://www.ietf.org/rfc/rfc3986.txt", ENC));
+ assertEquals("Invalid encoded HTTP URL", "https://www.ietf.org/rfc/rfc3986.txt",
+ UriUtils.encodeHttpUrl("https://www.ietf.org/rfc/rfc3986.txt", ENC));
assertEquals("Invalid encoded URI", "https://www.ietf.org/rfc/rfc3986.txt",
UriUtils.encodeHttpUrl("https://www.ietf.org/rfc/rfc3986.txt", ENC));
- assertEquals("Invalid encoded HTTP URL", "http://www.google.com/?q=Z%C3%BCrich",
- UriUtils.encodeHttpUrl("http://www.google.com/?q=Z\u00fcrich", ENC));
- assertEquals("Invalid encoded HTTP URL", "http://ws.geonames.org/searchJSON?q=T%C5%8Dky%C5%8D&style=FULL&maxRows=300",
- UriUtils.encodeHttpUrl("http://ws.geonames.org/searchJSON?q=T\u014dky\u014d&style=FULL&maxRows=300", ENC));
+ assertEquals("Invalid encoded HTTP URL", "https://www.google.com/?q=Z%C3%BCrich",
+ UriUtils.encodeHttpUrl("https://www.google.com/?q=Z\u00fcrich", ENC));
+ assertEquals("Invalid encoded HTTP URL", "https://ws.geonames.org/searchJSON?q=T%C5%8Dky%C5%8D&style=FULL&maxRows=300",
+ UriUtils.encodeHttpUrl("https://ws.geonames.org/searchJSON?q=T\u014dky\u014d&style=FULL&maxRows=300", ENC));
assertEquals("Invalid encoded HTTP URL",
- "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar",
+ "https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar",
UriUtils.encodeHttpUrl(
- "http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar", ENC));
- assertEquals("Invalid encoded HTTP URL", "http://search.twitter.com/search.atom?q=%23avatar",
- UriUtils.encodeHttpUrl("http://search.twitter.com/search.atom?q=#avatar", ENC));
- assertEquals("Invalid encoded HTTP URL", "http://java.sun.com/j2se/1.3/",
- UriUtils.encodeHttpUrl("http://java.sun.com/j2se/1.3/", ENC));
- assertEquals("Invalid encoded HTTP URL", "http://example.com/query=foo@bar",
- UriUtils.encodeHttpUrl("http://example.com/query=foo@bar", ENC));
+ "https://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar", ENC));
+ assertEquals("Invalid encoded HTTP URL", "https://search.twitter.com/search.atom?q=%23avatar",
+ UriUtils.encodeHttpUrl("https://search.twitter.com/search.atom?q=#avatar", ENC));
+ assertEquals("Invalid encoded HTTP URL", "https://java.sun.com/j2se/1.3/",
+ UriUtils.encodeHttpUrl("https://java.sun.com/j2se/1.3/", ENC));
+ assertEquals("Invalid encoded HTTP URL", "https://example.com/query=foo@bar",
+ UriUtils.encodeHttpUrl("https://example.com/query=foo@bar", ENC));
}
@Test(expected = IllegalArgumentException.class)
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 1f80c6103129..4dfcbffe9045 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -155,7 +155,7 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
//
// Suite of tests root requests for default servlets (SRV 11.2) on WebSphere vs Tomcat and other containers
- // See: http://jira.springframework.org/browse/SPR-7064
+ // See: https://jira.springframework.org/browse/SPR-7064
//
//
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
index 761ca9439fa9..a8255bc452cc 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
@@ -36,7 +36,7 @@
/**
* {@link PortletMultipartResolver} implementation for
- * Jakarta Commons FileUpload
+ * Jakarta Commons FileUpload
* 1.2 or above.
*
*
Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
index 8d7b70c2fff1..45e655bd465b 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
@@ -22,7 +22,7 @@
/**
* Portlet version of Spring's multipart resolution strategy for file uploads
- * as defined in RFC 1867.
+ * as defined in RFC 1867.
*
*
Implementations are typically usable both within any application context
* and standalone.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
index 1b260618f15e..44aa19f29fb8 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/package-info.java
+++ b/spring-webmvc-portlet/src/test/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.
*/
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
index ba8e54a1213d..900972c7815b 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
@@ -69,7 +69,7 @@
/**
* Helper class to configure Tiles 3.x for the Spring Framework. See
- * http://tiles.apache.org
+ * https://tiles.apache.org
* for more information about Tiles, which basically is a templating mechanism
* for web applications using JSPs and other template engines.
*
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
index 52c94c61fa2d..aa6216c071cc 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/package-info.java
@@ -2,7 +2,7 @@
/**
*
* Support classes for the integration of
- * Tiles3
+ * Tiles3
* (the standalone version of Tiles) as Spring web view technology.
* Contains a View implementation for Tiles definitions.
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
index ebadd490d6a8..4ad8c4d9542e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
@@ -28,7 +28,7 @@
* content, and exposing the model. A single view exposes multiple model attributes.
*
*
View implementations may differ widely. An obvious implementation would be
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
index bbcb35e1934a..c66569cf1385 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
@@ -213,7 +213,7 @@ protected void prepareResponse(Exception ex, HttpServletResponse response) {
/**
* Prevents the response from being cached, through setting corresponding
- * HTTP headers. See {@code http://www.mnot.net/cache_docs}.
+ * HTTP headers. See {@code https://www.mnot.net/cache_docs}.
* @param response current HTTP response
*/
protected void preventCaching(HttpServletResponse response) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
index 0b49383d8e3f..bf61196b3f06 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
@@ -228,7 +228,7 @@ public final boolean isBindOnNewForm() {
* submitted.
*
If you need to have per-form, per-session state management (that is,
* stateful web conversations), the recommendation is to use
- * Spring WebFlow,
+ * Spring WebFlow,
* which has full support for conversations and has a much more flexible
* usage model overall.
* @param sessionForm {@code true} if session form mode is to be activated
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
index 117cbb726edc..217c1fd76351 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
@@ -6,7 +6,7 @@
* Spring web MVC framework.
*
*
This package and related packages are discussed in Chapters 12 and 13 of
- * Expert One-On-One J2EE Design and Development
+ * Expert One-On-One J2EE Design and Development
* by Rod Johnson (Wrox, 2002).
*
*/
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index 759820dd5394..e5823bc75b37 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -287,7 +287,7 @@ protected final void checkAndPrepare(
/**
* Prevent the response from being cached.
- * See {@code http://www.mnot.net/cache_docs}.
+ * See {@code https://www.mnot.net/cache_docs}.
*/
protected final void preventCaching(HttpServletResponse response) {
response.setHeader(HEADER_PRAGMA, "no-cache");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
index 711f77b35fac..549e02f8f28e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
@@ -51,7 +51,7 @@
*
*
*
As an example, you can try this snippet:
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
index 073d4bbb1970..c21394cc6ce1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
@@ -31,7 +31,7 @@
/**
* Abstract superclass for PDF views, using Bruno Lowagie's
- * iText package.
+ * iText package.
* Application-specific view classes will extend this class.
* The view will be held in the subclass itself, not in a template.
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
index e552711f82c8..944d888cd4f2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -39,7 +39,7 @@
* @since 3.0
* @see #buildFeedMetadata
* @see #buildFeedEntries
- * @see Atom Syndication Format
+ * @see Atom Syndication Format
*/
public abstract class AbstractAtomFeedView extends AbstractFeedView {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
index 900b137ad85d..5f064248d9cf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/package-info.java
@@ -2,7 +2,7 @@
/**
*
* Support classes for the integration of
- * FreeMarker
+ * FreeMarker
* as Spring web view technology.
* Contains a View implementation for FreeMarker templates.
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
index 1242e3c13945..d6c32f678d30 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -39,7 +39,7 @@
/**
* Spring MVC {@link View} that renders JSON content by serializing the model for the current request
- * using Jackson 2's {@link ObjectMapper}.
+ * using Jackson 2's {@link ObjectMapper}.
*
*
By default, the entire contents of the model map (with the exception of framework-specific classes)
* will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
index 16a20415466b..ad47c73d684c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
@@ -39,7 +39,7 @@
/**
* Spring MVC {@link View} that renders JSON content by serializing the model for the current request
- * using Jackson 1.x's {@link ObjectMapper}.
+ * using Jackson 1.x's {@link ObjectMapper}.
*
*
By default, the entire contents of the model map (with the exception of framework-specific classes)
* will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
index 7b6e08343336..c993387ecbe2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
@@ -74,7 +74,7 @@
/**
* Helper class to configure Tiles 2.x for the Spring Framework. See
- * http://tiles.apache.org
+ * https://tiles.apache.org
* for more information about Tiles, which basically is a templating
* mechanism for JSP-based web applications.
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
index eb695f01c491..f73832f5b892 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java
@@ -2,7 +2,7 @@
/**
*
* Support classes for the integration of
- * Tiles2
+ * Tiles2
* (the standalone version of Tiles) as Spring web view technology.
* Contains a View implementation for Tiles definitions.
*
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
index 8541cb13bb3c..fbcdca97b736 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/package-info.java
@@ -2,7 +2,7 @@
/**
*
* Support classes for the integration of
- * Velocity
+ * Velocity
* as Spring web view technology.
* Contains a View implementation for Velocity templates.
*
diff --git a/spring-webmvc/src/main/resources/META-INF/spring-form.tld b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
index e5ad6eb0be28..3ca37f227154 100644
--- a/spring-webmvc/src/main/resources/META-INF/spring-form.tld
+++ b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
@@ -1,7 +1,7 @@
Spring Framework JSP Form Tag Library
diff --git a/spring-webmvc/src/main/resources/META-INF/spring.tld b/spring-webmvc/src/main/resources/META-INF/spring.tld
index a0a8c6f7fc7c..92a0238644cb 100644
--- a/spring-webmvc/src/main/resources/META-INF/spring.tld
+++ b/spring-webmvc/src/main/resources/META-INF/spring.tld
@@ -1,7 +1,7 @@
Spring Framework JSP Tag Library
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
index f97d3b331a3b..7dab51d069ce 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
@@ -5,8 +5,8 @@
targetNamespace="http://www.springframework.org/schema/mvc"
elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
index 8fc5f378193f..adafa2c245b8 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd
@@ -6,8 +6,8 @@
targetNamespace="http://www.springframework.org/schema/mvc"
elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
index 2fab173ab628..1eb7169fc624 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
@@ -6,8 +6,8 @@
targetNamespace="http://www.springframework.org/schema/mvc"
elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-
+
+
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index e303a77b3ce8..d272c28c5c29 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -86,7 +86,7 @@ public void testContextLoaderListenerWithDefaultContext() {
/**
* Addresses the issues raised in SPR-4008: Supply an opportunity to customize
* context before calling refresh in ContextLoaders.
*/
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
index 1d04321377b4..d895ca97ec85 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/UrlFilenameViewControllerTests.java
@@ -150,7 +150,7 @@ public void testSettingSuffixToNullCausesEmptyStringToBeUsed() throws Exception
/**
* This is the expected behavior, and it now has a test to prove it.
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2789
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2789
*/
public void testNestedPathisUsedAsViewName_InBreakingChangeFromSpring12Line() throws Exception {
UrlFilenameViewController ctrl = new UrlFilenameViewController();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
index 98e648f525f0..e235a68d0722 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -434,14 +434,14 @@ public void testReplaceUriTemplateParamsTemplateWithParamMatchValueEncoded()
}
public void testCreateUrlRemoteServer() throws JspException {
- tag.setValue("http://www.springframework.org/");
+ tag.setValue("https://www.springframework.org/");
tag.doStartTag();
// String uri = tag.createUrl();
String uri = invokeCreateUrl(tag);
- assertEquals("http://www.springframework.org/", uri);
+ assertEquals("https://www.springframework.org/", uri);
}
public void testCreateUrlRelative() throws JspException {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index 2d4b9979b3ff..e5158ec40a83 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -339,7 +339,7 @@ public void testAsBodyTagWithExistingMessagesAttribute() throws Exception {
}
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
*/
public void testAsBodyTagWithErrorsAndExistingMessagesAttributeInNonPageScopeAreNotClobbered() throws Exception {
String existingAttribute = "something";
@@ -362,35 +362,35 @@ public void testAsBodyTagWithErrorsAndExistingMessagesAttributeInNonPageScopeAre
}
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
*/
public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInApplicationScopeAreNotClobbered() throws Exception {
assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.APPLICATION_SCOPE);
}
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
*/
public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInSessionScopeAreNotClobbered() throws Exception {
assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.SESSION_SCOPE);
}
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
*/
public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInPageScopeAreNotClobbered() throws Exception {
assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.PAGE_SCOPE);
}
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2788
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2788
*/
public void testAsBodyTagWithNoErrorsAndExistingMessagesAttributeInRequestScopeAreNotClobbered() throws Exception {
assertWhenNoErrorsExistingMessagesInScopeAreNotClobbered(PageContext.REQUEST_SCOPE);
}
/**
- * http://opensource.atlassian.com/projects/spring/browse/SPR-4005
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-4005
*/
public void testOmittedPathMatchesObjectErrorsOnly() throws Exception {
this.tag.setPath(null);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
index 1c7ac2af59b1..b650fe16d548 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
@@ -221,7 +221,7 @@ public void testWithNullResolvedCommand() throws Exception {
}
/*
- * See http://opensource.atlassian.com/projects/spring/browse/SPR-2645
+ * See https://opensource.atlassian.com/projects/spring/browse/SPR-2645
*/
public void testXSSScriptingExploitWhenActionIsResolvedFromQueryString() throws Exception {
String xssQueryString = QUERY_STRING + "&stuff=\">";
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 86f21a06011c..d28205838dae 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -310,7 +310,7 @@ public void testWithCustomBinder() throws Exception {
}
/**
- * See SPR-3127 (http://opensource.atlassian.com/projects/spring/browse/SPR-3127)
+ * See SPR-3127 (https://opensource.atlassian.com/projects/spring/browse/SPR-3127)
*/
public void testReadOnlyAttributeRenderingWhenReadonlyIsTrue() throws Exception {
this.tag.setPath("name");
@@ -328,7 +328,7 @@ public void testReadOnlyAttributeRenderingWhenReadonlyIsTrue() throws Exception
}
/**
- * See SPR-3127 (http://opensource.atlassian.com/projects/spring/browse/SPR-3127)
+ * See SPR-3127 (https://opensource.atlassian.com/projects/spring/browse/SPR-3127)
*/
public void testReadOnlyAttributeRenderingWhenReadonlyIsFalse() throws Exception {
this.tag.setPath("name");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
index 5bdea9f8ed59..1f628a81a786 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
@@ -29,7 +29,7 @@
public class PasswordInputTagTests extends InputTagTests {
/*
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2866
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2866
*/
public void testPasswordValueIsNotRenderedByDefault() throws Exception {
this.getTag().setPath("name");
@@ -45,7 +45,7 @@ public void testPasswordValueIsNotRenderedByDefault() throws Exception {
}
/*
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2866
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2866
*/
public void testPasswordValueIsRenderedIfShowPasswordAttributeIsSetToTrue() throws Exception {
this.getTag().setPath("name");
@@ -62,7 +62,7 @@ public void testPasswordValueIsRenderedIfShowPasswordAttributeIsSetToTrue() thro
}
/*
- * http://opensource.atlassian.com/projects/spring/browse/SPR-2866
+ * https://opensource.atlassian.com/projects/spring/browse/SPR-2866
*/
public void testPasswordValueIsNotRenderedIfShowPasswordAttributeIsSetToFalse() throws Exception {
this.getTag().setPath("name");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index c9aea6964baf..edb460c76c43 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -650,7 +650,7 @@ public void testWithMultiMap() throws Exception {
/**
* Tests new support added as a result of SPR-2660.
*
diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt
index 563dbfa7117e..fec9e9a7f009 100644
--- a/src/dist/changelog.txt
+++ b/src/dist/changelog.txt
@@ -1,6 +1,6 @@
SPRING FRAMEWORK CHANGELOG
===========================
-http://www.spring.io
+https://www.spring.io
Changes in version 3.2.18 (2016-12-21)
-------------------------------------
@@ -70,7 +70,7 @@ improved fix cron trigger example in reference documentation (SPR-10474)
Changes in version 3.2.15 (2015-10-15)
-------------------------------------
-protect against RFD exploits, see http://pivotal.io/security/cve-2015-5211 (SPR-13548)
+protect against RFD exploits, see https://pivotal.io/security/cve-2015-5211 (SPR-13548)
fixed whether HttpInputMessage.getBody() is allowed to return null (SPR-13563)
fixed JCacheCache doesn't recognize null values in other JVMs (SPR-13553)
fixed AbstractEmbeddedDatabaseConfigurer.shutdown does not close JDBC resources (SPR-13474)
diff --git a/src/dist/license.txt b/src/dist/license.txt
index ce5f76c5495b..e84d62a49e41 100644
--- a/src/dist/license.txt
+++ b/src/dist/license.txt
@@ -244,13 +244,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
-Copyright (c) 1999-2009, OW2 Consortium
+Copyright (c) 1999-2009, OW2 Consortium
>>> CGLIB 3.0 (cglib:cglib:3.0):
Per the LICENSE file in the CGLIB JAR distribution downloaded from
-http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
+https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
is included above.
@@ -262,7 +262,7 @@ other similar licenses that require the source code and/or modifications to
source code to be made available (as would be noted above), you may obtain a
copy of the source code corresponding to the binaries for such open source
components and modifications thereto, if any, (the "Source Files"), by
-downloading the Source Files from http://www.springsource.org/download, or by
+downloading the Source Files from https://www.springsource.org/download, or by
sending a request, with your name and address to:
Pivotal, Inc., 875 Howard St,
diff --git a/src/dist/readme.txt b/src/dist/readme.txt
index c51de83e35b7..0d7f994d78c3 100644
--- a/src/dist/readme.txt
+++ b/src/dist/readme.txt
@@ -5,7 +5,7 @@ To find out what has changed since any earlier releases, see 'docs/changelog.txt
Please consult the documentation located within the
'docs/spring-framework-reference' directory of this release and also visit
-the official Spring Framework home at http://www.springsource.org/spring-framework
+the official Spring Framework home at https://www.springsource.org/spring-framework
There you will find links to the forum, issue tracker, and other resources.
diff --git a/src/reference/docbook/images/overview-ejb.graffle b/src/reference/docbook/images/overview-ejb.graffle
index 3813752a400d..8675627fe348 100644
--- a/src/reference/docbook/images/overview-ejb.graffle
+++ b/src/reference/docbook/images/overview-ejb.graffle
@@ -1,5 +1,5 @@
-
+
ActiveLayerIndex
diff --git a/src/reference/docbook/images/overview-full.graffle b/src/reference/docbook/images/overview-full.graffle
index b77b5cc11cf2..4c617b771aee 100644
--- a/src/reference/docbook/images/overview-full.graffle
+++ b/src/reference/docbook/images/overview-full.graffle
@@ -1,5 +1,5 @@
-
+
ActiveLayerIndex
diff --git a/src/reference/docbook/images/overview-remoting.graffle b/src/reference/docbook/images/overview-remoting.graffle
index 029ffe2268ee..de0e0e8726cc 100644
--- a/src/reference/docbook/images/overview-remoting.graffle
+++ b/src/reference/docbook/images/overview-remoting.graffle
@@ -1,5 +1,5 @@
-
+
ActiveLayerIndex
diff --git a/src/reference/docbook/images/overview-thirdparty-web.graffle b/src/reference/docbook/images/overview-thirdparty-web.graffle
index 6a1d4278a875..d78f722e0cb3 100644
--- a/src/reference/docbook/images/overview-thirdparty-web.graffle
+++ b/src/reference/docbook/images/overview-thirdparty-web.graffle
@@ -1,5 +1,5 @@
-
+
ActiveLayerIndex
diff --git a/src/reference/docbook/images/oxm-exceptions.graffle b/src/reference/docbook/images/oxm-exceptions.graffle
index 7e1c19f1dff3..4b72bf45285b 100644
--- a/src/reference/docbook/images/oxm-exceptions.graffle
+++ b/src/reference/docbook/images/oxm-exceptions.graffle
@@ -1,5 +1,5 @@
-
+
ActiveLayerIndex
diff --git a/src/reference/docbook/images/spring-overview.graffle b/src/reference/docbook/images/spring-overview.graffle
index 3dcbe41270be..1e0774681a77 100644
--- a/src/reference/docbook/images/spring-overview.graffle
+++ b/src/reference/docbook/images/spring-overview.graffle
@@ -1,5 +1,5 @@
-
+
ActiveLayerIndex
