Skip to content

Commit 590b024

Browse files
committed
Merge pull request #611 from Spring Operator
* gh-611: Polish "Use HTTPS for externals links where possible" Use HTTPS for externals links where possible
2 parents c2c4ed7 + 2dda908 commit 590b024

File tree

5 files changed

+63
-62
lines changed

5 files changed

+63
-62
lines changed

samples/rest-notes-slate/slate/source/index.html.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ let api = kittn.authorize('meowmeowmeow');
5555

5656
> Make sure to replace `meowmeowmeow` with your API key.
5757
58-
Kittn uses API keys to allow access to the API. You can register a new Kittn API key at our [developer portal](http://example.com/developers).
58+
Kittn uses API keys to allow access to the API. You can register a new Kittn API key at our [developer portal](https://example.com/developers).
5959

6060
Kittn expects for the API key to be included in all API requests to the server in a header that looks like the following:
6161

@@ -84,7 +84,7 @@ api.kittens.get()
8484
```
8585

8686
```shell
87-
curl "http://example.com/api/kittens"
87+
curl "https://example.com/api/kittens"
8888
-H "Authorization: meowmeowmeow"
8989
```
9090

@@ -120,7 +120,7 @@ This endpoint retrieves all kittens.
120120

121121
### HTTP Request
122122

123-
`GET http://example.com/api/kittens`
123+
`GET https://example.com/api/kittens`
124124

125125
### Query Parameters
126126

@@ -150,7 +150,7 @@ api.kittens.get(2)
150150
```
151151

152152
```shell
153-
curl "http://example.com/api/kittens/2"
153+
curl "https://example.com/api/kittens/2"
154154
-H "Authorization: meowmeowmeow"
155155
```
156156

@@ -179,7 +179,7 @@ This endpoint retrieves a specific kitten.
179179

180180
### HTTP Request
181181

182-
`GET http://example.com/kittens/<ID>`
182+
`GET https://example.com/kittens/<ID>`
183183

184184
### URL Parameters
185185

samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/*!
22
* jQuery JavaScript Library v2.2.0
3-
* http://jquery.com/
3+
* https://jquery.com/
44
*
55
* Includes Sizzle.js
6-
* http://sizzlejs.com/
6+
* https://sizzlejs.com/
77
*
88
* Copyright jQuery Foundation and other contributors
99
* Released under the MIT license
10-
* http://jquery.org/license
10+
* https://jquery.org/license
1111
*
1212
* Date: 2016-01-08T20:02Z
1313
*/
@@ -540,11 +540,11 @@ function isArrayLike( obj ) {
540540
var Sizzle =
541541
/*!
542542
* Sizzle CSS Selector Engine v2.2.1
543-
* http://sizzlejs.com/
543+
* https://sizzlejs.com/
544544
*
545545
* Copyright jQuery Foundation and other contributors
546546
* Released under the MIT license
547-
* http://jquery.org/license
547+
* https://jquery.org/license
548548
*
549549
* Date: 2015-10-17
550550
*/
@@ -598,7 +598,7 @@ var i,
598598
push = arr.push,
599599
slice = arr.slice,
600600
// Use a stripped-down indexOf as it's faster than native
601-
// http://jsperf.com/thor-indexof-vs-for/5
601+
// https://jsperf.com/thor-indexof-vs-for/5
602602
indexOf = function( list, elem ) {
603603
var i = 0,
604604
len = list.length;
@@ -614,13 +614,13 @@ var i,
614614

615615
// Regular expressions
616616

617-
// http://www.w3.org/TR/css3-selectors/#whitespace
617+
// https://www.w3.org/TR/css3-selectors/#whitespace
618618
whitespace = "[\\x20\\t\\r\\n\\f]",
619619

620-
// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
620+
// https://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
621621
identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
622622

623-
// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
623+
// Attribute selectors: https://www.w3.org/TR/selectors/#attribute-selectors
624624
attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
625625
// Operator (capture 2)
626626
"*([*^$|!~]?=)" + whitespace +
@@ -677,7 +677,7 @@ var i,
677677
rsibling = /[+~]/,
678678
rescape = /'|\\/g,
679679

680-
// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
680+
// CSS escapes https://www.w3.org/TR/CSS21/syndata.html#escaped-characters
681681
runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
682682
funescape = function( _, escaped, escapedWhitespace ) {
683683
var high = "0x" + escaped - 0x10000;
@@ -1169,7 +1169,7 @@ setDocument = Sizzle.setDocument = function( node ) {
11691169
// We allow this because of a bug in IE8/9 that throws an error
11701170
// whenever `document.activeElement` is accessed on an iframe
11711171
// So, we allow :focus to pass through QSA all the time to avoid the IE error
1172-
// See http://bugs.jquery.com/ticket/13378
1172+
// See https://bugs.jquery.com/ticket/13378
11731173
rbuggyQSA = [];
11741174

11751175
if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
@@ -1180,15 +1180,15 @@ setDocument = Sizzle.setDocument = function( node ) {
11801180
// This is to test IE's treatment of not explicitly
11811181
// setting a boolean content attribute,
11821182
// since its presence should be enough
1183-
// http://bugs.jquery.com/ticket/12359
1183+
// https://bugs.jquery.com/ticket/12359
11841184
docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
11851185
"<select id='" + expando + "-\r\\' msallowcapture=''>" +
11861186
"<option selected=''></option></select>";
11871187

11881188
// Support: IE8, Opera 11-12.16
11891189
// Nothing should be selected when empty strings follow ^= or $= or *=
11901190
// The test attribute must be unknown in Opera but "safe" for WinRT
1191-
// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
1191+
// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
11921192
if ( div.querySelectorAll("[msallowcapture^='']").length ) {
11931193
rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
11941194
}
@@ -1205,7 +1205,7 @@ setDocument = Sizzle.setDocument = function( node ) {
12051205
}
12061206

12071207
// Webkit/Opera - :checked should return selected option elements
1208-
// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
1208+
// https://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
12091209
// IE8 throws error here and will not see later tests
12101210
if ( !div.querySelectorAll(":checked").length ) {
12111211
rbuggyQSA.push(":checked");
@@ -1802,7 +1802,7 @@ Expr = Sizzle.selectors = {
18021802

18031803
"PSEUDO": function( pseudo, argument ) {
18041804
// pseudo-class names are case-insensitive
1805-
// http://www.w3.org/TR/selectors/#pseudo-classes
1805+
// https://www.w3.org/TR/selectors/#pseudo-classes
18061806
// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
18071807
// Remember that setFilters inherits from pseudos
18081808
var args,
@@ -1889,7 +1889,7 @@ Expr = Sizzle.selectors = {
18891889
// or beginning with the identifier C immediately followed by "-".
18901890
// The matching of C against the element's language value is performed case-insensitively.
18911891
// The identifier C does not have to be a valid language name."
1892-
// http://www.w3.org/TR/selectors/#lang-pseudo
1892+
// https://www.w3.org/TR/selectors/#lang-pseudo
18931893
"lang": markFunction( function( lang ) {
18941894
// lang value must be a valid identifier
18951895
if ( !ridentifier.test(lang || "") ) {
@@ -1936,7 +1936,7 @@ Expr = Sizzle.selectors = {
19361936

19371937
"checked": function( elem ) {
19381938
// In CSS3, :checked should return both checked and selected elements
1939-
// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
1939+
// https://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
19401940
var nodeName = elem.nodeName.toLowerCase();
19411941
return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
19421942
},
@@ -1953,7 +1953,7 @@ Expr = Sizzle.selectors = {
19531953

19541954
// Contents
19551955
"empty": function( elem ) {
1956-
// http://www.w3.org/TR/selectors/#empty-pseudo
1956+
// https://www.w3.org/TR/selectors/#empty-pseudo
19571957
// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
19581958
// but not by others (comment: 8; processing instruction: 7; etc.)
19591959
// nodeType < 6 works because attributes (2) do not appear as children
@@ -2627,7 +2627,7 @@ support.sortDetached = assert(function( div1 ) {
26272627

26282628
// Support: IE<8
26292629
// Prevent attribute/property "interpolation"
2630-
// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
2630+
// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
26312631
if ( !assert(function( div ) {
26322632
div.innerHTML = "<a href='#'></a>";
26332633
return div.firstChild.getAttribute("href") === "#" ;
@@ -4995,7 +4995,7 @@ jQuery.Event = function( src, props ) {
49954995
};
49964996

49974997
// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
4998-
// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
4998+
// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
49994999
jQuery.Event.prototype = {
50005000
constructor: jQuery.Event,
50015001
isDefaultPrevented: returnFalse,
@@ -5328,7 +5328,7 @@ jQuery.extend( {
53285328
if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
53295329
!jQuery.isXMLDoc( elem ) ) {
53305330

5331-
// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
5331+
// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
53325332
destElements = getAll( clone );
53335333
srcElements = getAll( elem );
53345334

@@ -5805,7 +5805,7 @@ function curCSS( elem, name, computed ) {
58055805
// Android Browser returns percentage for some values,
58065806
// but width seems to be reliably pixels.
58075807
// This is against the CSSOM draft spec:
5808-
// http://dev.w3.org/csswg/cssom/#resolved-values
5808+
// https://dev.w3.org/csswg/cssom/#resolved-values
58095809
if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
58105810

58115811
// Remember the original values
@@ -7069,7 +7069,7 @@ jQuery.fx.speeds = {
70697069

70707070

70717071
// Based off of the plugin by Clint Helfers, with permission.
7072-
// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
7072+
// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
70737073
jQuery.fn.delay = function( time, type ) {
70747074
time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
70757075
type = type || "fx";
@@ -7302,7 +7302,7 @@ jQuery.extend( {
73027302

73037303
// elem.tabIndex doesn't always return the
73047304
// correct value when it hasn't been explicitly set
7305-
// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
7305+
// https://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
73067306
// Use proper attribute retrieval(#12072)
73077307
var tabindex = jQuery.find.attr( elem, "tabindex" );
73087308

@@ -7912,7 +7912,7 @@ support.focusin = "onfocusin" in window;
79127912
//
79137913
// Support: Chrome, Safari
79147914
// focus(in | out) events fire after focus & blur events,
7915-
// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
7915+
// which is spec violation - https://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
79167916
// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
79177917
if ( !support.focusin ) {
79187918
jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {

spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinkExtractorsPayloadTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public LinkExtractorsPayloadTests(LinkExtractor linkExtractor, String linkType)
6868
public void singleLink() throws IOException {
6969
Map<String, List<Link>> links = this.linkExtractor
7070
.extractLinks(createResponse("single-link"));
71-
assertLinks(Arrays.asList(new Link("alpha", "https://alpha.example.com", "Alpha")),
71+
assertLinks(
72+
Arrays.asList(new Link("alpha", "https://alpha.example.com", "Alpha")),
7273
links);
7374
}
7475

spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessorTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ public void requestUriPortCanBeRemoved() {
9494
@Test
9595
public void requestUriPathIsPreserved() {
9696
this.preprocessor.removePort();
97-
OperationRequest processed = this.preprocessor
98-
.preprocess(createRequestWithUri("https://api.example.com:12345/foo/bar"));
97+
OperationRequest processed = this.preprocessor.preprocess(
98+
createRequestWithUri("https://api.example.com:12345/foo/bar"));
9999
assertThat(processed.getUri())
100100
.isEqualTo(URI.create("https://api.example.com/foo/bar"));
101101
}
102102

103103
@Test
104104
public void requestUriQueryIsPreserved() {
105105
this.preprocessor.removePort();
106-
OperationRequest processed = this.preprocessor
107-
.preprocess(createRequestWithUri("https://api.example.com:12345?foo=bar"));
106+
OperationRequest processed = this.preprocessor.preprocess(
107+
createRequestWithUri("https://api.example.com:12345?foo=bar"));
108108
assertThat(processed.getUri())
109109
.isEqualTo(URI.create("https://api.example.com?foo=bar"));
110110
}

0 commit comments

Comments
 (0)