SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

URL Cleanup (#1008)

Browse Source 
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 14 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/stubbing/ (200) with 2 occurrences could not be migrated:
   ([https](https://wiremock.org/docs/stubbing/) result SSLHandshakeException).
* [ ] http://wiremock.org/stateful-behaviour.html (200) with 2 occurrences could not be migrated:
   ([https](https://wiremock.org/stateful-behaviour.html) 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/blah_ (301) with 2 occurrences could not be migrated:
   ([https](https://foo.com/blah_) result SSLHandshakeException).
* [ ] http://foo.com/blah_blah (301) with 1 occurrences could not be migrated:
   ([https](https://foo.com/blah_blah) result SSLHandshakeException).
* [ ] http://foo.com/blah_blah/ (301) with 1 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/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 38 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 17 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 1 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/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/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/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/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 19 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 6 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 4 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 4 occurrences migrated to:
  https://tools.ietf.org/html/rfc7235 ([https](https://tools.ietf.org/html/rfc7235) 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://j.mp with 1 occurrences migrated to:
  https://j.mp ([https](https://j.mp) result 301).
* [ ] http://plugins.jetbrains.com/plugin/6546 with 1 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 3 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://link/to/your/nexus/or/artifactory/or/sth with 1 occurrences
* http://loanIssuance/name with 3 occurrences
* http://localhost with 52 occurrences
* http://localhost/partners/ with 3 occurrences
* http://localhost/partners/1000/users/1001 with 2 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/tests 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: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 34 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 18 occurrences
This commit is contained in:
Spring Operator
2019-03-27 09:01:33 -07:00
committed by Olga Maciaszek-Sharma
parent e1a498334f
commit ccc19e5b59
52 changed files with 214 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -21,7 +21,7 @@ bin/
*.ear *.ear
*.versionsBackup *.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* hs_err_pid*
*.class *.class

20
README.adoc
View File

@@ -18,7 +18,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 If you prefer to learn about the project by doing some tutorials, you can check out the
workshops under 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 === Spring Cloud Contract Verifier
@@ -404,9 +404,9 @@ following section to your build:
repositories { repositories {
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()
maven { url "http://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" } maven { url "https://repo.spring.io/milestone" }
maven { url "http://repo.spring.io/release" } maven { url "https://repo.spring.io/release" }
} }
---- ----
@@ -985,7 +985,7 @@ achieving the same thing by changing the properties.
---- ----
stubrunner: stubrunner:
ids: 'com.example:http-server-dsl:+:stubs:8080' 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! That's it!
@@ -1011,7 +1011,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480]
==== Readings ==== 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/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://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] - http://groovy-lang.org/json.html[Groovy docs regarding JSON]
@@ -1242,7 +1242,7 @@ public class WiremockForDocsMockServerApplicationTests {
public void contextLoads() throws Exception { public void contextLoads() throws Exception {
// will read stubs classpath // will read stubs classpath
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) 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(); .build();
// We're asserting if WireMock responded properly // We're asserting if WireMock responded properly
assertThat(this.service.go()).isEqualTo("Hello World"); assertThat(this.service.go()).isEqualTo("Hello World");
@@ -1254,7 +1254,7 @@ public class WiremockForDocsMockServerApplicationTests {
The `baseUrl` value is prepended to all mock calls, and the `stubs()` method takes a stub 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 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 `/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 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 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 pattern. The JSON format is the normal WireMock format, which you can read about in the
@@ -1521,7 +1521,7 @@ added after the original pull request but before a merge.
`eclipse-code-formatter.xml` file from the `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 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 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. Plugin] to import the same file.
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an * 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 `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -1534,7 +1534,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. * 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 * If no-one else is using your branch, please rebase it against the current master (or
other target branch in the main project). 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 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). message (where XXXX is the issue number).

2
asciidoctor.css
View File

@@ -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 */ /* 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";*/ /*@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} article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}

2
docs/src/main/asciidoc/README.adoc
View File

@@ -16,7 +16,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 If you prefer to learn about the project by doing some tutorials, you can check out the
workshops under 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 === Spring Cloud Contract Verifier

2
docs/src/main/asciidoc/migrations.adoc
View File

@@ -79,7 +79,7 @@ structure presented in the previous snippet.
<assembly <assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>stubs</id> <id>stubs</id>
<formats> <formats>
<format>jar</format> <format>jar</format>

2
docs/src/main/asciidoc/spring-cloud-wiremock.adoc
View File

@@ -149,7 +149,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 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 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 `/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 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 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 pattern. The JSON format is the normal WireMock format, which you can read about in the

2
docs/src/main/asciidoc/verifier_contract.adoc
View File

@@ -584,7 +584,7 @@ given name.
matches the JSON Path. matches the JSON Path.
If you're using the YAML contract definition you have to use the 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. functions to achieve this.
* `{{{ request.url }}}`: Returns the request URL and query parameters. * `{{{ request.url }}}`: Returns the request URL and query parameters.

2
docs/src/main/asciidoc/verifier_faq.adoc
View File

@@ -313,7 +313,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`) 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. 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 ==== Producer

2
docs/src/main/asciidoc/verifier_introduction.adoc
View File

@@ -615,7 +615,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480]
==== Readings ==== 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/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://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] - http://groovy-lang.org/json.html[Groovy docs regarding JSON]

4
docs/src/main/asciidoc/verifier_setup.adoc
View File

@@ -32,7 +32,7 @@ In order to use Spring Cloud Contract Verifier with WireMock, you muse use eithe
Gradle or a Maven plugin. Gradle or a Maven plugin.
WARNING: If you want to use Spock in your projects, you must add separately the 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] docs for more information]
[[gradle-add-gradle-plugin]] [[gradle-add-gradle-plugin]]
@@ -904,7 +904,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 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 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] 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 ==== How it works

2
ideas.md
View File

@@ -13,5 +13,5 @@ Feature ideas:
- [x] `DiscoveryClient` support so backends can be stubbed or mocked transparently (declaratively) - [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 - [ ] 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? - [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 - [x] Schema registries for binary formats like protobuf, thrift, avro - Stream does it

2
samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml
View File

@@ -1,3 +1,3 @@
stubrunner: stubrunner:
ids: 'com.example:http-server-dsl:+:stubs:8080' ids: 'com.example:http-server-dsl:+:stubs:8080'
repositoryRoot: http://repo.spring.io/libs-snapshot repositoryRoot: https://repo.spring.io/libs-snapshot

2
samples/standalone/yml/http-client/src/test/resources/application-test-repo.yaml
View File

@@ -1,3 +1,3 @@
stubrunner: stubrunner:
ids: 'com.example:http-server-dsl:+:stubs:8080' ids: 'com.example:http-server-dsl:+:stubs:8080'
repositoryRoot: http://repo.spring.io/libs-snapshot repositoryRoot: https://repo.spring.io/libs-snapshot

2
samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java
View File

@@ -41,7 +41,7 @@ class Controller {
@Component @Component
class Service { class Service {
@Value("${app.baseUrl:http://example.org}") @Value("${app.baseUrl:https://example.org}")
private String base; private String base;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;

2
samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java
View File

@@ -28,7 +28,7 @@ public class WiremockForDocsMockServerApplicationTests {
public void contextLoads() throws Exception { public void contextLoads() throws Exception {
// will read stubs classpath // will read stubs classpath
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) 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(); .build();
// We're asserting if WireMock responded properly // We're asserting if WireMock responded properly
assertThat(this.service.go()).isEqualTo("Hello World"); assertThat(this.service.go()).isEqualTo("Hello World");

2
samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java
View File

@@ -26,7 +26,7 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void contextLoads() throws Exception { public void contextLoads() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/stubs/resource.json").build(); .stubs("classpath:/stubs/resource.json").build();
assertThat(this.service.go()).isEqualTo("Hello World"); assertThat(this.service.go()).isEqualTo("Hello World");
server.verify(); server.verify();

2
samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java
View File

@@ -40,7 +40,7 @@ class Controller {
@Component @Component
class Service { class Service {
@Value("${app.baseUrl:http://example.org}") @Value("${app.baseUrl:https://example.org}")
private String base; private String base;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;

2
samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java
View File

@@ -41,7 +41,7 @@ class Controller {
@Component @Component
class Service { class Service {
@Value("${app.baseUrl:http://example.org}") @Value("${app.baseUrl:https://example.org}")
private String base; private String base;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;

2
samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java
View File

@@ -26,7 +26,7 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void contextLoads() throws Exception { public void contextLoads() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/stubs/**/*.json").build(); .stubs("classpath:/stubs/**/*.json").build();
assertThat(this.service.go()).isEqualTo("Hello World"); assertThat(this.service.go()).isEqualTo("Hello World");
server.verify(); server.verify();

2
samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java
View File

@@ -40,7 +40,7 @@ class Controller {
@Component @Component
class Service { class Service {
@Value("${app.baseUrl:http://example.org}") @Value("${app.baseUrl:https://example.org}")
private String base; private String base;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;

2
samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java
View File

@@ -40,7 +40,7 @@ class Controller {
@Component @Component
class Service { class Service {
@Value("${app.baseUrl:http://example.org}") @Value("${app.baseUrl:https://example.org}")
private String base; private String base;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;

2
samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java
View File

@@ -26,7 +26,7 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void contextLoads() throws Exception { public void contextLoads() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/stubs").build(); .stubs("classpath:/stubs").build();
assertThat(this.service.go()).isEqualTo("Hello World"); assertThat(this.service.go()).isEqualTo("Hello World");
server.verify(); server.verify();

120
spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy
View File

@@ -17,119 +17,119 @@ class HttpHeaders {
/** /**
* The HTTP {@code Accept} header field name. * The HTTP {@code Accept} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.3.2">Section 5.3.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.2">Section 5.3.2 of RFC 7231</a>
*/ */
String accept() { String accept() {
return "Accept" return "Accept"
} }
/** /**
* The HTTP {@code Accept-Charset} header field name. * The HTTP {@code Accept-Charset} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.3.3">Section 5.3.3 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.3">Section 5.3.3 of RFC 7231</a>
*/ */
String acceptCharset() { String acceptCharset() {
return "Accept-Charset" return "Accept-Charset"
} }
/** /**
* The HTTP {@code Accept-Encoding} header field name. * The HTTP {@code Accept-Encoding} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.3.4">Section 5.3.4 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.4">Section 5.3.4 of RFC 7231</a>
*/ */
String acceptEncoding() { String acceptEncoding() {
return "Accept-Encoding" return "Accept-Encoding"
} }
/** /**
* The HTTP {@code Accept-Language} header field name. * The HTTP {@code Accept-Language} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.3.5">Section 5.3.5 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.3.5">Section 5.3.5 of RFC 7231</a>
*/ */
String acceptLanguage() { String acceptLanguage() {
return "Accept-Language" return "Accept-Language"
} }
/** /**
* The HTTP {@code Accept-Ranges} header field name. * The HTTP {@code Accept-Ranges} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7233#section-2.3">Section 5.3.5 of RFC 7233</a> * @see <a href="https://tools.ietf.org/html/rfc7233#section-2.3">Section 5.3.5 of RFC 7233</a>
*/ */
String acceptRanges() { String acceptRanges() {
return "Accept-Ranges" return "Accept-Ranges"
} }
/** /**
* The CORS {@code Access-Control-Allow-Credentials} response header field name. * The CORS {@code Access-Control-Allow-Credentials} response header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlAllowCredentials() { String accessControlAllowCredentials() {
return "Access-Control-Allow-Credentials" return "Access-Control-Allow-Credentials"
} }
/** /**
* The CORS {@code Access-Control-Allow-Headers} response header field name. * The CORS {@code Access-Control-Allow-Headers} response header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlAllowHeaders() { String accessControlAllowHeaders() {
return "Access-Control-Allow-Headers" return "Access-Control-Allow-Headers"
} }
/** /**
* The CORS {@code Access-Control-Allow-Methods} response header field name. * The CORS {@code Access-Control-Allow-Methods} response header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlAllowMethods() { String accessControlAllowMethods() {
return "Access-Control-Allow-Methods" return "Access-Control-Allow-Methods"
} }
/** /**
* The CORS {@code Access-Control-Allow-Origin} response header field name. * The CORS {@code Access-Control-Allow-Origin} response header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlAllowOrigin() { String accessControlAllowOrigin() {
return "Access-Control-Allow-Origin" return "Access-Control-Allow-Origin"
} }
/** /**
* The CORS {@code Access-Control-Expose-Headers} response header field name. * The CORS {@code Access-Control-Expose-Headers} response header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlExposeHeaders() { String accessControlExposeHeaders() {
return "Access-Control-Expose-Headers" return "Access-Control-Expose-Headers"
} }
/** /**
* The CORS {@code Access-Control-Max-Age} response header field name. * The CORS {@code Access-Control-Max-Age} response header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlMaxAge() { String accessControlMaxAge() {
return "Access-Control-Max-Age" return "Access-Control-Max-Age"
} }
/** /**
* The CORS {@code Access-Control-Request-Headers} request header field name. * The CORS {@code Access-Control-Request-Headers} request header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlRequestHeaders() { String accessControlRequestHeaders() {
return "Access-Control-Request-Headers" return "Access-Control-Request-Headers"
} }
/** /**
* The CORS {@code Access-Control-Request-Method} request header field name. * The CORS {@code Access-Control-Request-Method} request header field name.
* @see <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a> * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>
*/ */
String accessControlRequestMethod() { String accessControlRequestMethod() {
return "Access-Control-Request-Method" return "Access-Control-Request-Method"
} }
/** /**
* The HTTP {@code Age} header field name. * The HTTP {@code Age} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7234#section-5.1">Section 5.1 of RFC 7234</a> * @see <a href="https://tools.ietf.org/html/rfc7234#section-5.1">Section 5.1 of RFC 7234</a>
*/ */
String age() { String age() {
return "Age" return "Age"
} }
/** /**
* The HTTP {@code Allow} header field name. * The HTTP {@code Allow} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-7.4.1">Section 7.4.1 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.4.1">Section 7.4.1 of RFC 7231</a>
*/ */
String allow() { String allow() {
return "Allow" return "Allow"
} }
/** /**
* The HTTP {@code Authorization} header field name. * The HTTP {@code Authorization} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7235#section-4.2">Section 4.2 of RFC 7235</a> * @see <a href="https://tools.ietf.org/html/rfc7235#section-4.2">Section 4.2 of RFC 7235</a>
*/ */
String authorization() { String authorization() {
return "Authorization" return "Authorization"
} }
/** /**
* The HTTP {@code Cache-Control} header field name. * The HTTP {@code Cache-Control} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7234#section-5.2">Section 5.2 of RFC 7234</a> * @see <a href="https://tools.ietf.org/html/rfc7234#section-5.2">Section 5.2 of RFC 7234</a>
*/ */
String cacheControl() { String cacheControl() {
return "Cache-Control" return "Cache-Control"
@@ -137,7 +137,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Connection} header field name. * The HTTP {@code Connection} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-6.1">Section 6.1 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-6.1">Section 6.1 of RFC 7230</a>
*/ */
String connection() { String connection() {
return "Connection" return "Connection"
@@ -145,7 +145,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Encoding} header field name. * The HTTP {@code Content-Encoding} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-3.1.2.2">Section 3.1.2.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-3.1.2.2">Section 3.1.2.2 of RFC 7231</a>
*/ */
String contentEncoding() { String contentEncoding() {
return "Content-Encoding" return "Content-Encoding"
@@ -153,7 +153,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Disposition} header field name * The HTTP {@code Content-Disposition} header field name
* @see <a href="http://tools.ietf.org/html/rfc6266">RFC 6266</a> * @see <a href="https://tools.ietf.org/html/rfc6266">RFC 6266</a>
*/ */
String contentDisposition() { String contentDisposition() {
return "Content-Disposition" return "Content-Disposition"
@@ -161,7 +161,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Language} header field name. * The HTTP {@code Content-Language} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-3.1.3.2">Section 3.1.3.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-3.1.3.2">Section 3.1.3.2 of RFC 7231</a>
*/ */
String contentLanguage() { String contentLanguage() {
return "Content-Language" return "Content-Language"
@@ -169,7 +169,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Length} header field name. * The HTTP {@code Content-Length} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-3.3.2">Section 3.3.2 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-3.3.2">Section 3.3.2 of RFC 7230</a>
*/ */
String contentLength() { String contentLength() {
return "Content-Length" return "Content-Length"
@@ -177,7 +177,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Location} header field name. * The HTTP {@code Content-Location} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-3.1.4.2">Section 3.1.4.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-3.1.4.2">Section 3.1.4.2 of RFC 7231</a>
*/ */
String contentLocation() { String contentLocation() {
return "Content-Location" return "Content-Location"
@@ -185,7 +185,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Range} header field name. * The HTTP {@code Content-Range} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7233#section-4.2">Section 4.2 of RFC 7233</a> * @see <a href="https://tools.ietf.org/html/rfc7233#section-4.2">Section 4.2 of RFC 7233</a>
*/ */
String contentRange() { String contentRange() {
return "Content-Range" return "Content-Range"
@@ -193,7 +193,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Content-Type} header field name. * The HTTP {@code Content-Type} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-3.1.1.5">Section 3.1.1.5 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-3.1.1.5">Section 3.1.1.5 of RFC 7231</a>
*/ */
String contentType() { String contentType() {
return "Content-Type" return "Content-Type"
@@ -201,7 +201,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Cookie} header field name. * The HTTP {@code Cookie} header field name.
* @see <a href="http://tools.ietf.org/html/rfc2109#section-4.3.4">Section 4.3.4 of RFC 2109</a> * @see <a href="https://tools.ietf.org/html/rfc2109#section-4.3.4">Section 4.3.4 of RFC 2109</a>
*/ */
String cookie() { String cookie() {
return "Cookie" return "Cookie"
@@ -209,7 +209,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Date} header field name. * The HTTP {@code Date} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-7.1.1.2">Section 7.1.1.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.1.1.2">Section 7.1.1.2 of RFC 7231</a>
*/ */
String date() { String date() {
return "Date" return "Date"
@@ -217,7 +217,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code ETag} header field name. * The HTTP {@code ETag} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7232#section-2.3">Section 2.3 of RFC 7232</a> * @see <a href="https://tools.ietf.org/html/rfc7232#section-2.3">Section 2.3 of RFC 7232</a>
*/ */
String etag() { String etag() {
return "ETag" return "ETag"
@@ -225,7 +225,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Expect} header field name. * The HTTP {@code Expect} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.1.1">Section 5.1.1 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.1.1">Section 5.1.1 of RFC 7231</a>
*/ */
String expect() { String expect() {
return "Expect" return "Expect"
@@ -233,7 +233,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Expires} header field name. * The HTTP {@code Expires} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7234#section-5.3">Section 5.3 of RFC 7234</a> * @see <a href="https://tools.ietf.org/html/rfc7234#section-5.3">Section 5.3 of RFC 7234</a>
*/ */
String expires() { String expires() {
return "Expires" return "Expires"
@@ -241,7 +241,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code From} header field name. * The HTTP {@code From} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.5.1">Section 5.5.1 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.5.1">Section 5.5.1 of RFC 7231</a>
*/ */
String from() { String from() {
return "From" return "From"
@@ -249,7 +249,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Host} header field name. * The HTTP {@code Host} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-5.4">Section 5.4 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-5.4">Section 5.4 of RFC 7230</a>
*/ */
String host() { String host() {
return "Host" return "Host"
@@ -257,7 +257,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code If-Match} header field name. * The HTTP {@code If-Match} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7232#section-3.1">Section 3.1 of RFC 7232</a> * @see <a href="https://tools.ietf.org/html/rfc7232#section-3.1">Section 3.1 of RFC 7232</a>
*/ */
String ifMatch() { String ifMatch() {
return "If-Match" return "If-Match"
@@ -265,7 +265,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code If-Modified-Since} header field name. * The HTTP {@code If-Modified-Since} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7232#section-3.3">Section 3.3 of RFC 7232</a> * @see <a href="https://tools.ietf.org/html/rfc7232#section-3.3">Section 3.3 of RFC 7232</a>
*/ */
String ifModifiedSince() { String ifModifiedSince() {
return "If-Modified-Since" return "If-Modified-Since"
@@ -273,7 +273,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code If-None-Match} header field name. * The HTTP {@code If-None-Match} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7232#section-3.2">Section 3.2 of RFC 7232</a> * @see <a href="https://tools.ietf.org/html/rfc7232#section-3.2">Section 3.2 of RFC 7232</a>
*/ */
String ifNoneMatch() { String ifNoneMatch() {
return "If-None-Match" return "If-None-Match"
@@ -281,7 +281,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code If-Range} header field name. * The HTTP {@code If-Range} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7233#section-3.2">Section 3.2 of RFC 7233</a> * @see <a href="https://tools.ietf.org/html/rfc7233#section-3.2">Section 3.2 of RFC 7233</a>
*/ */
String ifRange() { String ifRange() {
return "If-Range" return "If-Range"
@@ -289,7 +289,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code If-Unmodified-Since} header field name. * The HTTP {@code If-Unmodified-Since} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7232#section-3.4">Section 3.4 of RFC 7232</a> * @see <a href="https://tools.ietf.org/html/rfc7232#section-3.4">Section 3.4 of RFC 7232</a>
*/ */
String ifUnmodifiedSince() { String ifUnmodifiedSince() {
return "If-Unmodified-Since" return "If-Unmodified-Since"
@@ -297,7 +297,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Last-Modified} header field name. * The HTTP {@code Last-Modified} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7232#section-2.2">Section 2.2 of RFC 7232</a> * @see <a href="https://tools.ietf.org/html/rfc7232#section-2.2">Section 2.2 of RFC 7232</a>
*/ */
String lastModified() { String lastModified() {
return "Last-Modified" return "Last-Modified"
@@ -305,7 +305,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Link} header field name. * The HTTP {@code Link} header field name.
* @see <a href="http://tools.ietf.org/html/rfc5988">RFC 5988</a> * @see <a href="https://tools.ietf.org/html/rfc5988">RFC 5988</a>
*/ */
String link() { String link() {
return "Link" return "Link"
@@ -313,7 +313,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Location} header field name. * The HTTP {@code Location} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-7.1.2">Section 7.1.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.1.2">Section 7.1.2 of RFC 7231</a>
*/ */
String location() { String location() {
return "Location" return "Location"
@@ -321,14 +321,14 @@ class HttpHeaders {
/** /**
* The HTTP {@code Max-Forwards} header field name. * The HTTP {@code Max-Forwards} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.1.2">Section 5.1.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.1.2">Section 5.1.2 of RFC 7231</a>
*/ */
String max_forwards() { String max_forwards() {
return "Max-Forwards" return "Max-Forwards"
} }
/** /**
* The HTTP {@code Origin} header field name. * The HTTP {@code Origin} header field name.
* @see <a href="http://tools.ietf.org/html/rfc6454">RFC 6454</a> * @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454</a>
*/ */
String origin() { String origin() {
return "Origin" return "Origin"
@@ -336,7 +336,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Pragma} header field name. * The HTTP {@code Pragma} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7234#section-5.4">Section 5.4 of RFC 7234</a> * @see <a href="https://tools.ietf.org/html/rfc7234#section-5.4">Section 5.4 of RFC 7234</a>
*/ */
String pragma() { String pragma() {
return "Pragma" return "Pragma"
@@ -344,7 +344,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Proxy-Authenticate} header field name. * The HTTP {@code Proxy-Authenticate} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7235#section-4.3">Section 4.3 of RFC 7235</a> * @see <a href="https://tools.ietf.org/html/rfc7235#section-4.3">Section 4.3 of RFC 7235</a>
*/ */
String proxyAuthenticate() { String proxyAuthenticate() {
return "Proxy-Authenticate" return "Proxy-Authenticate"
@@ -352,7 +352,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Proxy-Authorization} header field name. * The HTTP {@code Proxy-Authorization} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7235#section-4.4">Section 4.4 of RFC 7235</a> * @see <a href="https://tools.ietf.org/html/rfc7235#section-4.4">Section 4.4 of RFC 7235</a>
*/ */
String proxyAuthorization() { String proxyAuthorization() {
return "Proxy-Authorization" return "Proxy-Authorization"
@@ -360,7 +360,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Range} header field name. * The HTTP {@code Range} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7233#section-3.1">Section 3.1 of RFC 7233</a> * @see <a href="https://tools.ietf.org/html/rfc7233#section-3.1">Section 3.1 of RFC 7233</a>
*/ */
String range() { String range() {
return "Range" return "Range"
@@ -368,7 +368,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Referer} header field name. * The HTTP {@code Referer} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.5.2">Section 5.5.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.5.2">Section 5.5.2 of RFC 7231</a>
*/ */
String referer() { String referer() {
return "Referer" return "Referer"
@@ -376,7 +376,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Retry-After} header field name. * The HTTP {@code Retry-After} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-7.1.3">Section 7.1.3 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.1.3">Section 7.1.3 of RFC 7231</a>
*/ */
String retryAfter() { String retryAfter() {
return "Retry-After" return "Retry-After"
@@ -384,7 +384,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Server} header field name. * The HTTP {@code Server} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-7.4.2">Section 7.4.2 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.4.2">Section 7.4.2 of RFC 7231</a>
*/ */
String server() { String server() {
return "Server" return "Server"
@@ -392,7 +392,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Set-Cookie} header field name. * The HTTP {@code Set-Cookie} header field name.
* @see <a href="http://tools.ietf.org/html/rfc2109#section-4.2.2">Section 4.2.2 of RFC 2109</a> * @see <a href="https://tools.ietf.org/html/rfc2109#section-4.2.2">Section 4.2.2 of RFC 2109</a>
*/ */
String setCookie() { String setCookie() {
return "Set-Cookie" return "Set-Cookie"
@@ -400,7 +400,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Set-Cookie2} header field name. * The HTTP {@code Set-Cookie2} header field name.
* @see <a href="http://tools.ietf.org/html/rfc2965">RFC 2965</a> * @see <a href="https://tools.ietf.org/html/rfc2965">RFC 2965</a>
*/ */
String setCookie2() { String setCookie2() {
return "Set-Cookie2" return "Set-Cookie2"
@@ -408,7 +408,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code TE} header field name. * The HTTP {@code TE} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-4.3">Section 4.3 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-4.3">Section 4.3 of RFC 7230</a>
*/ */
String te() { String te() {
return "TE" return "TE"
@@ -416,7 +416,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Trailer} header field name. * The HTTP {@code Trailer} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-4.4">Section 4.4 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-4.4">Section 4.4 of RFC 7230</a>
*/ */
String trailer() { String trailer() {
return "Trailer" return "Trailer"
@@ -424,7 +424,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Transfer-Encoding} header field name. * The HTTP {@code Transfer-Encoding} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-3.3.1">Section 3.3.1 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-3.3.1">Section 3.3.1 of RFC 7230</a>
*/ */
String transferEncoding() { String transferEncoding() {
return "Transfer-Encoding" return "Transfer-Encoding"
@@ -432,7 +432,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Upgrade} header field name. * The HTTP {@code Upgrade} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-6.7">Section 6.7 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-6.7">Section 6.7 of RFC 7230</a>
*/ */
String upgrade() { String upgrade() {
return "Upgrade" return "Upgrade"
@@ -440,7 +440,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code User-Agent} header field name. * The HTTP {@code User-Agent} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-5.5.3">Section 5.5.3 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-5.5.3">Section 5.5.3 of RFC 7231</a>
*/ */
String user_agent() { String user_agent() {
return "User-Agent" return "User-Agent"
@@ -448,7 +448,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Vary} header field name. * The HTTP {@code Vary} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7231#section-7.1.4">Section 7.1.4 of RFC 7231</a> * @see <a href="https://tools.ietf.org/html/rfc7231#section-7.1.4">Section 7.1.4 of RFC 7231</a>
*/ */
String vary() { String vary() {
return "Vary" return "Vary"
@@ -456,7 +456,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Via} header field name. * The HTTP {@code Via} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7230#section-5.7.1">Section 5.7.1 of RFC 7230</a> * @see <a href="https://tools.ietf.org/html/rfc7230#section-5.7.1">Section 5.7.1 of RFC 7230</a>
*/ */
String via() { String via() {
return "Via" return "Via"
@@ -464,7 +464,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code Warning} header field name. * The HTTP {@code Warning} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7234#section-5.5">Section 5.5 of RFC 7234</a> * @see <a href="https://tools.ietf.org/html/rfc7234#section-5.5">Section 5.5 of RFC 7234</a>
*/ */
String warning() { String warning() {
return "Warning" return "Warning"
@@ -472,7 +472,7 @@ class HttpHeaders {
/** /**
* The HTTP {@code WWW-Authenticate} header field name. * The HTTP {@code WWW-Authenticate} header field name.
* @see <a href="http://tools.ietf.org/html/rfc7235#section-4.1">Section 4.1 of RFC 7235</a> * @see <a href="https://tools.ietf.org/html/rfc7235#section-4.1">Section 4.1 of RFC 7235</a>
*/ */
String wwwAuthenticate() { String wwwAuthenticate() {
return "WWW-Authenticate" return "WWW-Authenticate"

2
spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy
View File

@@ -152,7 +152,7 @@ class UrlHelper {
// Examples: "fitbit.com", "22.231.113.64", "localhost" // Examples: "fitbit.com", "22.231.113.64", "localhost"
private static final String REGEX_HOST = "(?:" + private static final String REGEX_HOST = "(?:" +
// @Author = http://www.regular-expressions.info/examples.html // @Author = https://www.regular-expressions.info/examples.html
// IP address // 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]?)" + "(?:(?: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]?)" +
"|" + "|" +

72
spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy
View File

@@ -56,59 +56,59 @@ class RegexPatternsSpec extends Specification {
'asdf@asdf.online' || true '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]"() { def "should generate a regex for url [#textToMatch] that is a match [#shouldMatch]"() {
expect: expect:
shouldMatch == Pattern.compile(regexPatterns.url()).matcher(textToMatch).matches() shouldMatch == Pattern.compile(regexPatterns.url()).matcher(textToMatch).matches()
where: where:
textToMatch || shouldMatch textToMatch || shouldMatch
'ftp://asd.com:9090/asd/a?a=b' || true '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 'ftp://localhost/api' || true
'http://localhost:8080/api' || true 'http://localhost:8080/api' || true
'http://foo.com/blah_blah/' || true 'http://www.foo.com/blah_blah/' || true
'http://foo.com/blah_blah_(wikipedia)' || true 'http://www.foo.com/blah_blah_(wikipedia)' || true
'http://foo.com/blah_blah_(wikipedia)_(again)' || true 'http://www.foo.com/blah_blah_(wikipedia)_(again)' || true
'http://www.example.com/wpstyle/?p=364' || true 'https://www.example.com/wpstyle/?p=364' || true
'https://www.example.com/foo/?bar=baz&inga=42&quux' || true 'https://www.example.com/foo/?bar=baz&inga=42&quux' || true
'http://✪df.ws/123' || true 'http://✪df.ws/123' || true
'http://userid:password@example.com:8080' || true 'https://userid:password@example.com:8080' || true
'http://userid:password@example.com:8080/' || true 'https://userid:password@example.com:8080/' || true
'http://userid@example.com' || true 'https://userid@example.com' || true
'http://userid@example.com/' || true 'https://userid@example.com/' || true
'http://userid@example.com:8080' || true 'https://userid@example.com:8080' || true
'http://userid@example.com:8080/' || true 'https://userid@example.com:8080/' || true
'http://userid:password@example.com' || true 'https://userid:password@example.com' || true
'http://userid:password@example.com/' || true 'https://userid:password@example.com/' || true
'http://142.42.1.1/' || true 'https://142.42.1.1/' || true
'http://142.42.1.1:8080/' || true 'https://142.42.1.1:8080/' || true
'http://⌘.ws' || true 'http://⌘.ws' || true
'http://⌘.ws/' || true 'http://⌘.ws/' || true
'http://foo.com/blah_(wikipedia)#cite-1' || true 'http://www.foo.com/blah_(wikipedia)#cite-1' || true
'http://foo.com/blah_(wikipedia)_blah#cite-1' || true 'http://www.foo.com/blah_(wikipedia)_blah#cite-1' || true
'http://foo.com/unicode_(✪)_in_parens' || true 'http://www.foo.com/unicode_(✪)_in_parens' || true
'http://foo.com/(something)?after=parens' || true 'http://www.foo.com/(something)?after=parens' || true
'http://☺.damowmow.com/' || true 'http://☺.damowmow.com/' || true
'http://code.google.com/events/#&product=browser' || true 'https://code.google.com/events/#&product=browser' || true
'http://j.mp' || true 'https://j.mp' || true
'ftp://foo.bar/baz' || 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://1337.net' || true
'http://a.b-c.de' || true 'https://a.b-c.de' || true
'http://223.255.255.254' || true 'https://223.255.255.254' || true
'foo.com' || true 'foo.com' || true
'a.b.' || false 'a.b.' || false
'http://' || false 'http://' || false
'http://.' || false 'http://.' || false
'http://..' || false 'http://..' || false
'http://../' || false 'https://../' || false
'http://?' || false 'http://?' || false
'http://??' || false 'http://??' || false
'http://??/' || false 'http://??/' || 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 '//' || false
'//a' || false '//a' || false
'///a' || false '///a' || false
@@ -118,16 +118,16 @@ class RegexPatternsSpec extends Specification {
'h://test' || false 'h://test' || false
'http:// shouldfail.com' || false 'http:// shouldfail.com' || false
':// should fail' || false ':// should fail' || false
'http://foo.bar/foo(bar)baz quux' || false 'https://foo.bar/foo(bar)baz quux' || false
'http://-error-.invalid/' || false 'https://-error-.invalid/' || false
'http://-a.b.co' || false 'https://-a.b.co' || false
'http://a.b-.co' || false 'https://a.b-.co' || false
'http://1.1.1.1.1' || false 'https://1.1.1.1.1' || false
'http://123.123.123' || false 'https://123.123.123' || false
'http://3628126748' || false 'http://3628126748' || false
'http://.www.foo.bar/' || false 'https://.www.foo.bar/' || false
'http://www.foo.bar./' || false 'https://www.foo.bar./' || false
'http://.www.foo.bar./' || false 'https://.www.foo.bar./' || false
} }
def "should generate a regex for a number [#textToMatch] that is a match [#shouldMatch]"() { def "should generate a regex for a number [#textToMatch] that is a match [#shouldMatch]"() {

6
spring-cloud-contract-stub-runner/README.adoc
View File

@@ -4,7 +4,7 @@
=== Stub Runner Core === Stub Runner Core
Runs stubs for service collaborators. Treating stubs as contracts of services allows to use stub-runner as an implementation of 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. 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. For messaging, special stub routes are defined.
@@ -30,7 +30,7 @@ Example:
[source,java] [source,java]
---- ----
@AutoConfigureStubRunner(repositoryRoot="http://foo.bar", ids = "com.example:beer-api-producer:+:stubs:8095") @AutoConfigureStubRunner(repositoryRoot="https://foo.bar", ids = "com.example:beer-api-producer:+:stubs:8095")
---- ----
===== Classpath scanning ===== Classpath scanning
@@ -484,7 +484,7 @@ $ java -jar stub-runner.jar --stubrunner.ids=... --stubrunner.repositoryRoot=...
===== Spring Cloud CLI ===== 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`. 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 In order to pass the configuration just create a `stubrunner.yml` file in the current working directory

2
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java
View File

@@ -42,7 +42,7 @@ public class StubRunnerBootEurekaExample {
/* /*
// tag::stubrunnereureka_args[] // 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.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.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) -Dstubrunner.idsToServiceIds.fraudDetectionServer=someNameThatShouldMapFraudDetectionServer (4)

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

6
spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy
View File

@@ -228,7 +228,7 @@ class DslToWireMockClientConverterSpec extends Specification {
"id":"01fbe706f872cb32", "id":"01fbe706f872cb32",
"name":"Washington", "name":"Washington",
"place_type":"city", "place_type":"city",
"url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json"
} }
}] }]
''' '''
@@ -268,7 +268,7 @@ class DslToWireMockClientConverterSpec extends Specification {
}, { }, {
"matchesJsonPath" : "$[*].['place'].['bounding_box'][?(@.['type'] == 'Polygon')]" "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)]" "matchesJsonPath" : "$[*].['place'].['bounding_box'].['coordinates'][*][*][?(@ == 38.995548)]"
}, { }, {
@@ -324,7 +324,7 @@ class DslToWireMockClientConverterSpec extends Specification {
"id":"01fbe706f872cb32", "id":"01fbe706f872cb32",
"name":"Washington", "name":"Washington",
"place_type":"city", "place_type":"city",
"url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json"
} }
}]'''), String) }]'''), String)
} }

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId> <groupId>com.example</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId> <groupId>com.example</groupId>

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy
View File

@@ -71,7 +71,7 @@ class TestSideRequestTemplateModel {
} }
private static List<String> buildPathsFromUrl(String url) { private static List<String> buildPathsFromUrl(String url) {
String fakeUrl = "http://foo.bar" + (url.startsWith("/") ? url : "/" + url) String fakeUrl = "https://foo.bar" + (url.startsWith("/") ? url : "/" + url)
List<String> paths = new URL(fakeUrl).path.split("/") as List<String> List<String> paths = new URL(fakeUrl).path.split("/") as List<String>
if (!paths.isEmpty()) { if (!paths.isEmpty()) {
paths.remove(0) paths.remove(0)

2
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy
View File

@@ -1142,7 +1142,7 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub
SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString()) SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString())
and: and:
String jsonSample = '''\ String jsonSample = '''\
String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.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,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.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); DocumentContext parsedJson = JsonPath.parse(json);
''' '''
and: and:

2
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy
View File

@@ -555,7 +555,7 @@ Contract.make {
!test.contains('REGEXP>>') !test.contains('REGEXP>>')
and: and:
String jsonSample = '''\ String jsonSample = '''\
String json = "{\\"shouldFail\\":123,\\"duck\\":\\"8\\",\\"allpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.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\\",\\"allpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.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); DocumentContext parsedJson = JsonPath.parse(json);
''' '''
and: and:

4
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy
View File

@@ -1822,7 +1822,7 @@ World.'''"""
"id":"01fbe706f872cb32", "id":"01fbe706f872cb32",
"name":"Washington", "name":"Washington",
"place_type":"city", "place_type":"city",
"url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json"
} }
}] }]
''' '''
@@ -2172,7 +2172,7 @@ World.'''"""
SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString()) SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString())
and: and:
String jsonSample = '''\ String jsonSample = '''\
String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.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,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.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); DocumentContext parsedJson = JsonPath.parse(json);
''' '''
and: and:

108
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java
View File

@@ -23,9 +23,9 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGet() throws Exception { public void simpleGet() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource.json").build(); .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"); String.class)).isEqualTo("Hello World");
server.verify(); server.verify();
} }
@@ -33,10 +33,10 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simplePutShouldFail() throws Exception { public void simplePutShouldFail() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource.json") .stubs("classpath:/mappings/resource.json")
.build(); .build();
RequestEntity<Void> postRequest = RequestEntity.post(URI.create("http://example.org/resource")) RequestEntity<Void> postRequest = RequestEntity.post(URI.create("https://example.org/resource"))
.accept(MediaType.TEXT_PLAIN) .accept(MediaType.TEXT_PLAIN)
.build(); .build();
ResponseEntity<String> response; ResponseEntity<String> response;
@@ -53,9 +53,9 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGetWithBodyFile() throws Exception { public void simpleGetWithBodyFile() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-with-body-file.json").build(); .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\"}"); String.class)).isEqualTo("{\"message\":\"Hello World\"}");
server.verify(); server.verify();
} }
@@ -63,10 +63,10 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGetWithBodyFileCustomLocation() throws Exception { public void simpleGetWithBodyFileCustomLocation() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-with-body-file.json") .stubs("classpath:/mappings/resource-with-body-file.json")
.files("classpath:/custom/").build(); .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\"}"); String.class)).isEqualTo("{\"message\":\"Hello Custom\"}");
server.verify(); server.verify();
} }
@@ -74,10 +74,10 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGetWithBodyFileCustomLocationDirectory() throws Exception { public void simpleGetWithBodyFileCustomLocationDirectory() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-with-body-file.json") .stubs("classpath:/mappings/resource-with-body-file.json")
.files("file:src/test/resources/custom").build(); .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\"}"); String.class)).isEqualTo("{\"message\":\"Hello Custom\"}");
server.verify(); server.verify();
} }
@@ -85,9 +85,9 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGetWithEmptyPath() throws Exception { public void simpleGetWithEmptyPath() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-with-empty-path.json").build(); .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"); .isEqualTo("Hello World");
server.verify(); server.verify();
} }
@@ -95,9 +95,9 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGetWithContentType() throws Exception { public void simpleGetWithContentType() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-with-content-type.json").build(); .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"); String.class)).isEqualTo("Hello World");
server.verify(); server.verify();
} }
@@ -105,9 +105,9 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simpleGetWithoutContentType() throws Exception { public void simpleGetWithoutContentType() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-without-content-type.json").build(); .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"); String.class)).isEqualTo("Hello World");
server.verify(); server.verify();
} }
@@ -115,9 +115,9 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void simplePost() throws Exception { public void simplePost() throws Exception {
MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/poster.json").build(); .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"); "greeting", String.class)).isEqualTo("Hello World");
server.verify(); server.verify();
} }
@@ -125,14 +125,14 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithHeader() throws Exception { public void postWithHeader() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // 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", .stubs("classpath:/mappings/poster.json",
"classpath:/mappings/accept.json") "classpath:/mappings/accept.json")
.build(); .build();
assertThat( assertThat(
this.restTemplate this.restTemplate
.exchange( .exchange(
RequestEntity.post(new URI("http://example.org/poster")) RequestEntity.post(new URI("https://example.org/poster"))
.accept(MediaType.TEXT_PLAIN).build(), .accept(MediaType.TEXT_PLAIN).build(),
String.class) String.class)
.getBody()).isEqualTo("Accepted World"); .getBody()).isEqualTo("Accepted World");
@@ -141,12 +141,12 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithHeaderContains() throws Exception { public void postWithHeaderContains() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // 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", .stubs("classpath:/mappings/poster.json",
"classpath:/mappings/header-contains.json") "classpath:/mappings/header-contains.json")
.build(); .build();
assertThat(this.restTemplate.exchange( 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(), .accept(MediaType.valueOf("application/v.foo")).build(),
String.class).getBody()).isEqualTo("Foo World"); String.class).getBody()).isEqualTo("Foo World");
} }
@@ -154,12 +154,12 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithHeaderMatches() throws Exception { public void postWithHeaderMatches() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // 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", .stubs("classpath:/mappings/poster.json",
"classpath:/mappings/header-matches.json") "classpath:/mappings/header-matches.json")
.build(); .build();
assertThat(this.restTemplate.exchange( 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(), .accept(MediaType.valueOf("application/v.bar")).build(),
String.class).getBody()).isEqualTo("Bar World"); String.class).getBody()).isEqualTo("Bar World");
} }
@@ -167,12 +167,12 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithMoreExactHeaderMatch() throws Exception { public void postWithMoreExactHeaderMatch() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // 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", .stubs("classpath:/mappings/header-matches.json",
"classpath:/mappings/header-matches-precise.json") "classpath:/mappings/header-matches-precise.json")
.build(); .build();
assertThat(this.restTemplate 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")) .accept(MediaType.valueOf("application/v.bar"))
.header("X-Precise", "true").build(), String.class) .header("X-Precise", "true").build(), String.class)
.getBody()).isEqualTo("Precise World"); .getBody()).isEqualTo("Precise World");
@@ -181,12 +181,12 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithMoreExactHeaderMatchButOrdered() throws Exception { public void postWithMoreExactHeaderMatchButOrdered() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // order matters... .baseUrl("https://example.org") // order matters...
.stubs("classpath:/mappings/header-matches.json", .stubs("classpath:/mappings/header-matches.json",
"classpath:/mappings/header-matches-precise.json") "classpath:/mappings/header-matches-precise.json")
.ignoreExpectOrder(false).build(); .ignoreExpectOrder(false).build();
assertThat(this.restTemplate 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")) .accept(MediaType.valueOf("application/v.bar"))
.header("X-Precise", "true").build(), String.class) .header("X-Precise", "true").build(), String.class)
.getBody()).isEqualTo("Bar World"); .getBody()).isEqualTo("Bar World");
@@ -196,28 +196,28 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void getWithPriortyOrder() throws Exception { public void getWithPriortyOrder() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/resource-with-low-priority.json", .stubs("classpath:/mappings/resource-with-low-priority.json",
"classpath:/mappings/resource-with-high-priority.json").build(); "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"); String.class)).isEqualTo("Hello High");
} }
@Test @Test
public void simpleGetWithAllStubs() throws Exception { public void simpleGetWithAllStubs() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings").build(); .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"); String.class)).isEqualTo("Hello World");
} }
@Test @Test
public void simpleGetWithAllStubsInDirectoryWithPeriod() throws Exception { public void simpleGetWithAllStubsInDirectoryWithPeriod() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/io.stubs/mappings").build(); .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"); String.class)).isEqualTo("Hello World");
} }
@@ -225,10 +225,10 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithBodyMatchingJsonPaths() throws Exception { public void postWithBodyMatchingJsonPaths() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-jsonpath.json").build(); .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)) new Things(Collections.singletonList(new Thing("RequiredThing"))), String.class))
.isEqualTo("Hello Body"); .isEqualTo("Hello Body");
} }
@@ -236,12 +236,12 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithRequestThatHasNonMatchingJsonPaths() throws Exception { public void postWithRequestThatHasNonMatchingJsonPaths() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-jsonpath.json").build(); .stubs("classpath:/mappings/body-matches-jsonpath.json").build();
String response; String response;
try { 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); new Things(Collections.singletonList(new Thing("AbsentThing"))), String.class);
} catch (AssertionError e) { } catch (AssertionError e) {
response = null; response = null;
@@ -254,11 +254,11 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithBodyMatchingXPath() throws Exception { public void postWithBodyMatchingXPath() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-xpath.json").build(); .stubs("classpath:/mappings/body-matches-xpath.json").build();
assertThat(this.restTemplate.exchange( assertThat(this.restTemplate.exchange(
RequestEntity.post(URI.create("http://example.org/body")) RequestEntity.post(URI.create("https://example.org/body"))
.contentType(MediaType.APPLICATION_XML) .contentType(MediaType.APPLICATION_XML)
.body("<things><thing><name>RequiredThing</name></thing></things>"), .body("<things><thing><name>RequiredThing</name></thing></things>"),
String.class).getBody()).isEqualTo("Hello Body"); String.class).getBody()).isEqualTo("Hello Body");
@@ -267,13 +267,13 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithRequestThatHasNonMatchingXPaths() throws Exception { public void postWithRequestThatHasNonMatchingXPaths() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-xpath.json").build(); .stubs("classpath:/mappings/body-matches-xpath.json").build();
ResponseEntity<String> response; ResponseEntity<String> response;
try { try {
response = this.restTemplate.exchange( response = this.restTemplate.exchange(
RequestEntity.post(URI.create("http://example.org/body")) RequestEntity.post(URI.create("https://example.org/body"))
.contentType(MediaType.APPLICATION_XML) .contentType(MediaType.APPLICATION_XML)
.body("<foo/>"), .body("<foo/>"),
String.class); String.class);
@@ -288,10 +288,10 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithBodyMatchingJson() throws Exception { public void postWithBodyMatchingJson() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-equaltojson.json").build(); .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)) new Things(Collections.singletonList(new Thing("RequiredThing"))), String.class))
.isEqualTo("Hello Body"); .isEqualTo("Hello Body");
} }
@@ -299,12 +299,12 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithRequestThatHasNonMatchingJson() throws Exception { public void postWithRequestThatHasNonMatchingJson() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-equaltojson.json").build(); .stubs("classpath:/mappings/body-matches-equaltojson.json").build();
String response; String response;
try { 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); new Things(Collections.singletonList(new Thing("AbsentThing"))), String.class);
} catch (AssertionError e) { } catch (AssertionError e) {
response = null; response = null;
@@ -317,11 +317,11 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithBodyMatchingXml() throws Exception { public void postWithBodyMatchingXml() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-equaltoxml.json").build(); .stubs("classpath:/mappings/body-matches-equaltoxml.json").build();
assertThat(this.restTemplate.exchange( assertThat(this.restTemplate.exchange(
RequestEntity.post(URI.create("http://example.org/body")) RequestEntity.post(URI.create("https://example.org/body"))
.contentType(MediaType.APPLICATION_XML) .contentType(MediaType.APPLICATION_XML)
.body("<things><thing><name>RequiredThing</name></thing></things>"), .body("<things><thing><name>RequiredThing</name></thing></things>"),
String.class).getBody()).isEqualTo("Hello Body"); String.class).getBody()).isEqualTo("Hello Body");
@@ -330,13 +330,13 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithRequestThatHasNonMatchingXml() throws Exception { public void postWithRequestThatHasNonMatchingXml() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-equaltoxml.json").build(); .stubs("classpath:/mappings/body-matches-equaltoxml.json").build();
ResponseEntity<String> response; ResponseEntity<String> response;
try { try {
response = this.restTemplate.exchange( response = this.restTemplate.exchange(
RequestEntity.post(URI.create("http://example.org/body")) RequestEntity.post(URI.create("https://example.org/body"))
.contentType(MediaType.APPLICATION_XML) .contentType(MediaType.APPLICATION_XML)
.body("<things><thing><name>AbsentThing</name></thing></things>"), .body("<things><thing><name>AbsentThing</name></thing></things>"),
String.class); String.class);
@@ -351,11 +351,11 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithBodyMatchingRegex() throws Exception { public void postWithBodyMatchingRegex() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-regex.json").build(); .stubs("classpath:/mappings/body-matches-regex.json").build();
assertThat(this.restTemplate.exchange( assertThat(this.restTemplate.exchange(
RequestEntity.post(URI.create("http://example.org/body")) RequestEntity.post(URI.create("https://example.org/body"))
.contentType(MediaType.APPLICATION_XML) .contentType(MediaType.APPLICATION_XML)
.body("<things><thing><name>RequiredThing</name></thing></things>"), .body("<things><thing><name>RequiredThing</name></thing></things>"),
String.class).getBody()).isEqualTo("Hello Body"); String.class).getBody()).isEqualTo("Hello Body");
@@ -364,13 +364,13 @@ public class WiremockMockServerApplicationTests {
@Test @Test
public void postWithRequestThatHasNonMatchingRegex() throws Exception { public void postWithRequestThatHasNonMatchingRegex() throws Exception {
WireMockRestServiceServer.with(this.restTemplate) // WireMockRestServiceServer.with(this.restTemplate) //
.baseUrl("http://example.org") // .baseUrl("https://example.org") //
.stubs("classpath:/mappings/body-matches-regex.json").build(); .stubs("classpath:/mappings/body-matches-regex.json").build();
ResponseEntity<String> response; ResponseEntity<String> response;
try { try {
response = this.restTemplate.exchange( response = this.restTemplate.exchange(
RequestEntity.post(URI.create("http://example.org/body")) RequestEntity.post(URI.create("https://example.org/body"))
.contentType(MediaType.APPLICATION_XML) .contentType(MediaType.APPLICATION_XML)
.body("<things><thing><name>AbsentThing</name></thing></things>"), .body("<things><thing><name>AbsentThing</name></thing></things>"),
String.class); String.class);

2
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java
View File

@@ -45,7 +45,7 @@ class Controller {
@Component @Component
class Service { class Service {
@Value("${app.baseUrl:http://example.org}") @Value("${app.baseUrl:https://example.org}")
String base; String base;
private RestTemplate restTemplate; private RestTemplate restTemplate;

2
tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy
View File

@@ -90,7 +90,7 @@ class AmqpMessagingApplicationSpec extends Specification {
Contract.make { Contract.make {
description(""" description("""
Represents scenario 2 from documentation: 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." "The input message triggers an output message."

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs.amqp</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs.amqp</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
tests/spring-cloud-contract-stub-runner-camel/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/camelService/0.0.1-SNAPSHOT/camelService-0.0.1-SNAPSHOT.pom
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>

2
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
View File

@@ -15,7 +15,7 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud.contract.verifier.stubs</groupId> <groupId>org.springframework.cloud.contract.verifier.stubs</groupId>