diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4df5b8d4..b8dfcb90 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -42,5 +42,5 @@ with regard to the reporter of an incident. This Code of Conduct is adapted from the [Contributor Covenant][1], version 1.3.0, available at [contributor-covenant.org/version/1/3/0/][2]. -[1]: http://contributor-covenant.org -[2]: http://contributor-covenant.org/version/1/3/0/ \ No newline at end of file +[1]: https://contributor-covenant.org +[2]: https://contributor-covenant.org/version/1/3/0/ \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d7046eb..d7dcb332 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,4 +61,4 @@ The project can then be imported into Eclipse using `File -> Import…` and then [1]: CODE_OF_CONDUCT.md [2]: https://cla.pivotal.io/sign/spring -[3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html \ No newline at end of file +[3]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html diff --git a/docs/src/docs/asciidoc/contributing.adoc b/docs/src/docs/asciidoc/contributing.adoc index c5c36bff..eeb365db 100644 --- a/docs/src/docs/asciidoc/contributing.adoc +++ b/docs/src/docs/asciidoc/contributing.adoc @@ -9,7 +9,7 @@ for your RESTful services. However, we can't achieve that goal without your cont [[contributing-questions]] === Questions -You can ask questions about Spring REST Docs on http://stackoverflow.com[StackOverflow] +You can ask questions about Spring REST Docs on https://stackoverflow.com[StackOverflow] using the `spring-restdocs` tag. Similarly, we encourage you to help your fellow Spring REST Docs users by answering questions. diff --git a/docs/src/docs/asciidoc/documenting-your-api.adoc b/docs/src/docs/asciidoc/documenting-your-api.adoc index 0299505b..53305cba 100644 --- a/docs/src/docs/asciidoc/documenting-your-api.adoc +++ b/docs/src/docs/asciidoc/documenting-your-api.adoc @@ -1032,11 +1032,11 @@ A number of snippets are produced automatically when you document a request and |Snippet | Description | `curl-request.adoc` -| Contains the http://curl.haxx.se[`curl`] command that is equivalent to the `MockMvc` +| Contains the https://curl.haxx.se[`curl`] command that is equivalent to the `MockMvc` call that is being documented | `httpie-request.adoc` -| Contains the http://httpie.org[`HTTPie`] command that is equivalent to the `MockMvc` +| Contains the https://httpie.org[`HTTPie`] command that is equivalent to the `MockMvc` call that is being documented | `http-request.adoc` diff --git a/docs/src/docs/asciidoc/getting-started.adoc b/docs/src/docs/asciidoc/getting-started.adoc index 36ca53bf..966f6946 100644 --- a/docs/src/docs/asciidoc/getting-started.adoc +++ b/docs/src/docs/asciidoc/getting-started.adoc @@ -19,12 +19,12 @@ If you want to jump straight in, a number of sample applications are available: | {samples}/rest-notes-spring-data-rest[Spring Data REST] | Maven | Demonstrates the creation of a getting started guide and an API guide for a service - implemented using http://projects.spring.io/spring-data-rest/[Spring Data REST]. + implemented using https://projects.spring.io/spring-data-rest/[Spring Data REST]. | {samples}/rest-notes-spring-hateoas[Spring HATEOAS] | Gradle | Demonstrates the creation of a getting started guide and an API guide for a service - implemented using http://projects.spring.io/spring-hateoas/[Spring HATEOAS]. + implemented using https://projects.spring.io/spring-hateoas/[Spring HATEOAS]. |=== @@ -54,7 +54,7 @@ If you want to jump straight in, a number of sample applications are available: | {samples}/rest-notes-slate[Slate] | Gradle | Demonstrates the use of Spring REST Docs with Markdown and - http://github.com/tripit/slate[Slate]. + https://github.com/tripit/slate[Slate]. | {samples}/testng[TestNG] | Gradle @@ -249,7 +249,7 @@ from where it will be included in the jar file. === Generating documentation snippets Spring REST Docs uses {spring-framework-docs}/#spring-mvc-test-framework[Spring's MVC Test framework] or -http://www.rest-assured.io[REST Assured] to make requests to the service that you are +http://rest-assured.io/[REST Assured] to make requests to the service that you are documenting. It then produces documentation snippets for the request and the resulting response. @@ -440,7 +440,7 @@ the resulting HTML files depends on whether you are using Maven or Gradle: The generated snippets can then be included in the manually created Asciidoctor file from above using the -http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#include-files[include macro]. +https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#include-files[include macro]. The `snippets` attribute that is automatically set by `spring-restdocs-asciidoctor` configured in the <> can be used to reference the snippets output directory. For example: diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc index 10777c6a..128c448d 100644 --- a/docs/src/docs/asciidoc/index.adoc +++ b/docs/src/docs/asciidoc/index.adoc @@ -12,8 +12,8 @@ Andy Wilkinson :source: {github}/tree/{branch-or-tag} :samples: {source}/samples :templates: {source}spring-restdocs/src/main/resources/org/springframework/restdocs/templates -:spring-boot-docs: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle -:spring-framework-docs: http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle +:spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle +:spring-framework-docs: https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle [[abstract]] diff --git a/docs/src/docs/asciidoc/introduction.adoc b/docs/src/docs/asciidoc/introduction.adoc index 14559eca..e866ce35 100644 --- a/docs/src/docs/asciidoc/introduction.adoc +++ b/docs/src/docs/asciidoc/introduction.adoc @@ -6,13 +6,13 @@ services that is accurate and readable. Writing high-quality documentation is difficult. One way to ease that difficulty is to use tools that are well-suited to the job. To this end, Spring REST Docs uses -http://asciidoctor.org[Asciidoctor] by default. Asciidoctor processes plain text and +https://asciidoctor.org[Asciidoctor] by default. Asciidoctor processes plain text and produces HTML, styled and layed out to suit your needs. If you prefer, Spring REST Docs can also be configured to use Markdown. Spring REST Docs makes use of snippets produced by tests written with {spring-framework-docs}/#spring-mvc-test-framework[Spring MVC Test] or -http://www.rest-assured.io[REST Assured] 2 and 3. This test-driven approach helps to +http://rest-assured.io[REST Assured] 2 and 3. This test-driven approach helps to guarantee the accuracy of your service's documentation. If a snippet is incorrect the test that produces it will fail. diff --git a/docs/src/docs/asciidoc/working-with-asciidoctor.adoc b/docs/src/docs/asciidoc/working-with-asciidoctor.adoc index de36f81c..43476dde 100644 --- a/docs/src/docs/asciidoc/working-with-asciidoctor.adoc +++ b/docs/src/docs/asciidoc/working-with-asciidoctor.adoc @@ -9,8 +9,8 @@ relevant to Spring REST Docs. [[working-with-asciidoctor-resources]] === Resources - * http://asciidoctor.org/docs/asciidoc-syntax-quick-reference[Syntax quick reference] - * http://asciidoctor.org/docs/user-manual[User manual] + * https://asciidoctor.org/docs/asciidoc-syntax-quick-reference[Syntax quick reference] + * https://asciidoctor.org/docs/user-manual[User manual] @@ -127,7 +127,7 @@ should be `operation-{snippet}-title`. For example, to customize the title of th [[working-with-asciidoctor-including-snippets-individual]] ==== Including individual snippets -The http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#include-files[include +The https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#include-files[include macro] is used to include individual snippets in your documentation. The `snippets` attribute that is automatically set by `spring-restdocs-asciidoctor` configured in the <> can be used to reference the @@ -153,7 +153,7 @@ snippet is included or by using a custom snippet template. ==== Formatting columns Asciidoctor has rich support for -http://asciidoctor.org/docs/user-manual/#cols-format[formatting a table's columns]. For +https://asciidoctor.org/docs/user-manual/#cols-format[formatting a table's columns]. For example, the widths of a table's columns can be specified using the `cols` attribute: [source,indent=0] @@ -200,5 +200,5 @@ in a cell that contains the value of a `description` attribute: ==== Further reading -Refer to the http://asciidoctor.org/docs/user-manual/#tables[Tables section of +Refer to the https://asciidoctor.org/docs/user-manual/#tables[Tables section of the Asciidoctor user manual] for more information about customizing tables. diff --git a/samples/rest-notes-grails/README.md b/samples/rest-notes-grails/README.md index d6c1be30..0e62fb32 100644 --- a/samples/rest-notes-grails/README.md +++ b/samples/rest-notes-grails/README.md @@ -3,7 +3,7 @@ ## Overview This is a sample project using Grails 3, Spock, and Spring REST docs. For more -information about the Grails framework please see [grails.org](http://grails.org). +information about the Grails framework please see [grails.org](https://grails.org). Grails is built on top of Spring Boot and Gradle so there are a few different ways to run this project including: diff --git a/samples/rest-notes-grails/grails-app/conf/logback.groovy b/samples/rest-notes-grails/grails-app/conf/logback.groovy index 72cda2de..41467f2a 100644 --- a/samples/rest-notes-grails/grails-app/conf/logback.groovy +++ b/samples/rest-notes-grails/grails-app/conf/logback.groovy @@ -17,7 +17,7 @@ import grails.util.BuildSettings import grails.util.Environment -// See http://logback.qos.ch/manual/groovy.html for details on configuration +// See https://logback.qos.ch/manual/groovy.html for details on configuration appender('STDOUT', ConsoleAppender) { encoder(PatternLayoutEncoder) { pattern = "%level %logger - %msg%n" diff --git a/samples/rest-notes-slate/README.md b/samples/rest-notes-slate/README.md index 9b031fc0..df99663c 100644 --- a/samples/rest-notes-slate/README.md +++ b/samples/rest-notes-slate/README.md @@ -21,4 +21,4 @@ documentation by [ERB][4]. The combined Markdown document is then turned into HT [1]: https://github.com/lord/slate [2]: slate/source/api-guide.html.md.erb [3]: src/test/java/com/example/notes/ApiDocumentation.java -[4]: http://ruby-doc.org/stdlib-2.2.3/libdoc/erb/rdoc/ERB.html \ No newline at end of file +[4]: https://ruby-doc.org/stdlib-2.2.3/libdoc/erb/rdoc/ERB.html \ No newline at end of file diff --git a/samples/rest-notes-slate/slate/README.md b/samples/rest-notes-slate/slate/README.md index 38acc9a6..5a4497a6 100644 --- a/samples/rest-notes-slate/slate/README.md +++ b/samples/rest-notes-slate/slate/README.md @@ -27,7 +27,7 @@ Features * **Let your users update your documentation for you** — By default, your Slate-generated documentation is hosted in a public Github repository. Not only does this mean you get free hosting for your docs with Github Pages, but it also makes it simple for other developers to make pull requests to your docs if they find typos or other problems. Of course, if you don't want to use GitHub, you're also welcome to host your docs elsewhere. -Getting started with Slate is super easy! Simply fork this repository and follow the instructions below. Or, if you'd like to check out what Slate is capable of, take a look at the [sample docs](http://lord.github.io/slate). +Getting started with Slate is super easy! Simply fork this repository and follow the instructions below. Or, if you'd like to check out what Slate is capable of, take a look at the [sample docs](https://lord.github.io/slate). Getting Started with Slate ------------------------------ @@ -67,18 +67,18 @@ Companies Using Slate * [NASA](https://api.nasa.gov) * [IBM](https://docs.cloudant.com/api.html) -* [Sony](http://developers.cimediacloud.com) -* [Mozilla](http://localforage.github.io/localForage/) +* [Sony](https://developers.cimediacloud.com) +* [Mozilla](https://localforage.github.io/localForage/) * [Best Buy](https://bestbuyapis.github.io/api-documentation/) * [Travis-CI](https://docs.travis-ci.com/api/) * [Greenhouse](https://developers.greenhouse.io/harvest.html) -* [Woocommerce](http://woocommerce.github.io/woocommerce-rest-api-docs/) -* [Appium](http://appium.io/slate/en/master) +* [Woocommerce](https://woocommerce.github.io/woocommerce-rest-api-docs/) +* [Appium](https://appium.io/slate/en/master) * [Dwolla](https://docs.dwolla.com/) * [Clearbit](https://clearbit.com/docs) * [Coinbase](https://developers.coinbase.com/api) -* [Parrot Drones](http://developer.parrot.com/docs/bebop/) -* [Fidor Bank](http://docs.fidor.de/) +* [Parrot Drones](https://developer.parrot.com/docs/bebop/) +* [Fidor Bank](https://api-docs.fidor.de) * [Scale](https://docs.scaleapi.com/) You can view more in [the list on the wiki](https://github.com/lord/slate/wiki/Slate-in-the-Wild). @@ -100,7 +100,7 @@ Thanks to the following people who have submitted major pull requests: - [@realityking](https://github.com/realityking) - [@cvkef](https://github.com/cvkef) -Also, thanks to [Sauce Labs](http://saucelabs.com) for helping sponsor the project. +Also, thanks to [Sauce Labs](https://saucelabs.com) for helping sponsor the project. Special Thanks -------------------- @@ -108,4 +108,4 @@ Special Thanks - [jquery.tocify.js](https://github.com/gfranko/jquery.tocify.js) - [middleman-syntax](https://github.com/middleman/middleman-syntax) - [middleman-gh-pages](https://github.com/edgecase/middleman-gh-pages) -- [Font Awesome](http://fortawesome.github.io/Font-Awesome/) +- [Font Awesome](https://fortawesome.github.io/Font-Awesome/) diff --git a/samples/rest-notes-slate/slate/source/api-guide.html.md.erb b/samples/rest-notes-slate/slate/source/api-guide.html.md.erb index 11248a3e..77dab522 100644 --- a/samples/rest-notes-slate/slate/source/api-guide.html.md.erb +++ b/samples/rest-notes-slate/slate/source/api-guide.html.md.erb @@ -49,9 +49,9 @@ that describes the problem. The error object has the following structure: ## Hypermedia RESTful Notes uses hypermedia and resources include links to other resources in their -responses. Responses are in [Hypertext Application Language (HAL)](http://stateless.co/hal_specification.html format). -Links can be found beneath the `_links` key. Users of the API should not create URIs -themselves, instead they should use the above-described links to navigate +responses. Responses are in [Hypertext Application Language (HAL)](https://github.com/mikekelly/hal_specification) +format. Links can be found beneath the `_links` key. Users of the API should not create +URIs themselves, instead they should use the above-described links to navigate diff --git a/samples/rest-notes-slate/slate/source/javascripts/app/_lang.js b/samples/rest-notes-slate/slate/source/javascripts/app/_lang.js index 679ec781..67e96b23 100644 --- a/samples/rest-notes-slate/slate/source/javascripts/app/_lang.js +++ b/samples/rest-notes-slate/slate/source/javascripts/app/_lang.js @@ -65,7 +65,7 @@ under the License. key = decodeURIComponent(key); // missing `=` should be `null`: - // http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters + // https://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters val = val === undefined ? null : decodeURIComponent(val); if (!ret.hasOwnProperty(key)) { diff --git a/samples/rest-notes-slate/slate/source/javascripts/lib/_energize.js b/samples/rest-notes-slate/slate/source/javascripts/lib/_energize.js index 6798f3c0..58240784 100644 --- a/samples/rest-notes-slate/slate/source/javascripts/lib/_energize.js +++ b/samples/rest-notes-slate/slate/source/javascripts/lib/_energize.js @@ -115,7 +115,7 @@ /** * Special logic for standalone web apps - * See http://stackoverflow.com/questions/2898740/iphone-safari-web-app-opens-links-in-new-window + * See https://stackoverflow.com/questions/2898740/iphone-safari-web-app-opens-links-in-new-window */ if(standAlone) { window.location = target.getAttribute("href"); diff --git a/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.highlight.js b/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.highlight.js index 9dcf3c7a..6c240860 100644 --- a/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.highlight.js +++ b/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.highlight.js @@ -2,7 +2,7 @@ * jQuery Highlight plugin * * Based on highlight v3 by Johann Burkard - * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html + * https://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html * * Code a little bit refactored and cleaned (in my humble opinion). * Most important changes: diff --git a/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.tocify.js b/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.tocify.js index 91cf6379..b60bc686 100644 --- a/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.tocify.js +++ b/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery.tocify.js @@ -1,5 +1,5 @@ /* jquery Tocify - v1.8.0 - 2013-09-16 -* http://www.gregfranko.com/jquery.tocify.js/ +* http://gregfranko.com/jquery.tocify.js/ * Copyright (c) 2013 Greg Franko; Licensed MIT * Modified lightly by Robert Lord to fix a bug I found, * and also so it adds ids to headers @@ -10,7 +10,7 @@ // Immediately-Invoked Function Expression (IIFE) [Ben Alman Blog Post](http://benalman.com/news/2010/11/immediately-invoked-function-expression/) that calls another IIFE that contains all of the plugin logic. I used this pattern so that anyone viewing this code would not have to scroll to the bottom of the page to view the local parameters that were passed to the main IIFE. (function(tocify) { - // ECMAScript 5 Strict Mode: [John Resig Blog Post](http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/) + // ECMAScript 5 Strict Mode: [John Resig Blog Post](https://johnresig.com/blog/ecmascript-5-strict-mode-json-and-more/) "use strict"; // Calls the second IIFE and locally passes in the global jQuery, window, and document objects @@ -21,7 +21,7 @@ // Locally passes in `jQuery`, the `window` object, the `document` object, and an `undefined` variable. The `jQuery`, `window` and `document` objects are passed in locally, to improve performance, since javascript first searches for a variable match within the local variables set before searching the global variables set. All of the global variables are also passed in locally to be minifier friendly. `undefined` can be passed in locally, because it is not a reserved word in JavaScript. (function($, window, document, undefined) { - // ECMAScript 5 Strict Mode: [John Resig Blog Post](http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/) + // ECMAScript 5 Strict Mode: [John Resig Blog Post](https://johnresig.com/blog/ecmascript-5-strict-mode-json-and-more/) "use strict"; var tocClassName = "tocify", diff --git a/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery_ui.js b/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery_ui.js index 637e9c14..2417b46e 100644 --- a/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery_ui.js +++ b/samples/rest-notes-slate/slate/source/javascripts/lib/_jquery_ui.js @@ -1,5 +1,5 @@ /*! jQuery UI - v1.11.3 - 2015-02-12 - * http://jqueryui.com + * https://jqueryui.com * Includes: widget.js * Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ @@ -16,13 +16,13 @@ }(function( $ ) { /*! * jQuery UI Widget 1.11.3 - * http://jqueryui.com + * https://jqueryui.com * * Copyright jQuery Foundation and other contributors * Released under the MIT license. - * http://jquery.org/license + * https://jquery.org/license * - * http://api.jqueryui.com/jQuery.widget/ + * https://api.jqueryui.com/jQuery.widget/ */ @@ -41,7 +41,7 @@ $( elem ).triggerHandler( "remove" ); } - // http://bugs.jquery.com/ticket/8235 + // https://bugs.jquery.com/ticket/8235 } catch ( e ) {} } orig( elems ); @@ -305,7 +305,7 @@ .unbind( this.eventNamespace ) .removeData( this.widgetFullName ) // support: jquery <1.6.3 - // http://bugs.jquery.com/ticket/9413 + // https://bugs.jquery.com/ticket/9413 .removeData( $.camelCase( this.widgetFullName ) ); this.widget() .unbind( this.eventNamespace ) diff --git a/samples/rest-notes-slate/slate/source/javascripts/lib/_lunr.js b/samples/rest-notes-slate/slate/source/javascripts/lib/_lunr.js index 54457dab..31aa9246 100644 --- a/samples/rest-notes-slate/slate/source/javascripts/lib/_lunr.js +++ b/samples/rest-notes-slate/slate/source/javascripts/lib/_lunr.js @@ -1,5 +1,5 @@ /** - * lunr - http://lunrjs.com - A bit like Solr, but much smaller and not as bright - 0.5.7 + * lunr - https://lunrjs.com - A bit like Solr, but much smaller and not as bright - 0.5.7 * Copyright (C) 2014 Oliver Nightingale * MIT Licensed * @license @@ -1298,12 +1298,12 @@ /*! * lunr.stemmer * Copyright (C) 2014 Oliver Nightingale - * Includes code from - http://tartarus.org/~martin/PorterStemmer/js.txt + * Includes code from - https://tartarus.org/~martin/PorterStemmer/js.txt */ /** * lunr.stemmer is an english language stemmer, this is a JavaScript - * implementation of the PorterStemmer taken from http://tartaurs.org/~martin + * implementation of the PorterStemmer taken from https://tartaurs.org/~martin * * @module * @param {String} str The string to stem @@ -1689,7 +1689,7 @@ /*! * lunr.stemmer * Copyright (C) 2014 Oliver Nightingale - * Includes code from - http://tartarus.org/~martin/PorterStemmer/js.txt + * Includes code from - https://tartarus.org/~martin/PorterStemmer/js.txt */ /** diff --git a/samples/rest-notes-slate/src/test/java/com/example/notes/ApiDocumentation.java b/samples/rest-notes-slate/src/test/java/com/example/notes/ApiDocumentation.java index 04cbce71..5955934b 100644 --- a/samples/rest-notes-slate/src/test/java/com/example/notes/ApiDocumentation.java +++ b/samples/rest-notes-slate/src/test/java/com/example/notes/ApiDocumentation.java @@ -126,10 +126,10 @@ public class ApiDocumentation { this.noteRepository.deleteAll(); createNote("REST maturity model", - "http://martinfowler.com/articles/richardsonMaturityModel.html"); + "https://martinfowler.com/articles/richardsonMaturityModel.html"); createNote("Hypertext Application Language (HAL)", - "http://stateless.co/hal_specification.html"); - createNote("Application-Level Profile Semantics (ALPS)", "http://alps.io/spec/"); + "https://github.com/mikekelly/hal_specification"); + createNote("Application-Level Profile Semantics (ALPS)", "https://github.com/alps-io/spec"); this.mockMvc.perform(get("/notes")) .andExpect(status().isOk()) @@ -153,7 +153,7 @@ public class ApiDocumentation { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); note.put("tags", Arrays.asList(tagLocation)); this.mockMvc.perform( @@ -181,7 +181,7 @@ public class ApiDocumentation { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); note.put("tags", Arrays.asList(tagLocation)); String noteLocation = this.mockMvc @@ -243,7 +243,7 @@ public class ApiDocumentation { public void noteUpdateExample() throws Exception { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); String noteLocation = this.mockMvc .perform( diff --git a/samples/rest-notes-spring-data-rest/src/main/asciidoc/api-guide.adoc b/samples/rest-notes-spring-data-rest/src/main/asciidoc/api-guide.adoc index 87bccce7..beed99d1 100644 --- a/samples/rest-notes-spring-data-rest/src/main/asciidoc/api-guide.adoc +++ b/samples/rest-notes-spring-data-rest/src/main/asciidoc/api-guide.adoc @@ -77,10 +77,10 @@ include::{snippets}/error-example/http-response.adoc[] == Hypermedia RESTful Notes uses hypermedia and resources include links to other resources in their -responses. Responses are in http://stateless.co/hal_specification.html[Hypertext Application -from resource to resource. -Language (HAL)] format. Links can be found beneath the `_links` key. Users of the API should -not create URIs themselves, instead they should use the above-described links to navigate +responses. Responses are in https://github.com/mikekelly/hal_specification[Hypertext +Application Language (HAL)] format. Links can be found beneath the `_links` key. Users of +the API should not create URIs themselves, instead they should use the above-described +links to navigate from resource to resource. [[resources]] = Resources diff --git a/samples/rest-notes-spring-data-rest/src/main/asciidoc/getting-started-guide.adoc b/samples/rest-notes-spring-data-rest/src/main/asciidoc/getting-started-guide.adoc index df16161a..78a44236 100644 --- a/samples/rest-notes-spring-data-rest/src/main/asciidoc/getting-started-guide.adoc +++ b/samples/rest-notes-spring-data-rest/src/main/asciidoc/getting-started-guide.adoc @@ -20,7 +20,7 @@ to describe the relationships between resources and to allow navigation between [getting-started-running-the-service] == Running the service -RESTful Notes is written using http://projects.spring.io/spring-boot[Spring Boot] which +RESTful Notes is written using https://projects.spring.io/spring-boot[Spring Boot] which makes it easy to get it up and running so that you can start exploring the REST API. The first step is to clone the Git repository: @@ -45,7 +45,8 @@ cURL: include::{snippets}/index/1/curl-request.adoc[] This request should yield the following response in the -http://stateless.co/hal_specification.html[Hypertext Application Language (HAL)] format: +https://github.com/mikekelly/hal_specification[Hypertext Application Language (HAL)] +format: include::{snippets}/index/1/http-response.adoc[] diff --git a/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java b/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java index fda556e6..4c65f7b0 100644 --- a/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java +++ b/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -124,10 +124,10 @@ public class ApiDocumentation { this.noteRepository.deleteAll(); createNote("REST maturity model", - "http://martinfowler.com/articles/richardsonMaturityModel.html"); + "https://martinfowler.com/articles/richardsonMaturityModel.html"); createNote("Hypertext Application Language (HAL)", - "http://stateless.co/hal_specification.html"); - createNote("Application-Level Profile Semantics (ALPS)", "http://alps.io/spec/"); + "https://github.com/mikekelly/hal_specification"); + createNote("Application-Level Profile Semantics (ALPS)", "https://github.com/alps-io/spec"); this.mockMvc.perform(get("/notes")) .andExpect(status().isOk()) @@ -154,7 +154,7 @@ public class ApiDocumentation { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); note.put("tags", Arrays.asList(tagLocation)); this.mockMvc.perform( @@ -182,7 +182,7 @@ public class ApiDocumentation { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); note.put("tags", Arrays.asList(tagLocation)); String noteLocation = this.mockMvc @@ -248,7 +248,7 @@ public class ApiDocumentation { public void noteUpdateExample() throws Exception { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); String noteLocation = this.mockMvc .perform( diff --git a/samples/rest-notes-spring-hateoas/src/docs/asciidoc/api-guide.adoc b/samples/rest-notes-spring-hateoas/src/docs/asciidoc/api-guide.adoc index e2fb505f..27b6db58 100644 --- a/samples/rest-notes-spring-hateoas/src/docs/asciidoc/api-guide.adoc +++ b/samples/rest-notes-spring-hateoas/src/docs/asciidoc/api-guide.adoc @@ -84,10 +84,10 @@ include::{snippets}/error-example/http-response.adoc[] == Hypermedia RESTful Notes uses hypermedia and resources include links to other resources in their -responses. Responses are in http://stateless.co/hal_specification.html[Hypertext Application -from resource to resource. -Language (HAL)] format. Links can be found beneath the `_links` key. Users of the API should -not create URIs themselves, instead they should use the above-described links to navigate +responses. Responses are in https://github.com/mikekelly/hal_specification[Hypertext +Application Language (HAL)] format. Links can be found beneath the `_links` key. Users of +the API should not create URIs themselves, instead they should use the above-described +links to navigate from resource to resource. [[resources]] = Resources diff --git a/samples/rest-notes-spring-hateoas/src/docs/asciidoc/getting-started-guide.adoc b/samples/rest-notes-spring-hateoas/src/docs/asciidoc/getting-started-guide.adoc index 096e00ab..c951418c 100644 --- a/samples/rest-notes-spring-hateoas/src/docs/asciidoc/getting-started-guide.adoc +++ b/samples/rest-notes-spring-hateoas/src/docs/asciidoc/getting-started-guide.adoc @@ -20,7 +20,7 @@ to describe the relationships between resources and to allow navigation between [getting-started-running-the-service] == Running the service -RESTful Notes is written using http://projects.spring.io/spring-boot[Spring Boot] which +RESTful Notes is written using https://projects.spring.io/spring-boot[Spring Boot] which makes it easy to get it up and running so that you can start exploring the REST API. The first step is to clone the Git repository: diff --git a/samples/rest-notes-spring-hateoas/src/test/java/com/example/notes/ApiDocumentation.java b/samples/rest-notes-spring-hateoas/src/test/java/com/example/notes/ApiDocumentation.java index 58f8e820..78ed5974 100644 --- a/samples/rest-notes-spring-hateoas/src/test/java/com/example/notes/ApiDocumentation.java +++ b/samples/rest-notes-spring-hateoas/src/test/java/com/example/notes/ApiDocumentation.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -146,9 +146,9 @@ public class ApiDocumentation { public void notesListExample() throws Exception { this.noteRepository.deleteAll(); - createNote("REST maturity model", "http://martinfowler.com/articles/richardsonMaturityModel.html"); - createNote("Hypertext Application Language (HAL)", "http://stateless.co/hal_specification.html"); - createNote("Application-Level Profile Semantics (ALPS)", "http://alps.io/spec/"); + createNote("REST maturity model", "https://martinfowler.com/articles/richardsonMaturityModel.html"); + createNote("Hypertext Application Language (HAL)", "https://github.com/mikekelly/hal_specification"); + createNote("Application-Level Profile Semantics (ALPS)", "https://github.com/alps-io/spec"); this.mockMvc .perform(get("/notes")) @@ -172,7 +172,7 @@ public class ApiDocumentation { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); note.put("tags", Arrays.asList(tagLocation)); ConstrainedFields fields = new ConstrainedFields(NoteInput.class); @@ -204,7 +204,7 @@ public class ApiDocumentation { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); note.put("tags", Arrays.asList(tagLocation)); String noteLocation = this.mockMvc @@ -270,7 +270,7 @@ public class ApiDocumentation { public void noteUpdateExample() throws Exception { Map note = new HashMap(); note.put("title", "REST maturity model"); - note.put("body", "http://martinfowler.com/articles/richardsonMaturityModel.html"); + note.put("body", "https://martinfowler.com/articles/richardsonMaturityModel.html"); String noteLocation = this.mockMvc .perform(post("/notes") diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/HypermediaDocumentation.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/HypermediaDocumentation.java index 7005648b..7b8dd4ad 100644 --- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/HypermediaDocumentation.java +++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/hypermedia/HypermediaDocumentation.java @@ -423,7 +423,7 @@ public abstract class HypermediaDocumentation { * { * "_links": { * "self": { - * "href": "http://example.com/foo" + * "href": "https://example.com/foo" * } * } * } @@ -443,7 +443,7 @@ public abstract class HypermediaDocumentation { * "links": [ * { * "rel": "self", - * "href": "http://example.com/foo" + * "href": "https://example.com/foo" * } * ] * } diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinkExtractorsPayloadTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinkExtractorsPayloadTests.java index a32b5353..d868297a 100644 --- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinkExtractorsPayloadTests.java +++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinkExtractorsPayloadTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class LinkExtractorsPayloadTests { public void singleLink() throws IOException { Map> links = this.linkExtractor .extractLinks(createResponse("single-link")); - assertLinks(Arrays.asList(new Link("alpha", "http://alpha.example.com", "Alpha")), + assertLinks(Arrays.asList(new Link("alpha", "https://alpha.example.com", "Alpha")), links); } @@ -76,8 +76,8 @@ public class LinkExtractorsPayloadTests { public void multipleLinksWithDifferentRels() throws IOException { Map> links = this.linkExtractor .extractLinks(createResponse("multiple-links-different-rels")); - assertLinks(Arrays.asList(new Link("alpha", "http://alpha.example.com", "Alpha"), - new Link("bravo", "http://bravo.example.com")), links); + assertLinks(Arrays.asList(new Link("alpha", "https://alpha.example.com", "Alpha"), + new Link("bravo", "https://bravo.example.com")), links); } @Test @@ -85,8 +85,8 @@ public class LinkExtractorsPayloadTests { Map> links = this.linkExtractor .extractLinks(createResponse("multiple-links-same-rels")); assertLinks(Arrays.asList( - new Link("alpha", "http://alpha.example.com/one", "Alpha one"), - new Link("alpha", "http://alpha.example.com/two")), links); + new Link("alpha", "https://alpha.example.com/one", "Alpha one"), + new Link("alpha", "https://alpha.example.com/two")), links); } @Test diff --git a/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-embedded-and-links.json b/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-embedded-and-links.json index fdaf197d..e4ceed00 100644 --- a/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-embedded-and-links.json +++ b/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-embedded-and-links.json @@ -1,7 +1,7 @@ { "_links": { - "alpha": "http://alpha.example.com", - "bravo": "http://bravo.example.com" + "alpha": "https://alpha.example.com", + "bravo": "https://bravo.example.com" }, "_embedded": "embedded-test", "beta": "beta-value", diff --git a/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-links.json b/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-links.json index 794ece50..b4ca7edc 100644 --- a/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-links.json +++ b/spring-restdocs-core/src/test/resources/field-payloads/multiple-fields-and-links.json @@ -1,7 +1,7 @@ { "_links": { - "alpha": "http://alpha.example.com", - "bravo": "http://bravo.example.com" + "alpha": "https://alpha.example.com", + "bravo": "https://bravo.example.com" }, "beta": "beta-value", "charlie": "charlie-value" diff --git a/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-different-rels.json b/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-different-rels.json index 081c5d98..97865b18 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-different-rels.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-different-rels.json @@ -1,10 +1,10 @@ { "links": [ { "rel": "alpha", - "href": "http://alpha.example.com", + "href": "https://alpha.example.com", "title": "Alpha" }, { "rel": "bravo", - "href": "http://bravo.example.com" + "href": "https://bravo.example.com" } ] } \ No newline at end of file diff --git a/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-same-rels.json b/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-same-rels.json index 28d76ac7..837b19bf 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-same-rels.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/atom/multiple-links-same-rels.json @@ -1,10 +1,10 @@ { "links": [ { "rel": "alpha", - "href": "http://alpha.example.com/one", + "href": "https://alpha.example.com/one", "title": "Alpha one" }, { "rel": "alpha", - "href": "http://alpha.example.com/two" + "href": "https://alpha.example.com/two" } ] } \ No newline at end of file diff --git a/spring-restdocs-core/src/test/resources/link-payloads/atom/single-link.json b/spring-restdocs-core/src/test/resources/link-payloads/atom/single-link.json index d6339c03..d49bdbc1 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/atom/single-link.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/atom/single-link.json @@ -1,7 +1,7 @@ { "links": [ { "rel": "alpha", - "href": "http://alpha.example.com", + "href": "https://alpha.example.com", "title": "Alpha" } ] } \ No newline at end of file diff --git a/spring-restdocs-core/src/test/resources/link-payloads/atom/wrong-format.json b/spring-restdocs-core/src/test/resources/link-payloads/atom/wrong-format.json index a5e2e40f..00c90d2f 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/atom/wrong-format.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/atom/wrong-format.json @@ -1,9 +1,9 @@ { "links": { "alpha": [{ - "href": "http://alpha.example.com/one" + "href": "https://alpha.example.com/one" }, { - "href": "http://alpha.example.com/two" + "href": "https://alpha.example.com/two" }] } } \ No newline at end of file diff --git a/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-different-rels.json b/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-different-rels.json index 6eecbf5c..066055d7 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-different-rels.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-different-rels.json @@ -1,11 +1,11 @@ { "_links": { "alpha": { - "href": "http://alpha.example.com", + "href": "https://alpha.example.com", "title": "Alpha" }, "bravo": { - "href": "http://bravo.example.com" + "href": "https://bravo.example.com" } } } \ No newline at end of file diff --git a/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-same-rels.json b/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-same-rels.json index 9e5f51dc..4c29ad11 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-same-rels.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-same-rels.json @@ -1,10 +1,10 @@ { "_links": { "alpha": [{ - "href": "http://alpha.example.com/one", + "href": "https://alpha.example.com/one", "title": "Alpha one" }, { - "href": "http://alpha.example.com/two" + "href": "https://alpha.example.com/two" }] } } \ No newline at end of file diff --git a/spring-restdocs-core/src/test/resources/link-payloads/hal/single-link.json b/spring-restdocs-core/src/test/resources/link-payloads/hal/single-link.json index 43bf4273..73bdbb9a 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/hal/single-link.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/hal/single-link.json @@ -1,7 +1,7 @@ { "_links": { "alpha": { - "href": "http://alpha.example.com", + "href": "https://alpha.example.com", "title": "Alpha" } } diff --git a/spring-restdocs-core/src/test/resources/link-payloads/hal/wrong-format.json b/spring-restdocs-core/src/test/resources/link-payloads/hal/wrong-format.json index 7c99aa4e..a4d79046 100644 --- a/spring-restdocs-core/src/test/resources/link-payloads/hal/wrong-format.json +++ b/spring-restdocs-core/src/test/resources/link-payloads/hal/wrong-format.json @@ -1,9 +1,9 @@ { "_links": [ { "rel": "alpha", - "href": "http://alpha.example.com/one" + "href": "https://alpha.example.com/one" }, { "rel": "alpha", - "href": "http://alpha.example.com/two" + "href": "https://alpha.example.com/two" } ] } \ No newline at end of file diff --git a/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessorTests.java b/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessorTests.java index 18aef09e..9a7ab00e 100644 --- a/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessorTests.java +++ b/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/operation/preprocess/UriModifyingOperationPreprocessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2018 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,9 +63,9 @@ public class UriModifyingOperationPreprocessorTests { public void requestUriHostCanBeModified() { this.preprocessor.host("api.example.com"); OperationRequest processed = this.preprocessor - .preprocess(createRequestWithUri("http://api.foo.com:12345")); + .preprocess(createRequestWithUri("https://api.foo.com:12345")); assertThat(processed.getUri()) - .isEqualTo(URI.create("http://api.example.com:12345")); + .isEqualTo(URI.create("https://api.example.com:12345")); assertThat(processed.getHeaders().getFirst(HttpHeaders.HOST)) .isEqualTo("api.example.com:12345"); } @@ -74,9 +74,9 @@ public class UriModifyingOperationPreprocessorTests { public void requestUriPortCanBeModified() { this.preprocessor.port(23456); OperationRequest processed = this.preprocessor - .preprocess(createRequestWithUri("http://api.example.com:12345")); + .preprocess(createRequestWithUri("https://api.example.com:12345")); assertThat(processed.getUri()) - .isEqualTo(URI.create("http://api.example.com:23456")); + .isEqualTo(URI.create("https://api.example.com:23456")); assertThat(processed.getHeaders().getFirst(HttpHeaders.HOST)) .isEqualTo("api.example.com:23456"); } @@ -85,8 +85,8 @@ public class UriModifyingOperationPreprocessorTests { public void requestUriPortCanBeRemoved() { this.preprocessor.removePort(); OperationRequest processed = this.preprocessor - .preprocess(createRequestWithUri("http://api.example.com:12345")); - assertThat(processed.getUri()).isEqualTo(URI.create("http://api.example.com")); + .preprocess(createRequestWithUri("https://api.example.com:12345")); + assertThat(processed.getUri()).isEqualTo(URI.create("https://api.example.com")); assertThat(processed.getHeaders().getFirst(HttpHeaders.HOST)) .isEqualTo("api.example.com"); } @@ -95,27 +95,27 @@ public class UriModifyingOperationPreprocessorTests { public void requestUriPathIsPreserved() { this.preprocessor.removePort(); OperationRequest processed = this.preprocessor - .preprocess(createRequestWithUri("http://api.example.com:12345/foo/bar")); + .preprocess(createRequestWithUri("https://api.example.com:12345/foo/bar")); assertThat(processed.getUri()) - .isEqualTo(URI.create("http://api.example.com/foo/bar")); + .isEqualTo(URI.create("https://api.example.com/foo/bar")); } @Test public void requestUriQueryIsPreserved() { this.preprocessor.removePort(); OperationRequest processed = this.preprocessor - .preprocess(createRequestWithUri("http://api.example.com:12345?foo=bar")); + .preprocess(createRequestWithUri("https://api.example.com:12345?foo=bar")); assertThat(processed.getUri()) - .isEqualTo(URI.create("http://api.example.com?foo=bar")); + .isEqualTo(URI.create("https://api.example.com?foo=bar")); } @Test public void requestUriAnchorIsPreserved() { this.preprocessor.removePort(); OperationRequest processed = this.preprocessor - .preprocess(createRequestWithUri("http://api.example.com:12345#foo")); + .preprocess(createRequestWithUri("https://api.example.com:12345#foo")); assertThat(processed.getUri()) - .isEqualTo(URI.create("http://api.example.com#foo")); + .isEqualTo(URI.create("https://api.example.com#foo")); } @Test @@ -133,9 +133,9 @@ public class UriModifyingOperationPreprocessorTests { this.preprocessor.host("api.example.com"); OperationRequest processed = this.preprocessor .preprocess(createRequestWithContent( - "The uri 'http://localhost:12345' should be used")); + "The uri 'https://localhost:12345' should be used")); assertThat(new String(processed.getContent())) - .isEqualTo("The uri 'http://api.example.com:12345' should be used"); + .isEqualTo("The uri 'https://api.example.com:12345' should be used"); } @Test @@ -213,9 +213,9 @@ public class UriModifyingOperationPreprocessorTests { this.preprocessor.host("api.example.com"); OperationResponse processed = this.preprocessor .preprocess(createResponseWithContent( - "The uri 'http://localhost:12345' should be used")); + "The uri 'https://localhost:12345' should be used")); assertThat(new String(processed.getContent())) - .isEqualTo("The uri 'http://api.example.com:12345' should be used"); + .isEqualTo("The uri 'https://api.example.com:12345' should be used"); } @Test @@ -281,35 +281,35 @@ public class UriModifyingOperationPreprocessorTests { @Test public void urisInRequestHeadersCanBeModified() { OperationRequest processed = this.preprocessor.host("api.example.com") - .preprocess(createRequestWithHeader("Foo", "http://locahost:12345")); + .preprocess(createRequestWithHeader("Foo", "https://locahost:12345")); assertThat(processed.getHeaders().getFirst("Foo")) - .isEqualTo("http://api.example.com:12345"); + .isEqualTo("https://api.example.com:12345"); assertThat(processed.getHeaders().getFirst("Host")).isEqualTo("api.example.com"); } @Test public void urisInResponseHeadersCanBeModified() { OperationResponse processed = this.preprocessor.host("api.example.com") - .preprocess(createResponseWithHeader("Foo", "http://locahost:12345")); + .preprocess(createResponseWithHeader("Foo", "https://locahost:12345")); assertThat(processed.getHeaders().getFirst("Foo")) - .isEqualTo("http://api.example.com:12345"); + .isEqualTo("https://api.example.com:12345"); } @Test public void urisInRequestPartHeadersCanBeModified() { OperationRequest processed = this.preprocessor.host("api.example.com").preprocess( - createRequestWithPartWithHeader("Foo", "http://locahost:12345")); + createRequestWithPartWithHeader("Foo", "https://locahost:12345")); assertThat(processed.getParts().iterator().next().getHeaders().getFirst("Foo")) - .isEqualTo("http://api.example.com:12345"); + .isEqualTo("https://api.example.com:12345"); } @Test public void urisInRequestPartContentCanBeModified() { OperationRequest processed = this.preprocessor.host("api.example.com") .preprocess(createRequestWithPartWithContent( - "The uri 'http://localhost:12345' should be used")); + "The uri 'https://localhost:12345' should be used")); assertThat(new String(processed.getParts().iterator().next().getContent())) - .isEqualTo("The uri 'http://api.example.com:12345' should be used"); + .isEqualTo("The uri 'https://api.example.com:12345' should be used"); } @Test