From 8a867fb640947ae8edfbc6f36d6a417ea20015d2 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 27 Mar 2019 09:00:54 -0700 Subject: [PATCH] URL Cleanup (#1009) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://1337.net (200) with 1 occurrences could not be migrated: ([https](https://1337.net) result SSLHandshakeException). * [ ] http://codearte.io (200) with 2 occurrences could not be migrated: ([https](https://codearte.io) result SSLHandshakeException). * [ ] http://groovy-lang.org/json.html (200) with 5 occurrences could not be migrated: ([https](https://groovy-lang.org/json.html) result SSLProtocolException). * [ ] http://partners.com (200) with 15 occurrences could not be migrated: ([https](https://partners.com) result SSLHandshakeException). * [ ] http://rest-assured.io/ (200) with 2 occurrences could not be migrated: ([https](https://rest-assured.io/) result SSLHandshakeException). * [ ] http://toomuchcoding.com/blog/categories/accurest/ (200) with 2 occurrences could not be migrated: ([https](https://toomuchcoding.com/blog/categories/accurest/) result SSLHandshakeException). * [ ] http://toomuchcoding.com/blog/categories/spring-cloud-contract/ (200) with 2 occurrences could not be migrated: ([https](https://toomuchcoding.com/blog/categories/spring-cloud-contract/) result SSLHandshakeException). * [ ] http://wiremock.org (200) with 3 occurrences could not be migrated: ([https](https://wiremock.org) result SSLHandshakeException). * [ ] http://wiremock.org/docs/running-standalone/ (200) with 2 occurrences could not be migrated: ([https](https://wiremock.org/docs/running-standalone/) result SSLHandshakeException). * [ ] http://wiremock.org/docs/stateful-behaviour/ (200) with 2 occurrences could not be migrated: ([https](https://wiremock.org/docs/stateful-behaviour/) result SSLHandshakeException). * [ ] http://wiremock.org/docs/stubbing/ (200) with 2 occurrences could not be migrated: ([https](https://wiremock.org/docs/stubbing/) result SSLHandshakeException). * [ ] http://wiremock.org/stubbing.html (200) with 1 occurrences could not be migrated: ([https](https://wiremock.org/stubbing.html) result SSLHandshakeException). * [ ] http://foo.com/ (301) with 1 occurrences could not be migrated: ([https](https://foo.com/) result SSLHandshakeException). * [ ] http://foo.com (301) with 1 occurrences could not be migrated: ([https](https://foo.com) result SSLHandshakeException). * [ ] http://foo.com/blah_ (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_) result SSLHandshakeException). * [ ] http://foo.com/blah_blah (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_blah) result SSLHandshakeException). * [ ] http://foo.com/blah_blah/ (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_blah/) result SSLHandshakeException). * [ ] http://foo.com/blah_blah_ (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_blah_) result SSLHandshakeException). * [ ] http://foo.com/unicode_ (301) with 1 occurrences could not be migrated: ([https](https://foo.com/unicode_) result SSLHandshakeException). * [ ] http://192.168.0.100:8081/artifactory/libs-release-local (403) with 1 occurrences could not be migrated: ([https](https://192.168.0.100:8081/artifactory/libs-release-local) result ConnectTimeoutException). * [ ] http://nexus.net/content/repositories/repository (404) with 1 occurrences could not be migrated: ([https](https://nexus.net/content/repositories/repository) result SSLProtocolException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://142.42.1.1/ (AnnotatedNoRouteToHostException) with 1 occurrences migrated to: https://142.42.1.1/ ([https](https://142.42.1.1/) result AnnotatedNoRouteToHostException). * [ ] http://142.42.1.1:8080/ (AnnotatedNoRouteToHostException) with 1 occurrences migrated to: https://142.42.1.1:8080/ ([https](https://142.42.1.1:8080/) result AnnotatedNoRouteToHostException). * [ ] http://223.255.255.254 (AnnotatedNoRouteToHostException) with 1 occurrences migrated to: https://223.255.255.254 ([https](https://223.255.255.254) result AnnotatedNoRouteToHostException). * [ ] http://123.123.123 (ConnectTimeoutException) with 1 occurrences migrated to: https://123.123.123 ([https](https://123.123.123) result ConnectTimeoutException). * [ ] http://-a.b.co (UnknownHostException) with 1 occurrences migrated to: https://-a.b.co ([https](https://-a.b.co) result UnknownHostException). * [ ] http://-error-.invalid/ (UnknownHostException) with 1 occurrences migrated to: https://-error-.invalid/ ([https](https://-error-.invalid/) result UnknownHostException). * [ ] http://../ (UnknownHostException) with 1 occurrences migrated to: https://../ ([https](https://../) result UnknownHostException). * [ ] http://.www.foo.bar./ (UnknownHostException) with 1 occurrences migrated to: https://.www.foo.bar./ ([https](https://.www.foo.bar./) result UnknownHostException). * [ ] http://.www.foo.bar/ (UnknownHostException) with 1 occurrences migrated to: https://.www.foo.bar/ ([https](https://.www.foo.bar/) result UnknownHostException). * [ ] http://1.1.1.1.1 (UnknownHostException) with 1 occurrences migrated to: https://1.1.1.1.1 ([https](https://1.1.1.1.1) result UnknownHostException). * [ ] http://a.b-.co (UnknownHostException) with 1 occurrences migrated to: https://a.b-.co ([https](https://a.b-.co) result UnknownHostException). * [ ] http://a.b-c.de (UnknownHostException) with 1 occurrences migrated to: https://a.b-c.de ([https](https://a.b-c.de) result UnknownHostException). * [ ] http://foo-597104692.com (UnknownHostException) with 3 occurrences migrated to: https://foo-597104692.com ([https](https://foo-597104692.com) result UnknownHostException). * [ ] http://foo.bar (UnknownHostException) with 2 occurrences migrated to: https://foo.bar ([https](https://foo.bar) result UnknownHostException). * [ ] http://foo.bar/?q=Test%20URL-encoded%20stuff (UnknownHostException) with 1 occurrences migrated to: https://foo.bar/?q=Test%20URL-encoded%20stuff ([https](https://foo.bar/?q=Test%20URL-encoded%20stuff) result UnknownHostException). * [ ] http://foo.bar/foo (UnknownHostException) with 1 occurrences migrated to: https://foo.bar/foo ([https](https://foo.bar/foo) result UnknownHostException). * [ ] http://foo.bar?q=Spaces (UnknownHostException) with 1 occurrences migrated to: https://foo.bar?q=Spaces ([https](https://foo.bar?q=Spaces) result UnknownHostException). * [ ] http://foo389886219.com (UnknownHostException) with 3 occurrences migrated to: https://foo389886219.com ([https](https://foo389886219.com) result UnknownHostException). * [ ] http://userid:password@example.com (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com ([https](https://userid:password@example.com) result UnknownHostException). * [ ] http://userid:password@example.com/ (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com/ ([https](https://userid:password@example.com/) result UnknownHostException). * [ ] http://userid:password@example.com:8080 (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com:8080 ([https](https://userid:password@example.com:8080) result UnknownHostException). * [ ] http://userid:password@example.com:8080/ (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com:8080/ ([https](https://userid:password@example.com:8080/) result UnknownHostException). * [ ] http://userid@example.com (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com ([https](https://userid@example.com) result UnknownHostException). * [ ] http://userid@example.com/ (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com/ ([https](https://userid@example.com/) result UnknownHostException). * [ ] http://userid@example.com:8080 (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com:8080 ([https](https://userid@example.com:8080) result UnknownHostException). * [ ] http://userid@example.com:8080/ (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com:8080/ ([https](https://userid@example.com:8080/) result UnknownHostException). * [ ] http://www.foo.bar./ (UnknownHostException) with 1 occurrences migrated to: https://www.foo.bar./ ([https](https://www.foo.bar./) result UnknownHostException). * [ ] http://example.org/123/hello-url-matcher/ (404) with 1 occurrences migrated to: https://example.org/123/hello-url-matcher/ ([https](https://example.org/123/hello-url-matcher/) result 404). * [ ] http://example.org/123/url-path-pattern/ (404) with 1 occurrences migrated to: https://example.org/123/url-path-pattern/ ([https](https://example.org/123/url-path-pattern/) result 404). * [ ] http://example.org/body (404) with 10 occurrences migrated to: https://example.org/body ([https](https://example.org/body) result 404). * [ ] http://example.org/poster (404) with 6 occurrences migrated to: https://example.org/poster ([https](https://example.org/poster) result 404). * [ ] http://example.org/resource (404) with 10 occurrences migrated to: https://example.org/resource ([https](https://example.org/resource) result 404). * [ ] http://repo.spring.io/snapshots (404) with 1 occurrences migrated to: https://repo.spring.io/snapshots ([https](https://repo.spring.io/snapshots) result 404). * [ ] http://www.example.com/wpstyle/?p=364 (404) with 1 occurrences migrated to: https://www.example.com/wpstyle/?p=364 ([https](https://www.example.com/wpstyle/?p=364) result 404). * [ ] http://api.twitter.com/1/geo/id/01fbe706f872cb32.json (403) with 4 occurrences migrated to: https://api.twitter.com/1/geo/id/01fbe706f872cb32.json ([https](https://api.twitter.com/1/geo/id/01fbe706f872cb32.json) result 410). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://asciidoctor.org with 1 occurrences migrated to: https://asciidoctor.org ([https](https://asciidoctor.org) result 200). * [ ] http://www.citrusframework.org/ (301) with 1 occurrences migrated to: https://citrusframework.org/ ([https](https://www.citrusframework.org/) result 200). * [ ] http://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html with 2 occurrences migrated to: https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html ([https](https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html) result 200). * [ ] http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html ([https](https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html) result 200). * [ ] http://example.org with 40 occurrences migrated to: https://example.org ([https](https://example.org) result 200). * [ ] http://example.org/ with 3 occurrences migrated to: https://example.org/ ([https](https://example.org/) result 200). * [ ] http://handlebarsjs.com/ with 1 occurrences migrated to: https://handlebarsjs.com/ ([https](https://handlebarsjs.com/) result 200). * [ ] http://martinfowler.com/articles/consumerDrivenContracts.html with 1 occurrences migrated to: https://martinfowler.com/articles/consumerDrivenContracts.html ([https](https://martinfowler.com/articles/consumerDrivenContracts.html) result 200). * [ ] http://maven.apache.org/download.cgi with 1 occurrences migrated to: https://maven.apache.org/download.cgi ([https](https://maven.apache.org/download.cgi) result 200). * [ ] http://maven.apache.org/xsd/assembly-1.1.3.xsd with 1 occurrences migrated to: https://maven.apache.org/xsd/assembly-1.1.3.xsd ([https](https://maven.apache.org/xsd/assembly-1.1.3.xsd) result 200). * [ ] http://maven.apache.org/xsd/maven-4.0.0.xsd with 16 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://tools.ietf.org/html/rfc1945 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc1945 ([https](https://tools.ietf.org/html/rfc1945) result 200). * [ ] http://tools.ietf.org/html/rfc2109 with 2 occurrences migrated to: https://tools.ietf.org/html/rfc2109 ([https](https://tools.ietf.org/html/rfc2109) result 200). * [ ] http://tools.ietf.org/html/rfc2295 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2295 ([https](https://tools.ietf.org/html/rfc2295) result 200). * [ ] http://tools.ietf.org/html/rfc2324 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2324 ([https](https://tools.ietf.org/html/rfc2324) result 200). * [ ] http://tools.ietf.org/html/rfc2518 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2518 ([https](https://tools.ietf.org/html/rfc2518) result 200). * [ ] http://tools.ietf.org/html/rfc2616 with 2 occurrences migrated to: https://tools.ietf.org/html/rfc2616 ([https](https://tools.ietf.org/html/rfc2616) result 200). * [ ] http://tools.ietf.org/html/rfc2774 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2774 ([https](https://tools.ietf.org/html/rfc2774) result 200). * [ ] http://tools.ietf.org/html/rfc2817 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2817 ([https](https://tools.ietf.org/html/rfc2817) result 200). * [ ] http://tools.ietf.org/html/rfc2965 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2965 ([https](https://tools.ietf.org/html/rfc2965) result 200). * [ ] http://tools.ietf.org/html/rfc3229 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc3229 ([https](https://tools.ietf.org/html/rfc3229) result 200). * [ ] http://tools.ietf.org/html/rfc4918 with 5 occurrences migrated to: https://tools.ietf.org/html/rfc4918 ([https](https://tools.ietf.org/html/rfc4918) result 200). * [ ] http://tools.ietf.org/html/rfc5842 with 2 occurrences migrated to: https://tools.ietf.org/html/rfc5842 ([https](https://tools.ietf.org/html/rfc5842) result 200). * [ ] http://tools.ietf.org/html/rfc5988 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc5988 ([https](https://tools.ietf.org/html/rfc5988) result 200). * [ ] http://tools.ietf.org/html/rfc6266 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc6266 ([https](https://tools.ietf.org/html/rfc6266) result 200). * [ ] http://tools.ietf.org/html/rfc6454 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc6454 ([https](https://tools.ietf.org/html/rfc6454) result 200). * [ ] http://tools.ietf.org/html/rfc6585 with 4 occurrences migrated to: https://tools.ietf.org/html/rfc6585 ([https](https://tools.ietf.org/html/rfc6585) result 200). * [ ] http://tools.ietf.org/html/rfc7230 with 8 occurrences migrated to: https://tools.ietf.org/html/rfc7230 ([https](https://tools.ietf.org/html/rfc7230) result 200). * [ ] http://tools.ietf.org/html/rfc7231 with 53 occurrences migrated to: https://tools.ietf.org/html/rfc7231 ([https](https://tools.ietf.org/html/rfc7231) result 200). * [ ] http://tools.ietf.org/html/rfc7232 with 8 occurrences migrated to: https://tools.ietf.org/html/rfc7232 ([https](https://tools.ietf.org/html/rfc7232) result 200). * [ ] http://tools.ietf.org/html/rfc7233 with 6 occurrences migrated to: https://tools.ietf.org/html/rfc7233 ([https](https://tools.ietf.org/html/rfc7233) result 200). * [ ] http://tools.ietf.org/html/rfc7234 with 5 occurrences migrated to: https://tools.ietf.org/html/rfc7234 ([https](https://tools.ietf.org/html/rfc7234) result 200). * [ ] http://tools.ietf.org/html/rfc7235 with 6 occurrences migrated to: https://tools.ietf.org/html/rfc7235 ([https](https://tools.ietf.org/html/rfc7235) result 200). * [ ] http://tools.ietf.org/html/rfc7238 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc7238 ([https](https://tools.ietf.org/html/rfc7238) result 200). * [ ] http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt with 3 occurrences migrated to: https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt ([https](https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt) result 200). * [ ] http://www.java.com/en/download/help/error_hotspot.xml with 1 occurrences migrated to: https://www.java.com/en/download/help/error_hotspot.xml ([https](https://www.java.com/en/download/help/error_hotspot.xml) result 200). * [ ] http://www.regular-expressions.info/examples.html with 1 occurrences migrated to: https://www.regular-expressions.info/examples.html ([https](https://www.regular-expressions.info/examples.html) result 200). * [ ] http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura with 2 occurrences migrated to: https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura ([https](https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura) result 200). * [ ] http://www.w3.org/TR/cors/ with 8 occurrences migrated to: https://www.w3.org/TR/cors/ ([https](https://www.w3.org/TR/cors/) result 200). * [ ] http://cloud.spring.io/spring-cloud-cli with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-cli ([https](https://cloud.spring.io/spring-cloud-cli) result 301). * [ ] http://code.google.com/events/ with 1 occurrences migrated to: https://code.google.com/events/ ([https](https://code.google.com/events/) result 301). * [ ] http://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal with 1 occurrences migrated to: https://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal ([https](https://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal) result 301). * [ ] http://j.mp with 1 occurrences migrated to: https://j.mp ([https](https://j.mp) result 301). * [ ] http://pact.io/ with 1 occurrences migrated to: https://pact.io/ ([https](https://pact.io/) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://spockframework.github.io/ with 1 occurrences migrated to: https://spockframework.github.io/ ([https](https://spockframework.github.io/) result 301). * [ ] http://www.sonatype.org/nexus/ with 1 occurrences migrated to: https://www.sonatype.org/nexus/ ([https](https://www.sonatype.org/nexus/) result 301). * [ ] http://formvalidation.io/validators/uri/ with 1 occurrences migrated to: https://formvalidation.io/validators/uri/ ([https](https://formvalidation.io/validators/uri/) result 302). * [ ] http://repo.spring.io/libs-snapshot with 4 occurrences migrated to: https://repo.spring.io/libs-snapshot ([https](https://repo.spring.io/libs-snapshot) result 302). * [ ] http://repo.spring.io/milestone with 1 occurrences migrated to: https://repo.spring.io/milestone ([https](https://repo.spring.io/milestone) result 302). * [ ] http://repo.spring.io/release with 1 occurrences migrated to: https://repo.spring.io/release ([https](https://repo.spring.io/release) result 302). * [ ] http://repo.spring.io/snapshot with 1 occurrences migrated to: https://repo.spring.io/snapshot ([https](https://repo.spring.io/snapshot) result 302). # Ignored These URLs were intentionally ignored. * http:///a with 1 occurrences * http://3628126748 with 1 occurrences * http://??/ with 1 occurrences * http://foo with 2 occurrences * http://foo/bar with 4 occurrences * http://foo/bar?myParam= with 1 occurrences * http://link/to/your/nexus/or/artifactory/or/sth with 1 occurrences * http://loanIssuance/name with 3 occurrences * http://localhost with 55 occurrences * http://localhost/partners/ with 6 occurrences * http://localhost/partners/1000/users/1001 with 3 occurrences * http://localhost:12345 with 1 occurrences * http://localhost:12346 with 1 occurrences * http://localhost:5435 with 1 occurrences * http://localhost:6060 with 1 occurrences * http://localhost:6061 with 1 occurrences * http://localhost:6063 with 1 occurrences * http://localhost:6065 with 1 occurrences * http://localhost:6066 with 1 occurrences * http://localhost:6067 with 1 occurrences * http://localhost:6565/ with 1 occurrences * http://localhost:7070 with 1 occurrences * http://localhost:7071 with 1 occurrences * http://localhost:8080 with 3 occurrences * http://localhost:8080/api with 1 occurrences * http://localhost:8081/artifactory/libs-release-local with 2 occurrences * http://localhost:8081/artifactory/libs-release-local/com/example/bookstore/0.0.1.RELEASE/ with 1 occurrences * http://localhost:8081/artifactory/libs-release-local/com/example/bookstore/0.0.1.RELEASE/bookstore-0.0.1.RELEASE-stubs.jar with 1 occurrences * http://localhost:8085 with 4 occurrences * http://localhost:8888/users with 1 occurrences * http://localhost:9090 with 1 occurrences * http://localhost:9876/api/books with 2 occurrences * http://maven.apache.org/POM/4.0.0 with 32 occurrences * http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 with 2 occurrences * http://someNameThatShouldMapFraudDetectionServer/name with 3 occurrences * http://some_url with 1 occurrences * http://www.w3.org/2001/XMLSchema-instance with 17 occurrences --- .github/CONTRIBUTING.md | 4 +- .gitignore | 2 +- README.adoc | 24 ++-- asciidoctor.css | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- docs/src/main/asciidoc/migrations.adoc | 2 +- .../main/asciidoc/spring-cloud-wiremock.adoc | 2 +- docs/src/main/asciidoc/verifier_contract.adoc | 2 +- docs/src/main/asciidoc/verifier_faq.adoc | 4 +- .../main/asciidoc/verifier_introduction.adoc | 2 +- docs/src/main/asciidoc/verifier_setup.adoc | 4 +- ideas.md | 2 +- .../test/resources/application-test-repo.yaml | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- ...mockForDocsMockServerApplicationTests.java | 2 +- .../WiremockMockServerApplicationTests.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../WiremockMockServerApplicationTests.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../WiremockMockServerApplicationTests.java | 2 +- .../contract/spec/internal/HttpHeaders.groovy | 120 ++++++++-------- .../contract/spec/internal/HttpStatus.groovy | 130 +++++++++--------- .../spec/internal/RegexPatterns.groovy | 2 +- .../spec/internal/RegexPatternsSpec.groovy | 76 +++++----- spring-cloud-contract-stub-runner/README.adoc | 6 +- .../StubRunnerBootEurekaExample.java | 2 +- .../stubrunner/GitStubDownloaderTests.java | 2 +- .../bootService-0.0.1-SNAPSHOT.pom | 2 +- .../fraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../loanIssuance-0.0.1-SNAPSHOT.pom | 2 +- ...erWithMultipleConsumers-0.0.1-SNAPSHOT.pom | 2 +- .../DslToWireMockClientConverterSpec.groovy | 6 +- .../jersey-contracts-0.0.1-SNAPSHOT.pom | 2 +- .../contracts-0.0.1-SNAPSHOT.pom | 2 +- .../TestSideRequestTemplateModel.groovy | 2 +- .../JaxRsClientMethodBuilderSpec.groovy | 2 +- .../MessagingMethodBodyBuilderSpec.groovy | 2 +- .../MockMvcMethodBodyBuilderSpec.groovy | 4 +- .../WiremockMockServerApplicationTests.java | 116 ++++++++-------- .../wiremock/WiremockTestsApplication.java | 2 +- .../AmqpMessagingApplicationSpec.groovy | 2 +- ...loud-contract-amqp-test-0.4.0-SNAPSHOT.pom | 2 +- .../bootService-0.0.1-SNAPSHOT.pom | 2 +- .../fraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../loanIssuance-0.0.1-SNAPSHOT.pom | 2 +- .../bootService-0.0.1-SNAPSHOT.pom | 2 +- .../fraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../loanIssuance-0.0.1-SNAPSHOT.pom | 2 +- ...athFraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../integrationService-0.0.1-SNAPSHOT.pom | 2 +- .../streamService-0.0.1-SNAPSHOT.pom | 2 +- 53 files changed, 289 insertions(+), 289 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8560ad2a71..eb9a16ae63 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ added after the original pull request but before a merge. you can import formatter settings using the `eclipse-code-formatter.xml` file from the [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the - [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file. + [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. @@ -40,6 +40,6 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), +* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/.gitignore b/.gitignore index 5eed16c58b..5126211392 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ bin/ *.ear *.versionsBackup -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* *.class diff --git a/README.adoc b/README.adoc index 46633f445c..f9a204c4bf 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,7 @@ producers and consumers -- for both HTTP and message-based interactions. If you prefer to learn about the project by doing some tutorials, you can check out the workshops under -http://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. +https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. === Spring Cloud Contract Verifier @@ -222,7 +222,7 @@ Stub Runner` properties, as shown in the following example: ---- stubrunner: ids: 'com.example:http-server-dsl:+:stubs:8080' - repositoryRoot: http://repo.spring.io/libs-snapshot + repositoryRoot: https://repo.spring.io/libs-snapshot ---- Now you can annotate your test class with `@AutoConfigureStubRunner`. In the annotation, @@ -525,7 +525,7 @@ Runner` properties, as shown in the following example: ---- stubrunner: ids: 'com.example:http-server-dsl:+:stubs:8080' - repositoryRoot: http://repo.spring.io/libs-snapshot + repositoryRoot: https://repo.spring.io/libs-snapshot ---- Now you can annotate your test class with `@AutoConfigureStubRunner`. In the annotation, @@ -843,9 +843,9 @@ following section to your build: repositories { mavenCentral() mavenLocal() - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/release" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/release" } } ---- @@ -1424,7 +1424,7 @@ achieving the same thing by changing the properties. ---- stubrunner: ids: 'com.example:http-server-dsl:+:stubs:8080' - repositoryRoot: http://repo.spring.io/libs-snapshot + repositoryRoot: https://repo.spring.io/libs-snapshot ---- That's it! @@ -1450,7 +1450,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] ==== Readings -- http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] +- https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] - http://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] - http://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] - http://groovy-lang.org/json.html[Groovy docs regarding JSON] @@ -1674,7 +1674,7 @@ public class WiremockForDocsMockServerApplicationTests { public void contextLoads() throws Exception { // will read stubs classpath MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) - .baseUrl("http://example.org").stubs("classpath:/stubs/resource.json") + .baseUrl("https://example.org").stubs("classpath:/stubs/resource.json") .build(); // We're asserting if WireMock responded properly assertThat(this.service.go()).isEqualTo("Hello World"); @@ -1686,7 +1686,7 @@ public class WiremockForDocsMockServerApplicationTests { The `baseUrl` value is prepended to all mock calls, and the `stubs()` method takes a stub path resource pattern as an argument. In the preceding example, the stub defined at `/stubs/resource.json` is loaded into the mock server. If the `RestTemplate` is asked to -visit `http://example.org/`, it gets the responses as being declared at that URL. More +visit `https://example.org/`, it gets the responses as being declared at that URL. More than one stub pattern can be specified, and each one can be a directory (for a recursive list of all ".json"), a fixed filename (as in the example above), or an Ant-style pattern. The JSON format is the normal WireMock format, which you can read about in the @@ -1978,7 +1978,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -1991,7 +1991,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/asciidoctor.css b/asciidoctor.css index 06d52e688a..58c68541c9 100644 --- a/asciidoctor.css +++ b/asciidoctor.css @@ -1,4 +1,4 @@ -/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */ +/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ /* Remove the comments around the @import statement below when using this as a custom stylesheet */ /*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/ article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block} diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 554865b748..8cec3c1f4f 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -17,7 +17,7 @@ producers and consumers -- for both HTTP and message-based interactions. If you prefer to learn about the project by doing some tutorials, you can check out the workshops under -http://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. +https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. === Spring Cloud Contract Verifier diff --git a/docs/src/main/asciidoc/migrations.adoc b/docs/src/main/asciidoc/migrations.adoc index a93194bee9..643532fdf9 100644 --- a/docs/src/main/asciidoc/migrations.adoc +++ b/docs/src/main/asciidoc/migrations.adoc @@ -82,7 +82,7 @@ structure presented in the previous snippet. + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> stubs jar diff --git a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc index dfbdc11f23..5b9a96c60d 100644 --- a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc +++ b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc @@ -160,7 +160,7 @@ include::{doc_samples}/src/test/java/com/example/WiremockForDocsMockServerApplic The `baseUrl` value is prepended to all mock calls, and the `stubs()` method takes a stub path resource pattern as an argument. In the preceding example, the stub defined at `/stubs/resource.json` is loaded into the mock server. If the `RestTemplate` is asked to -visit `http://example.org/`, it gets the responses as being declared at that URL. More +visit `https://example.org/`, it gets the responses as being declared at that URL. More than one stub pattern can be specified, and each one can be a directory (for a recursive list of all ".json"), a fixed filename (as in the example above), or an Ant-style pattern. The JSON format is the normal WireMock format, which you can read about in the diff --git a/docs/src/main/asciidoc/verifier_contract.adoc b/docs/src/main/asciidoc/verifier_contract.adoc index 4281c37cb9..bfb66b59d2 100644 --- a/docs/src/main/asciidoc/verifier_contract.adoc +++ b/docs/src/main/asciidoc/verifier_contract.adoc @@ -592,7 +592,7 @@ given name. matches the JSON Path. If you're using the YAML contract definition you have to use the -http://handlebarsjs.com/[Handlebars] `{{{ }}}` notation with custom, Spring Cloud Contract +https://handlebarsjs.com/[Handlebars] `{{{ }}}` notation with custom, Spring Cloud Contract functions to achieve this. * `{{{ request.url }}}`: Returns the request URL and query parameters. diff --git a/docs/src/main/asciidoc/verifier_faq.adoc b/docs/src/main/asciidoc/verifier_faq.adoc index 10a5ccc3ae..ae2f7a13f6 100644 --- a/docs/src/main/asciidoc/verifier_faq.adoc +++ b/docs/src/main/asciidoc/verifier_faq.adoc @@ -316,7 +316,7 @@ When the *consumer* wants to work on the contracts offline, instead of cloning t consumer team clones the common repository, goes to the required producer's folder (e.g. `com/example/server`) and runs `mvn clean install -DskipTests` to install locally the stubs converted from the contracts. -TIP: You need to have http://maven.apache.org/download.cgi[Maven installed locally] +TIP: You need to have https://maven.apache.org/download.cgi[Maven installed locally] ==== Producer @@ -717,7 +717,7 @@ to find stub definitions and contracts. E.g. for `com.example:foo:1.0.0` the pat === Can I use the Pact Broker? -When using http://pact.io/[Pact] you can use the https://github.com/pact-foundation/pact_broker[Pact Broker] +When using https://pact.io/[Pact] you can use the https://github.com/pact-foundation/pact_broker[Pact Broker] to store and share Pact definitions. Starting from Spring Cloud Contract 2.0.0 one can fetch Pact files from the Pact Broker to generate tests and stubs. diff --git a/docs/src/main/asciidoc/verifier_introduction.adoc b/docs/src/main/asciidoc/verifier_introduction.adoc index e48f8fb619..e239089440 100644 --- a/docs/src/main/asciidoc/verifier_introduction.adoc +++ b/docs/src/main/asciidoc/verifier_introduction.adoc @@ -1012,7 +1012,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] ==== Readings -- http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] +- https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] - http://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] - http://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] - http://groovy-lang.org/json.html[Groovy docs regarding JSON] diff --git a/docs/src/main/asciidoc/verifier_setup.adoc b/docs/src/main/asciidoc/verifier_setup.adoc index 96839b406d..8c077a4e7a 100644 --- a/docs/src/main/asciidoc/verifier_setup.adoc +++ b/docs/src/main/asciidoc/verifier_setup.adoc @@ -33,7 +33,7 @@ In order to use Spring Cloud Contract Verifier with WireMock, you muse use eithe Gradle or a Maven plugin. WARNING: If you want to use Spock in your projects, you must add separately the -`spock-core` and `spock-spring` modules. Check http://spockframework.github.io/[Spock +`spock-core` and `spock-spring` modules. Check https://spockframework.github.io/[Spock docs for more information] [[gradle-add-gradle-plugin]] @@ -1041,7 +1041,7 @@ like them to be available for others to download / reference or reuse. In case of the JVM world those artifacts would be JARs, for Ruby these are gems and for Docker those would be Docker images. You can store those artifacts in a manager. Examples of such managers can be https://jfrog.com/artifactory/[Artifactory] -or http://www.sonatype.org/nexus/[Nexus]. +or https://www.sonatype.org/nexus/[Nexus]. ==== How it works diff --git a/ideas.md b/ideas.md index c68c4a5cae..9d3aa2b7f5 100644 --- a/ideas.md +++ b/ideas.md @@ -13,5 +13,5 @@ Feature ideas: - [x] `DiscoveryClient` support so backends can be stubbed or mocked transparently (declaratively) - [ ] Actuator endpoints that verify the state of contracts supported by the host service - [x] Something to make PACT easier to use in Spring Boot apps? -- [ ] Support [Citrus](http://www.citrusframework.org/) users (somehow?) +- [ ] Support [Citrus](https://citrusframework.org/) users (somehow?) - [x] Schema registries for binary formats like protobuf, thrift, avro - Stream does it diff --git a/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml b/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml index 0fe0e54c25..512cbc68e7 100644 --- a/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml +++ b/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml @@ -1,3 +1,3 @@ stubrunner: ids: 'com.example:http-server-dsl:+:stubs:8080' - repositoryRoot: http://repo.spring.io/libs-snapshot + repositoryRoot: https://repo.spring.io/libs-snapshot diff --git a/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java index 0608f2f338..7224e3b5b0 100644 --- a/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java @@ -41,7 +41,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; private final RestTemplate restTemplate; diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java index ff698af3a0..880ed248fa 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java @@ -27,7 +27,7 @@ public class WiremockForDocsMockServerApplicationTests { public void contextLoads() throws Exception { // will read stubs classpath MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) - .baseUrl("http://example.org").stubs("classpath:/stubs/resource.json") + .baseUrl("https://example.org").stubs("classpath:/stubs/resource.json") .build(); // We're asserting if WireMock responded properly assertThat(this.service.go()).isEqualTo("Hello World"); diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java index f06509d3da..677cab677c 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java @@ -25,7 +25,7 @@ public class WiremockMockServerApplicationTests { @Test public void contextLoads() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/stubs/resource.json").build(); assertThat(this.service.go()).isEqualTo("Hello World"); server.verify(); diff --git a/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java index fa59698f17..9c49693716 100644 --- a/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java @@ -40,7 +40,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; private final RestTemplate restTemplate; diff --git a/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java index 926417a038..3dd41b4762 100644 --- a/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java @@ -41,7 +41,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; private final RestTemplate restTemplate; diff --git a/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java b/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java index c719a6de49..7c4bd0ddc8 100644 --- a/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java +++ b/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java @@ -25,7 +25,7 @@ public class WiremockMockServerApplicationTests { @Test public void contextLoads() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/stubs/**/*.json").build(); assertThat(this.service.go()).isEqualTo("Hello World"); server.verify(); diff --git a/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java index fa59698f17..9c49693716 100644 --- a/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java @@ -40,7 +40,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; private final RestTemplate restTemplate; diff --git a/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java index fa59698f17..9c49693716 100644 --- a/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java @@ -40,7 +40,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; private final RestTemplate restTemplate; diff --git a/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java b/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java index 3cc15b627d..ddf2a8d0e0 100644 --- a/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java +++ b/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java @@ -25,7 +25,7 @@ public class WiremockMockServerApplicationTests { @Test public void contextLoads() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/stubs").build(); assertThat(this.service.go()).isEqualTo("Hello World"); server.verify(); diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy index dfed48b49d..13d7abad71 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy @@ -17,119 +17,119 @@ class HttpHeaders { /** * The HTTP {@code Accept} header field name. - * @see Section 5.3.2 of RFC 7231 + * @see Section 5.3.2 of RFC 7231 */ String accept() { return "Accept" } /** * The HTTP {@code Accept-Charset} header field name. - * @see Section 5.3.3 of RFC 7231 + * @see Section 5.3.3 of RFC 7231 */ String acceptCharset() { return "Accept-Charset" } /** * The HTTP {@code Accept-Encoding} header field name. - * @see Section 5.3.4 of RFC 7231 + * @see Section 5.3.4 of RFC 7231 */ String acceptEncoding() { return "Accept-Encoding" } /** * The HTTP {@code Accept-Language} header field name. - * @see Section 5.3.5 of RFC 7231 + * @see Section 5.3.5 of RFC 7231 */ String acceptLanguage() { return "Accept-Language" } /** * The HTTP {@code Accept-Ranges} header field name. - * @see Section 5.3.5 of RFC 7233 + * @see Section 5.3.5 of RFC 7233 */ String acceptRanges() { return "Accept-Ranges" } /** * The CORS {@code Access-Control-Allow-Credentials} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowCredentials() { return "Access-Control-Allow-Credentials" } /** * The CORS {@code Access-Control-Allow-Headers} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowHeaders() { return "Access-Control-Allow-Headers" } /** * The CORS {@code Access-Control-Allow-Methods} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowMethods() { return "Access-Control-Allow-Methods" } /** * The CORS {@code Access-Control-Allow-Origin} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowOrigin() { return "Access-Control-Allow-Origin" } /** * The CORS {@code Access-Control-Expose-Headers} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlExposeHeaders() { return "Access-Control-Expose-Headers" } /** * The CORS {@code Access-Control-Max-Age} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlMaxAge() { return "Access-Control-Max-Age" } /** * The CORS {@code Access-Control-Request-Headers} request header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlRequestHeaders() { return "Access-Control-Request-Headers" } /** * The CORS {@code Access-Control-Request-Method} request header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlRequestMethod() { return "Access-Control-Request-Method" } /** * The HTTP {@code Age} header field name. - * @see Section 5.1 of RFC 7234 + * @see Section 5.1 of RFC 7234 */ String age() { return "Age" } /** * The HTTP {@code Allow} header field name. - * @see Section 7.4.1 of RFC 7231 + * @see Section 7.4.1 of RFC 7231 */ String allow() { return "Allow" } /** * The HTTP {@code Authorization} header field name. - * @see Section 4.2 of RFC 7235 + * @see Section 4.2 of RFC 7235 */ String authorization() { return "Authorization" } /** * The HTTP {@code Cache-Control} header field name. - * @see Section 5.2 of RFC 7234 + * @see Section 5.2 of RFC 7234 */ String cacheControl() { return "Cache-Control" @@ -137,7 +137,7 @@ class HttpHeaders { /** * The HTTP {@code Connection} header field name. - * @see Section 6.1 of RFC 7230 + * @see Section 6.1 of RFC 7230 */ String connection() { return "Connection" @@ -145,7 +145,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Encoding} header field name. - * @see Section 3.1.2.2 of RFC 7231 + * @see Section 3.1.2.2 of RFC 7231 */ String contentEncoding() { return "Content-Encoding" @@ -153,7 +153,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Disposition} header field name - * @see RFC 6266 + * @see RFC 6266 */ String contentDisposition() { return "Content-Disposition" @@ -161,7 +161,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Language} header field name. - * @see Section 3.1.3.2 of RFC 7231 + * @see Section 3.1.3.2 of RFC 7231 */ String contentLanguage() { return "Content-Language" @@ -169,7 +169,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Length} header field name. - * @see Section 3.3.2 of RFC 7230 + * @see Section 3.3.2 of RFC 7230 */ String contentLength() { return "Content-Length" @@ -177,7 +177,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Location} header field name. - * @see Section 3.1.4.2 of RFC 7231 + * @see Section 3.1.4.2 of RFC 7231 */ String contentLocation() { return "Content-Location" @@ -185,7 +185,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Range} header field name. - * @see Section 4.2 of RFC 7233 + * @see Section 4.2 of RFC 7233 */ String contentRange() { return "Content-Range" @@ -193,7 +193,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Type} header field name. - * @see Section 3.1.1.5 of RFC 7231 + * @see Section 3.1.1.5 of RFC 7231 */ String contentType() { return "Content-Type" @@ -201,7 +201,7 @@ class HttpHeaders { /** * The HTTP {@code Cookie} header field name. - * @see Section 4.3.4 of RFC 2109 + * @see Section 4.3.4 of RFC 2109 */ String cookie() { return "Cookie" @@ -209,7 +209,7 @@ class HttpHeaders { /** * The HTTP {@code Date} header field name. - * @see Section 7.1.1.2 of RFC 7231 + * @see Section 7.1.1.2 of RFC 7231 */ String date() { return "Date" @@ -217,7 +217,7 @@ class HttpHeaders { /** * The HTTP {@code ETag} header field name. - * @see Section 2.3 of RFC 7232 + * @see Section 2.3 of RFC 7232 */ String etag() { return "ETag" @@ -225,7 +225,7 @@ class HttpHeaders { /** * The HTTP {@code Expect} header field name. - * @see Section 5.1.1 of RFC 7231 + * @see Section 5.1.1 of RFC 7231 */ String expect() { return "Expect" @@ -233,7 +233,7 @@ class HttpHeaders { /** * The HTTP {@code Expires} header field name. - * @see Section 5.3 of RFC 7234 + * @see Section 5.3 of RFC 7234 */ String expires() { return "Expires" @@ -241,7 +241,7 @@ class HttpHeaders { /** * The HTTP {@code From} header field name. - * @see Section 5.5.1 of RFC 7231 + * @see Section 5.5.1 of RFC 7231 */ String from() { return "From" @@ -249,7 +249,7 @@ class HttpHeaders { /** * The HTTP {@code Host} header field name. - * @see Section 5.4 of RFC 7230 + * @see Section 5.4 of RFC 7230 */ String host() { return "Host" @@ -257,7 +257,7 @@ class HttpHeaders { /** * The HTTP {@code If-Match} header field name. - * @see Section 3.1 of RFC 7232 + * @see Section 3.1 of RFC 7232 */ String ifMatch() { return "If-Match" @@ -265,7 +265,7 @@ class HttpHeaders { /** * The HTTP {@code If-Modified-Since} header field name. - * @see Section 3.3 of RFC 7232 + * @see Section 3.3 of RFC 7232 */ String ifModifiedSince() { return "If-Modified-Since" @@ -273,7 +273,7 @@ class HttpHeaders { /** * The HTTP {@code If-None-Match} header field name. - * @see Section 3.2 of RFC 7232 + * @see Section 3.2 of RFC 7232 */ String ifNoneMatch() { return "If-None-Match" @@ -281,7 +281,7 @@ class HttpHeaders { /** * The HTTP {@code If-Range} header field name. - * @see Section 3.2 of RFC 7233 + * @see Section 3.2 of RFC 7233 */ String ifRange() { return "If-Range" @@ -289,7 +289,7 @@ class HttpHeaders { /** * The HTTP {@code If-Unmodified-Since} header field name. - * @see Section 3.4 of RFC 7232 + * @see Section 3.4 of RFC 7232 */ String ifUnmodifiedSince() { return "If-Unmodified-Since" @@ -297,7 +297,7 @@ class HttpHeaders { /** * The HTTP {@code Last-Modified} header field name. - * @see Section 2.2 of RFC 7232 + * @see Section 2.2 of RFC 7232 */ String lastModified() { return "Last-Modified" @@ -305,7 +305,7 @@ class HttpHeaders { /** * The HTTP {@code Link} header field name. - * @see RFC 5988 + * @see RFC 5988 */ String link() { return "Link" @@ -313,7 +313,7 @@ class HttpHeaders { /** * The HTTP {@code Location} header field name. - * @see Section 7.1.2 of RFC 7231 + * @see Section 7.1.2 of RFC 7231 */ String location() { return "Location" @@ -321,14 +321,14 @@ class HttpHeaders { /** * The HTTP {@code Max-Forwards} header field name. - * @see Section 5.1.2 of RFC 7231 + * @see Section 5.1.2 of RFC 7231 */ String max_forwards() { return "Max-Forwards" } /** * The HTTP {@code Origin} header field name. - * @see RFC 6454 + * @see RFC 6454 */ String origin() { return "Origin" @@ -336,7 +336,7 @@ class HttpHeaders { /** * The HTTP {@code Pragma} header field name. - * @see Section 5.4 of RFC 7234 + * @see Section 5.4 of RFC 7234 */ String pragma() { return "Pragma" @@ -344,7 +344,7 @@ class HttpHeaders { /** * The HTTP {@code Proxy-Authenticate} header field name. - * @see Section 4.3 of RFC 7235 + * @see Section 4.3 of RFC 7235 */ String proxyAuthenticate() { return "Proxy-Authenticate" @@ -352,7 +352,7 @@ class HttpHeaders { /** * The HTTP {@code Proxy-Authorization} header field name. - * @see Section 4.4 of RFC 7235 + * @see Section 4.4 of RFC 7235 */ String proxyAuthorization() { return "Proxy-Authorization" @@ -360,7 +360,7 @@ class HttpHeaders { /** * The HTTP {@code Range} header field name. - * @see Section 3.1 of RFC 7233 + * @see Section 3.1 of RFC 7233 */ String range() { return "Range" @@ -368,7 +368,7 @@ class HttpHeaders { /** * The HTTP {@code Referer} header field name. - * @see Section 5.5.2 of RFC 7231 + * @see Section 5.5.2 of RFC 7231 */ String referer() { return "Referer" @@ -376,7 +376,7 @@ class HttpHeaders { /** * The HTTP {@code Retry-After} header field name. - * @see Section 7.1.3 of RFC 7231 + * @see Section 7.1.3 of RFC 7231 */ String retryAfter() { return "Retry-After" @@ -384,7 +384,7 @@ class HttpHeaders { /** * The HTTP {@code Server} header field name. - * @see Section 7.4.2 of RFC 7231 + * @see Section 7.4.2 of RFC 7231 */ String server() { return "Server" @@ -392,7 +392,7 @@ class HttpHeaders { /** * The HTTP {@code Set-Cookie} header field name. - * @see Section 4.2.2 of RFC 2109 + * @see Section 4.2.2 of RFC 2109 */ String setCookie() { return "Set-Cookie" @@ -400,7 +400,7 @@ class HttpHeaders { /** * The HTTP {@code Set-Cookie2} header field name. - * @see RFC 2965 + * @see RFC 2965 */ String setCookie2() { return "Set-Cookie2" @@ -408,7 +408,7 @@ class HttpHeaders { /** * The HTTP {@code TE} header field name. - * @see Section 4.3 of RFC 7230 + * @see Section 4.3 of RFC 7230 */ String te() { return "TE" @@ -416,7 +416,7 @@ class HttpHeaders { /** * The HTTP {@code Trailer} header field name. - * @see Section 4.4 of RFC 7230 + * @see Section 4.4 of RFC 7230 */ String trailer() { return "Trailer" @@ -424,7 +424,7 @@ class HttpHeaders { /** * The HTTP {@code Transfer-Encoding} header field name. - * @see Section 3.3.1 of RFC 7230 + * @see Section 3.3.1 of RFC 7230 */ String transferEncoding() { return "Transfer-Encoding" @@ -432,7 +432,7 @@ class HttpHeaders { /** * The HTTP {@code Upgrade} header field name. - * @see Section 6.7 of RFC 7230 + * @see Section 6.7 of RFC 7230 */ String upgrade() { return "Upgrade" @@ -440,7 +440,7 @@ class HttpHeaders { /** * The HTTP {@code User-Agent} header field name. - * @see Section 5.5.3 of RFC 7231 + * @see Section 5.5.3 of RFC 7231 */ String user_agent() { return "User-Agent" @@ -448,7 +448,7 @@ class HttpHeaders { /** * The HTTP {@code Vary} header field name. - * @see Section 7.1.4 of RFC 7231 + * @see Section 7.1.4 of RFC 7231 */ String vary() { return "Vary" @@ -456,7 +456,7 @@ class HttpHeaders { /** * The HTTP {@code Via} header field name. - * @see Section 5.7.1 of RFC 7230 + * @see Section 5.7.1 of RFC 7230 */ String via() { return "Via" @@ -464,7 +464,7 @@ class HttpHeaders { /** * The HTTP {@code Warning} header field name. - * @see Section 5.5 of RFC 7234 + * @see Section 5.5 of RFC 7234 */ String warning() { return "Warning" @@ -472,7 +472,7 @@ class HttpHeaders { /** * The HTTP {@code WWW-Authenticate} header field name. - * @see Section 4.1 of RFC 7235 + * @see Section 4.1 of RFC 7235 */ String wwwAuthenticate() { return "WWW-Authenticate" diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy index 2dbea33264..7fd967104b 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy @@ -17,7 +17,7 @@ class HttpStatus { /** * {@code 100 Continue}. - * @see HTTP/1.1: Semantics and Content, section 6.2.1 + * @see HTTP/1.1: Semantics and Content, section 6.2.1 */ int CONTINUE() { return 100 @@ -25,19 +25,19 @@ class HttpStatus { /** * {@code 101 Switching Protocols}. - * @see HTTP/1.1: Semantics and Content, section 6.2.2 + * @see HTTP/1.1: Semantics and Content, section 6.2.2 */ int SWITCHING_PROTOCOLS() { return 101 } /** * {@code 102 Processing}. - * @see WebDAV + * @see WebDAV */ int PROCESSING() { return 102 } /** * {@code 103 Checkpoint}. - * @see A proposal for supporting + * @see A proposal for supporting * resumable POST/PUT HTTP requests in HTTP/1.0 */ int CHECKPOINT() { return 103 } @@ -46,52 +46,52 @@ class HttpStatus { /** * {@code 200 OK}. - * @see HTTP/1.1: Semantics and Content, section 6.3.1 + * @see HTTP/1.1: Semantics and Content, section 6.3.1 */ int OK() { return 200 } /** * {@code 201 Created}. - * @see HTTP/1.1: Semantics and Content, section 6.3.2 + * @see HTTP/1.1: Semantics and Content, section 6.3.2 */ int CREATED() { return 201 } /** * {@code 202 Accepted}. - * @see HTTP/1.1: Semantics and Content, section 6.3.3 + * @see HTTP/1.1: Semantics and Content, section 6.3.3 */ int ACCEPTED() { return 202 } /** * {@code 203 Non-Authoritative Information}. - * @see HTTP/1.1: Semantics and Content, section 6.3.4 + * @see HTTP/1.1: Semantics and Content, section 6.3.4 */ int NON_AUTHORITATIVE_INFORMATION() { return 203 } /** * {@code 204 No Content}. - * @see HTTP/1.1: Semantics and Content, section 6.3.5 + * @see HTTP/1.1: Semantics and Content, section 6.3.5 */ int NO_CONTENT() { return 204 } /** * {@code 205 Reset Content}. - * @see HTTP/1.1: Semantics and Content, section 6.3.6 + * @see HTTP/1.1: Semantics and Content, section 6.3.6 */ int RESET_CONTENT() { return 205 } /** * {@code 206 Partial Content}. - * @see HTTP/1.1: Range Requests, section 4.1 + * @see HTTP/1.1: Range Requests, section 4.1 */ int PARTIAL_CONTENT() { return 206 } /** * {@code 207 Multi-Status}. - * @see WebDAV + * @see WebDAV */ int MULTI_STATUS() { return 207 } /** * {@code 208 Already Reported}. - * @see WebDAV Binding Extensions + * @see WebDAV Binding Extensions */ int ALREADY_REPORTED() { return 208 } /** * {@code 226 IM Used}. - * @see Delta encoding in HTTP + * @see Delta encoding in HTTP */ int IM_USED() { return 226 } @@ -99,51 +99,51 @@ class HttpStatus { /** * {@code 300 Multiple Choices}. - * @see HTTP/1.1: Semantics and Content, section 6.4.1 + * @see HTTP/1.1: Semantics and Content, section 6.4.1 */ int MULTIPLE_CHOICES() { return 300 } /** * {@code 301 Moved Permanently}. - * @see HTTP/1.1: Semantics and Content, section 6.4.2 + * @see HTTP/1.1: Semantics and Content, section 6.4.2 */ int MOVED_PERMANENTLY() { return 301 } /** * {@code 302 Found}. - * @see HTTP/1.1: Semantics and Content, section 6.4.3 + * @see HTTP/1.1: Semantics and Content, section 6.4.3 */ int FOUND() { return 302 } /** * {@code 302 Moved Temporarily}. - * @see HTTP/1.0, section 9.3 + * @see HTTP/1.0, section 9.3 * @deprecated in favor of {@link #FOUND} which will be returned from {@code HttpStatus.valueOf(302)} */ @Deprecated int MOVED_TEMPORARILY() { return 302 } /** * {@code 303 See Other}. - * @see HTTP/1.1: Semantics and Content, section 6.4.4 + * @see HTTP/1.1: Semantics and Content, section 6.4.4 */ int SEE_OTHER() { return 303 } /** * {@code 304 Not Modified}. - * @see HTTP/1.1: Conditional Requests, section 4.1 + * @see HTTP/1.1: Conditional Requests, section 4.1 */ int NOT_MODIFIED() { return 304 } /** * {@code 305 Use Proxy}. - * @see HTTP/1.1: Semantics and Content, section 6.4.5 + * @see HTTP/1.1: Semantics and Content, section 6.4.5 * @deprecated due to security concerns regarding in-band configuration of a proxy */ @Deprecated int USE_PROXY() { return 305 } /** * {@code 307 Temporary Redirect}. - * @see HTTP/1.1: Semantics and Content, section 6.4.7 + * @see HTTP/1.1: Semantics and Content, section 6.4.7 */ int TEMPORARY_REDIRECT() { return 307 } /** * {@code 308 Permanent Redirect}. - * @see RFC 7238 + * @see RFC 7238 */ int PERMANENT_REDIRECT() { return 308 } @@ -151,78 +151,78 @@ class HttpStatus { /** * {@code 400 Bad Request}. - * @see HTTP/1.1: Semantics and Content, section 6.5.1 + * @see HTTP/1.1: Semantics and Content, section 6.5.1 */ int BAD_REQUEST() { return 400 } /** * {@code 401 Unauthorized}. - * @see HTTP/1.1: Authentication, section 3.1 + * @see HTTP/1.1: Authentication, section 3.1 */ int UNAUTHORIZED() { return 401 } /** * {@code 402 Payment Required}. - * @see HTTP/1.1: Semantics and Content, section 6.5.2 + * @see HTTP/1.1: Semantics and Content, section 6.5.2 */ int PAYMENT_REQUIRED() { return 402 } /** * {@code 403 Forbidden}. - * @see HTTP/1.1: Semantics and Content, section 6.5.3 + * @see HTTP/1.1: Semantics and Content, section 6.5.3 */ int FORBIDDEN() { return 403 } /** * {@code 404 Not Found}. - * @see HTTP/1.1: Semantics and Content, section 6.5.4 + * @see HTTP/1.1: Semantics and Content, section 6.5.4 */ int NOT_FOUND() { return 404 } /** * {@code 405 Method Not Allowed}. - * @see HTTP/1.1: Semantics and Content, section 6.5.5 + * @see HTTP/1.1: Semantics and Content, section 6.5.5 */ int METHOD_NOT_ALLOWED() { return 405 } /** * {@code 406 Not Acceptable}. - * @see HTTP/1.1: Semantics and Content, section 6.5.6 + * @see HTTP/1.1: Semantics and Content, section 6.5.6 */ int NOT_ACCEPTABLE() { return 406 } /** * {@code 407 Proxy Authentication Required}. - * @see HTTP/1.1: Authentication, section 3.2 + * @see HTTP/1.1: Authentication, section 3.2 */ int PROXY_AUTHENTICATION_REQUIRED() { return 407 } /** * {@code 408 Request Timeout}. - * @see HTTP/1.1: Semantics and Content, section 6.5.7 + * @see HTTP/1.1: Semantics and Content, section 6.5.7 */ int REQUEST_TIMEOUT() { return 408 } /** * {@code 409 Conflict}. - * @see HTTP/1.1: Semantics and Content, section 6.5.8 + * @see HTTP/1.1: Semantics and Content, section 6.5.8 */ int CONFLICT() { return 409 } /** * {@code 410 Gone}. - * @see HTTP/1.1: Semantics and Content, section 6.5.9 + * @see HTTP/1.1: Semantics and Content, section 6.5.9 */ int GONE() { return 410 } /** * {@code 411 Length Required}. - * @see HTTP/1.1: Semantics and Content, section 6.5.10 + * @see HTTP/1.1: Semantics and Content, section 6.5.10 */ int LENGTH_REQUIRED() { return 411 } /** * {@code 412 Precondition failed}. - * @see HTTP/1.1: Conditional Requests, section 4.2 + * @see HTTP/1.1: Conditional Requests, section 4.2 */ int PRECONDITION_FAILED() { return 412 } /** * {@code 413 Payload Too Large}. * @since 4.1 - * @see HTTP/1.1: Semantics and Content, section 6.5.11 + * @see HTTP/1.1: Semantics and Content, section 6.5.11 */ int PAYLOAD_TOO_LARGE() { return 413 } /** * {@code 413 Request Entity Too Large}. - * @see HTTP/1.1, section 10.4.14 + * @see HTTP/1.1, section 10.4.14 * @deprecated in favor of {@link #PAYLOAD_TOO_LARGE} which will be returned from {@code HttpStatus.valueOf(413)} */ @Deprecated @@ -230,84 +230,84 @@ class HttpStatus { /** * {@code 414 URI Too Long}. * @since 4.1 - * @see HTTP/1.1: Semantics and Content, section 6.5.12 + * @see HTTP/1.1: Semantics and Content, section 6.5.12 */ int URI_TOO_LONG() { return 414 } /** * {@code 414 Request-URI Too Long}. - * @see HTTP/1.1, section 10.4.15 + * @see HTTP/1.1, section 10.4.15 * @deprecated in favor of {@link #URI_TOO_LONG} which will be returned from {@code HttpStatus.valueOf(414)} */ @Deprecated int REQUEST_URI_TOO_LONG() { return 414 } /** * {@code 415 Unsupported Media Type}. - * @see HTTP/1.1: Semantics and Content, section 6.5.13 + * @see HTTP/1.1: Semantics and Content, section 6.5.13 */ int UNSUPPORTED_MEDIA_TYPE() { return 415 } /** * {@code 416 Requested Range Not Satisfiable}. - * @see HTTP/1.1: Range Requests, section 4.4 + * @see HTTP/1.1: Range Requests, section 4.4 */ int REQUESTED_RANGE_NOT_SATISFIABLE() { return 416 } /** * {@code 417 Expectation Failed}. - * @see HTTP/1.1: Semantics and Content, section 6.5.14 + * @see HTTP/1.1: Semantics and Content, section 6.5.14 */ int EXPECTATION_FAILED() { return 417 } /** * {@code 418 I'm a teapot}. - * @see HTCPCP/1.0 + * @see HTCPCP/1.0 */ int I_AM_A_TEAPOT() { return 418 } /** - * @deprecated See WebDAV Draft Changes + * @deprecated See WebDAV Draft Changes */ @Deprecated int INSUFFICIENT_SPACE_ON_RESOURCE() { return 419 } /** - * @deprecated See WebDAV Draft Changes + * @deprecated See WebDAV Draft Changes */ @Deprecated int METHOD_FAILURE() { return 420 } /** - * @deprecated See WebDAV Draft Changes + * @deprecated See WebDAV Draft Changes */ @Deprecated int DESTINATION_LOCKED() { return 421 } /** * {@code 422 Unprocessable Entity}. - * @see WebDAV + * @see WebDAV */ int UNPROCESSABLE_ENTITY() { return 422 } /** * {@code 423 Locked}. - * @see WebDAV + * @see WebDAV */ int LOCKED() { return 423 } /** * {@code 424 Failed Dependency}. - * @see WebDAV + * @see WebDAV */ int FAILED_DEPENDENCY() { return 424 } /** * {@code 426 Upgrade Required}. - * @see Upgrading to TLS Within HTTP/1.1 + * @see Upgrading to TLS Within HTTP/1.1 */ int UPGRADE_REQUIRED() { return 426 } /** * {@code 428 Precondition Required}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int PRECONDITION_REQUIRED() { return 428 } /** * {@code 429 Too Many Requests}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int TOO_MANY_REQUESTS() { return 429 } /** * {@code 431 Request Header Fields Too Large}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int REQUEST_HEADER_FIELDS_TOO_LARGE() { return 431 } /** @@ -322,47 +322,47 @@ class HttpStatus { /** * {@code 500 Internal Server Error}. - * @see HTTP/1.1: Semantics and Content, section 6.6.1 + * @see HTTP/1.1: Semantics and Content, section 6.6.1 */ int INTERNAL_SERVER_ERROR() { return 500 } /** * {@code 501 Not Implemented}. - * @see HTTP/1.1: Semantics and Content, section 6.6.2 + * @see HTTP/1.1: Semantics and Content, section 6.6.2 */ int NOT_IMPLEMENTED() { return 501 } /** * {@code 502 Bad Gateway}. - * @see HTTP/1.1: Semantics and Content, section 6.6.3 + * @see HTTP/1.1: Semantics and Content, section 6.6.3 */ int BAD_GATEWAY() { return 502 } /** * {@code 503 Service Unavailable}. - * @see HTTP/1.1: Semantics and Content, section 6.6.4 + * @see HTTP/1.1: Semantics and Content, section 6.6.4 */ int SERVICE_UNAVAILABLE() { return 503 } /** * {@code 504 Gateway Timeout}. - * @see HTTP/1.1: Semantics and Content, section 6.6.5 + * @see HTTP/1.1: Semantics and Content, section 6.6.5 */ int GATEWAY_TIMEOUT() { return 504 } /** * {@code 505 HTTP Version Not Supported}. - * @see HTTP/1.1: Semantics and Content, section 6.6.6 + * @see HTTP/1.1: Semantics and Content, section 6.6.6 */ int HTTP_VERSION_NOT_SUPPORTED() { return 505 } /** * {@code 506 Variant Also Negotiates} - * @see Transparent Content Negotiation + * @see Transparent Content Negotiation */ int VARIANT_ALSO_NEGOTIATES() { return 506 } /** * {@code 507 Insufficient Storage} - * @see WebDAV + * @see WebDAV */ int INSUFFICIENT_STORAGE() { return 507 } /** * {@code 508 Loop Detected} - * @see WebDAV Binding Extensions + * @see WebDAV Binding Extensions */ int LOOP_DETECTED() { return 508 } /** @@ -371,12 +371,12 @@ class HttpStatus { int BANDWIDTH_LIMIT_EXCEEDED() { return 509 } /** * {@code 510 Not Extended} - * @see HTTP Extension Framework + * @see HTTP Extension Framework */ int NOT_EXTENDED() { return 510 } /** * {@code 511 Network Authentication Required}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int NETWORK_AUTHENTICATION_REQUIRED() { return 511 } } diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy index 9f03095a1c..064b4cda14 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy @@ -180,7 +180,7 @@ class UrlHelper { // Examples: "fitbit.com", "22.231.113.64", "localhost" private static final String REGEX_HOST = "(?:" + - // @Author = http://www.regular-expressions.info/examples.html + // @Author = https://www.regular-expressions.info/examples.html // IP address "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" + "|" + diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy index 690160dd16..da2617523b 100644 --- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy +++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy @@ -54,59 +54,59 @@ class RegexPatternsSpec extends Specification { 'asdf@asdf.online' || true } - // @see http://formvalidation.io/validators/uri/ + // @see https://formvalidation.io/validators/uri/ def "should generate a regex for url [#textToMatch] that is a match [#shouldMatch]"() { expect: shouldMatch == regexPatterns.url().matcher(textToMatch).matches() where: textToMatch || shouldMatch 'ftp://asd.com:9090/asd/a?a=b' || true - 'http://foo.com/blah_blah' || true + 'http://www.foo.com/blah_blah' || true 'ftp://localhost/api' || true 'http://localhost:8080/api' || true - 'http://foo.com/blah_blah/' || true - 'http://foo.com/blah_blah_(wikipedia)' || true - 'http://foo.com/blah_blah_(wikipedia)_(again)' || true - 'http://www.example.com/wpstyle/?p=364' || true + 'http://www.foo.com/blah_blah/' || true + 'http://www.foo.com/blah_blah_(wikipedia)' || true + 'http://www.foo.com/blah_blah_(wikipedia)_(again)' || true + 'https://www.example.com/wpstyle/?p=364' || true 'https://www.example.com/foo/?bar=baz&inga=42&quux' || true 'http://✪df.ws/123' || true - 'http://userid:password@example.com:8080' || true - 'http://userid:password@example.com:8080/' || true - 'http://userid@example.com' || true - 'http://userid@example.com/' || true - 'http://userid@example.com:8080' || true - 'http://userid@example.com:8080/' || true - 'http://userid:password@example.com' || true - 'http://userid:password@example.com/' || true - 'http://142.42.1.1/' || true - 'http://142.42.1.1:8080/' || true + 'https://userid:password@example.com:8080' || true + 'https://userid:password@example.com:8080/' || true + 'https://userid@example.com' || true + 'https://userid@example.com/' || true + 'https://userid@example.com:8080' || true + 'https://userid@example.com:8080/' || true + 'https://userid:password@example.com' || true + 'https://userid:password@example.com/' || true + 'https://142.42.1.1/' || true + 'https://142.42.1.1:8080/' || true 'http://⌘.ws' || true 'http://⌘.ws/' || true - 'http://foo.com/blah_(wikipedia)#cite-1' || true - 'http://foo.com/blah_(wikipedia)_blah#cite-1' || true - 'http://foo.com/unicode_(✪)_in_parens' || true - 'http://foo.com/(something)?after=parens' || true + 'http://www.foo.com/blah_(wikipedia)#cite-1' || true + 'http://www.foo.com/blah_(wikipedia)_blah#cite-1' || true + 'http://www.foo.com/unicode_(✪)_in_parens' || true + 'http://www.foo.com/(something)?after=parens' || true 'http://☺.damowmow.com/' || true - 'http://code.google.com/events/#&product=browser' || true - 'http://j.mp' || true + 'https://code.google.com/events/#&product=browser' || true + 'https://j.mp' || true 'ftp://foo.bar/baz' || true - 'http://foo.bar/?q=Test%20URL-encoded%20stuff' || true + 'https://foo.bar/?q=Test%20URL-encoded%20stuff' || true 'http://1337.net' || true - 'http://a.b-c.de' || true - 'http://223.255.255.254' || true + 'https://a.b-c.de' || true + 'https://223.255.255.254' || true 'foo.com' || true 'a.b.' || false 'http://' || false 'http://.' || false 'http://..' || false - 'http://../' || false + 'https://../' || false 'http://?' || false 'http://??' || false 'http://??/' || false 'http://#' || false 'http://##' || false 'http://##/' || false - 'http://foo.bar?q=Spaces should be encoded' || false + 'https://foo.bar?q=Spaces should be encoded' || false '//' || false '//a' || false '///a' || false @@ -116,16 +116,16 @@ class RegexPatternsSpec extends Specification { 'h://test' || false 'http:// shouldfail.com' || false ':// should fail' || false - 'http://foo.bar/foo(bar)baz quux' || false - 'http://-error-.invalid/' || false - 'http://-a.b.co' || false - 'http://a.b-.co' || false - 'http://1.1.1.1.1' || false - 'http://123.123.123' || false + 'https://foo.bar/foo(bar)baz quux' || false + 'https://-error-.invalid/' || false + 'https://-a.b.co' || false + 'https://a.b-.co' || false + 'https://1.1.1.1.1' || false + 'https://123.123.123' || false 'http://3628126748' || false - 'http://.www.foo.bar/' || false - 'http://www.foo.bar./' || false - 'http://.www.foo.bar./' || false + 'https://.www.foo.bar/' || false + 'https://www.foo.bar./' || false + 'https://.www.foo.bar./' || false } def "should generate a regex for httpsUrl [#textToMatch] that is a match [#shouldMatch]"() { @@ -136,8 +136,8 @@ class RegexPatternsSpec extends Specification { 'ftp://asd.com:9090/asd/a?a=b' || false 'https://foo.com/blah_blah/' || true 'https://foo.com/blah_blah' || true - 'http://foo.com/blah_blah' || false - 'http://foo.com/blah_blah/' || false + 'http://www.foo.com/blah_blah' || false + 'http://www.foo.com/blah_blah/' || false 'https://foo.com/blah_blah_(wikipedia)' || true 'https://foo.com/blah_blah_(wikipedia)_(again)' || true 'https://www.example.com/wpstyle/?p=364' || true diff --git a/spring-cloud-contract-stub-runner/README.adoc b/spring-cloud-contract-stub-runner/README.adoc index cbd8e6ad91..9990a82b0c 100644 --- a/spring-cloud-contract-stub-runner/README.adoc +++ b/spring-cloud-contract-stub-runner/README.adoc @@ -4,7 +4,7 @@ === Stub Runner Core Runs stubs for service collaborators. Treating stubs as contracts of services allows to use stub-runner as an implementation of -http://martinfowler.com/articles/consumerDrivenContracts.html[Consumer Driven Contracts]. +https://martinfowler.com/articles/consumerDrivenContracts.html[Consumer Driven Contracts]. Stub Runner allows you to automatically download the stubs of the provided dependencies (or pick those from the classpath), start WireMock servers for them and feed them with proper stub definitions. For messaging, special stub routes are defined. @@ -32,7 +32,7 @@ Example: [source,java] ---- -@AutoConfigureStubRunner(repositoryRoot="http://foo.bar", ids = "com.example:beer-api-producer:+:stubs:8095", stubsMode = StubRunnerProperties.StubsMode.LOCAL) +@AutoConfigureStubRunner(repositoryRoot="https://foo.bar", ids = "com.example:beer-api-producer:+:stubs:8095", stubsMode = StubRunnerProperties.StubsMode.LOCAL) ---- ===== Classpath scanning @@ -500,7 +500,7 @@ $ java -jar stub-runner.jar --stubrunner.ids=... --stubrunner.repositoryRoot=... ===== Spring Cloud CLI -Starting from `1.4.0.RELEASE` version of the http://cloud.spring.io/spring-cloud-cli[Spring Cloud CLI] +Starting from `1.4.0.RELEASE` version of the https://cloud.spring.io/spring-cloud-cli[Spring Cloud CLI] project you can start Stub Runner Boot by executing `spring cloud stubrunner`. In order to pass the configuration just create a `stubrunner.yml` file in the current working directory diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java index 2ad4aa804e..a45a4560c2 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java @@ -42,7 +42,7 @@ public class StubRunnerBootEurekaExample { /* // tag::stubrunnereureka_args[] --Dstubrunner.repositoryRoot=http://repo.spring.io/snapshots (1) +-Dstubrunner.repositoryRoot=https://repo.spring.io/snapshots (1) -Dstubrunner.cloud.stubbed.discovery.enabled=false (2) -Dstubrunner.ids=org.springframework.cloud.contract.verifier.stubs:loanIssuance,org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer,org.springframework.cloud.contract.verifier.stubs:bootService (3) -Dstubrunner.idsToServiceIds.fraudDetectionServer=someNameThatShouldMapFraudDetectionServer (4) diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java index 51a5c17616..8d3126661a 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java @@ -71,7 +71,7 @@ public class GitStubDownloaderTests { StubDownloader stubDownloader = stubDownloaderBuilder.build(new StubRunnerOptionsBuilder() .withStubsMode(StubRunnerProperties.StubsMode.REMOTE) - .withStubRepositoryRoot("http://foo.com") + .withStubRepositoryRoot("http://www.foo.com/") .withProperties(props()) .build()); diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom index 4cdede5f50..a7d561c091 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom index 3a11a36f5d..ce35db6197 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom index 7006d66306..2affa4a0f2 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom index c0dbcd64af..10a78c59fd 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy index 00199439d4..847826df23 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy @@ -287,7 +287,7 @@ class DslToWireMockClientConverterSpec extends Specification { "id":"01fbe706f872cb32", "name":"Washington", "place_type":"city", - "url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" + "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json" } }] ''' @@ -327,7 +327,7 @@ class DslToWireMockClientConverterSpec extends Specification { }, { "matchesJsonPath" : "$[*].['place'].['bounding_box'][?(@.['type'] == 'Polygon')]" }, { - "matchesJsonPath" : "$[*].['place'][?(@.['url'] == 'http://api.twitter.com/1/geo/id/01fbe706f872cb32.json')]" + "matchesJsonPath" : "$[*].['place'][?(@.['url'] == 'https://api.twitter.com/1/geo/id/01fbe706f872cb32.json')]" }, { "matchesJsonPath" : "$[*].['place'].['bounding_box'].['coordinates'][*][*][?(@ == 38.995548)]" }, { @@ -383,7 +383,7 @@ class DslToWireMockClientConverterSpec extends Specification { "id":"01fbe706f872cb32", "name":"Washington", "place_type":"city", - "url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" + "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json" } }]'''), String) } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom index 49bbd5ab9a..2486168419 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 com.example diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom index c3a53df1b3..ecaa2b2ccd 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 com.example diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy index fcc7b5c37a..61b90ccb07 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy @@ -71,7 +71,7 @@ class TestSideRequestTemplateModel { } private static List buildPathsFromUrl(String url) { - String fakeUrl = "http://foo.bar" + (url.startsWith("/") ? url : "/" + url) + String fakeUrl = "https://foo.bar" + (url.startsWith("/") ? url : "/" + url) List paths = new URL(fakeUrl).path.split("/") as List if (!paths.isEmpty()) { paths.remove(0) diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy index c71d2f6e8b..0bd930cdb5 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy @@ -1179,7 +1179,7 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString()) and: String jsonSample = '''\ - String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"positiveInt\\":42,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; + String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"positiveInt\\":42,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; DocumentContext parsedJson = JsonPath.parse(json); ''' and: diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy index 53c5a968fc..16cc92fcf4 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy @@ -594,7 +594,7 @@ Contract.make { !test.contains('REGEXP>>') and: String jsonSample = '''\ - String json = "{\\"shouldFail\\":123,\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; + String json = "{\\"shouldFail\\":123,\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; DocumentContext parsedJson = JsonPath.parse(json); ''' and: diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy index 718304efce..ca956815f6 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy @@ -1908,7 +1908,7 @@ World.'''""" "id":"01fbe706f872cb32", "name":"Washington", "place_type":"city", - "url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" + "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json" } }] ''' @@ -2270,7 +2270,7 @@ World.'''""" SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString()) and: String jsonSample = '''\ -String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; +String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; DocumentContext parsedJson = JsonPath.parse(json); ''' and: diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java index e254d21534..30871e3668 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java @@ -23,9 +23,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGet() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -33,10 +33,10 @@ public class WiremockMockServerApplicationTests { @Test public void simplePutShouldFail() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource.json") .build(); - RequestEntity postRequest = RequestEntity.post(URI.create("http://example.org/resource")) + RequestEntity postRequest = RequestEntity.post(URI.create("https://example.org/resource")) .accept(MediaType.TEXT_PLAIN) .build(); ResponseEntity response; @@ -53,9 +53,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithBodyFile() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-body-file.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("{\"message\":\"Hello World\"}"); server.verify(); } @@ -63,10 +63,10 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithBodyFileCustomLocation() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-body-file.json") .files("classpath:/custom/").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("{\"message\":\"Hello Custom\"}"); server.verify(); } @@ -74,10 +74,10 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithBodyFileCustomLocationDirectory() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-body-file.json") .files("file:src/test/resources/custom").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("{\"message\":\"Hello Custom\"}"); server.verify(); } @@ -85,9 +85,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithEmptyPath() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-empty-path.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/", String.class)) + assertThat(this.restTemplate.getForObject("https://example.org/", String.class)) .isEqualTo("Hello World"); server.verify(); } @@ -95,9 +95,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithContentType() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-content-type.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -105,9 +105,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithoutContentType() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-without-content-type.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -115,9 +115,9 @@ public class WiremockMockServerApplicationTests { @Test public void simplePost() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/poster.json").build(); - assertThat(this.restTemplate.postForObject("http://example.org/poster", + assertThat(this.restTemplate.postForObject("https://example.org/poster", "greeting", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -125,14 +125,14 @@ public class WiremockMockServerApplicationTests { @Test public void postWithHeader() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/poster.json", "classpath:/mappings/accept.json") .build(); assertThat( this.restTemplate .exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.TEXT_PLAIN).build(), String.class) .getBody()).isEqualTo("Accepted World"); @@ -141,12 +141,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithHeaderContains() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/poster.json", "classpath:/mappings/header-contains.json") .build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.foo")).build(), String.class).getBody()).isEqualTo("Foo World"); } @@ -154,12 +154,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithHeaderMatches() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/poster.json", "classpath:/mappings/header-matches.json") .build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.bar")).build(), String.class).getBody()).isEqualTo("Bar World"); } @@ -167,12 +167,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithMoreExactHeaderMatch() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/header-matches.json", "classpath:/mappings/header-matches-precise.json") .build(); assertThat(this.restTemplate - .exchange(RequestEntity.post(new URI("http://example.org/poster")) + .exchange(RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.bar")) .header("X-Precise", "true").build(), String.class) .getBody()).isEqualTo("Precise World"); @@ -181,12 +181,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithMoreExactHeaderMatchButOrdered() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order matters... + .baseUrl("https://example.org") // order matters... .stubs("classpath:/mappings/header-matches.json", "classpath:/mappings/header-matches-precise.json") .ignoreExpectOrder(false).build(); assertThat(this.restTemplate - .exchange(RequestEntity.post(new URI("http://example.org/poster")) + .exchange(RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.bar")) .header("X-Precise", "true").build(), String.class) .getBody()).isEqualTo("Bar World"); @@ -196,28 +196,28 @@ public class WiremockMockServerApplicationTests { @Test public void getWithPriortyOrder() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-low-priority.json", "classpath:/mappings/resource-with-high-priority.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello High"); } @Test public void simpleGetWithAllStubs() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); } @Test public void simpleGetWithAllStubsInDirectoryWithPeriod() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/io.stubs/mappings").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); } @@ -225,10 +225,10 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingJsonPaths() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-jsonpath.json").build(); - assertThat(this.restTemplate.postForObject("http://example.org/body", + assertThat(this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("RequiredThing"))), String.class)) .isEqualTo("Hello Body"); } @@ -236,12 +236,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingJsonPaths() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-jsonpath.json").build(); String response; try { - response = this.restTemplate.postForObject("http://example.org/body", + response = this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("AbsentThing"))), String.class); } catch (AssertionError e) { response = null; @@ -254,11 +254,11 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingXPath() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-xpath.json").build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("RequiredThing"), String.class).getBody()).isEqualTo("Hello Body"); @@ -267,13 +267,13 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingXPaths() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-xpath.json").build(); ResponseEntity response; try { response = this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body(""), String.class); @@ -288,10 +288,10 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingJson() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltojson.json").build(); - assertThat(this.restTemplate.postForObject("http://example.org/body", + assertThat(this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("RequiredThing"))), String.class)) .isEqualTo("Hello Body"); } @@ -299,12 +299,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingJson() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltojson.json").build(); String response; try { - response = this.restTemplate.postForObject("http://example.org/body", + response = this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("AbsentThing"))), String.class); } catch (AssertionError e) { response = null; @@ -317,11 +317,11 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingXml() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltoxml.json").build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("RequiredThing"), String.class).getBody()).isEqualTo("Hello Body"); @@ -330,13 +330,13 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingXml() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltoxml.json").build(); ResponseEntity response; try { response = this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("AbsentThing"), String.class); @@ -351,11 +351,11 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingRegex() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-regex.json").build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("RequiredThing"), String.class).getBody()).isEqualTo("Hello Body"); @@ -364,13 +364,13 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingRegex() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-regex.json").build(); ResponseEntity response; try { response = this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("AbsentThing"), String.class); @@ -385,9 +385,9 @@ public class WiremockMockServerApplicationTests { @Test public void getWithUrlPathMatching() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/url-path-pattern.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/123/url-path-pattern/", + assertThat(this.restTemplate.getForObject("https://example.org/123/url-path-pattern/", String.class)).isEqualTo("Hello Url Path Matcher"); server.verify(); } @@ -395,9 +395,9 @@ public class WiremockMockServerApplicationTests { @Test public void getWithUrlMatching() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/url-matches.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/123/hello-url-matcher/", + assertThat(this.restTemplate.getForObject("https://example.org/123/hello-url-matcher/", String.class)).isEqualTo("Hello Url Matcher"); server.verify(); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java index 92c453df68..145dc9e5a2 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java @@ -50,7 +50,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") String base; private RestTemplate restTemplate; diff --git a/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy b/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy index e8f4f40666..731bdcc070 100644 --- a/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy +++ b/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy @@ -90,7 +90,7 @@ class AmqpMessagingApplicationSpec extends Specification { Contract.make { description(""" Represents scenario 2 from documentation: -http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html#_publisher_side_test_generation +https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html#_publisher_side_test_generation "The input message triggers an output message." diff --git a/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom index e7d4ec8ed9..211097b7af 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs.amqp diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom index 4cdede5f50..a7d561c091 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom index 3a11a36f5d..ce35db6197 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom index 7006d66306..2affa4a0f2 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom index 4cdede5f50..a7d561c091 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom index 3a11a36f5d..ce35db6197 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom index 7006d66306..2affa4a0f2 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom index 881087ea56..c303934117 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom index 288b27bb10..dbde130d30 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom index 7bd05442c3..99ac350eee 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 org.springframework.cloud.contract.verifier.stubs