diff --git a/docs/src/main/asciidoc/verifier_faq.adoc b/docs/src/main/asciidoc/verifier_faq.adoc index e061ee3306..2c17140c21 100644 --- a/docs/src/main/asciidoc/verifier_faq.adoc +++ b/docs/src/main/asciidoc/verifier_faq.adoc @@ -329,7 +329,7 @@ include::{introduction_url}/spring-cloud-contract-tools/spring-cloud-contract-ma ---- With this setup the JAR with groupid `com.example.standalone` and artifactid `contracts` will be downloaded -from `http://link/to/your/nexus/or/artifactory/or/sth`. It will be then unpacked in a local temporary folder +from `https://link/to/your/nexus/or/artifactory/or/sth`. It will be then unpacked in a local temporary folder and contracts present under the `com/example/server` will be picked as the ones used to generate the tests and the stubs. Due to this convention the producer team will know which consumer teams will be broken when some incompatible changes are done. @@ -357,7 +357,7 @@ allows us to do that. Also ```contractsPath``` need to be specified since the de ${spring-cloud-contract.version} REMOTE - http://link/to/your/nexus/or/artifactory/or/sth + https://link/to/your/nexus/or/artifactory/or/sth com.example common-repo-with-contracts diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/PatternValueDslProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/PatternValueDslProperty.groovy index 17d3e18c85..544dbfc45f 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/PatternValueDslProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/PatternValueDslProperty.groovy @@ -109,7 +109,7 @@ abstract class PatternValueDslProperty implements RegexCr @Override T anyHostname() { - return createAndValidateProperty(RegexPatterns.HOSTNAME_PATTERN, "http://foo" + return createAndValidateProperty(RegexPatterns.HOSTNAME_PATTERN, "https://foo" + this.random. nextInt() + ".com") @@ -125,7 +125,7 @@ abstract class PatternValueDslProperty implements RegexCr @Override T anyUrl() { - return createAndValidateProperty(RegexPatterns.URL, "http://foo" + return createAndValidateProperty(RegexPatterns.URL, "https://foo" + this.random. nextInt() + ".com") diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy index 67af92ffc9..85a94fe9fe 100644 --- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy +++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy @@ -102,7 +102,7 @@ class RegexPatternsSpec extends Specification { 'https://../' || false 'http://?' || false 'http://??' || false - 'http://??/' || false + 'https://??/' || false 'http://#' || false 'http://##' || false 'http://##/' || false @@ -111,7 +111,7 @@ class RegexPatternsSpec extends Specification { '//a' || false '///a' || false '///' || false - 'http:///a' || false + 'https:///a' || false 'rdar://1234' || false 'h://test' || false 'http:// shouldfail.com' || false @@ -122,7 +122,7 @@ class RegexPatternsSpec extends Specification { 'https://a.b-.co' || false 'https://1.1.1.1.1' || false 'https://123.123.123' || false - 'http://3628126748' || false + 'https://3628126748' || false 'https://.www.foo.bar/' || false 'https://www.foo.bar./' || false 'https://.www.foo.bar./' || false diff --git a/spring-cloud-contract-stub-runner/README.adoc b/spring-cloud-contract-stub-runner/README.adoc index d13c12b64f..96c3cc8428 100644 --- a/spring-cloud-contract-stub-runner/README.adoc +++ b/spring-cloud-contract-stub-runner/README.adoc @@ -257,7 +257,7 @@ and for the JUnit approach like this: [source,java] ---- @ClassRule @Shared StubRunnerRule rule = new StubRunnerRule() - .repoRoot("http://some_url") + .repoRoot("https://some_url") .downloadStub("a.b.c", "loanIssuance") .downloadStub("a.b.c:fraudDetectionServer") .withMappingsOutputFolder("target/outputmappings") diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy index bc5964fc20..49b46571db 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy @@ -72,8 +72,8 @@ class StubRunnerSpringCloudAutoConfigurationSpec extends Specification { "${stubFinder.findStubUrl('loanIssuance').toString()}/name".toURL().text == 'loanIssuance' "${stubFinder.findStubUrl('fraudDetectionServer').toString()}/name".toURL().text == 'fraudDetectionServer' and: 'Stubs can be reached via load service discovery' - restTemplate.getForObject('http://loanIssuance/name', String) == 'loanIssuance' - restTemplate.getForObject('http://someNameThatShouldMapFraudDetectionServer/name', String) == 'fraudDetectionServer' + restTemplate.getForObject('https://loanIssuance/name', String) == 'loanIssuance' + restTemplate.getForObject('https://someNameThatShouldMapFraudDetectionServer/name', String) == 'fraudDetectionServer' } // end::test[] diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java index 88437954e9..8e81372521 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java @@ -266,7 +266,7 @@ public class WireMockSnippetTests { @Override public URI getUri() { - return URI.create("http://foo/bar"); + return URI.create("https://foo/bar"); } @Override @@ -314,7 +314,7 @@ public class WireMockSnippetTests { @Override public URI getUri() { - return URI.create("http://foo/bar"); + return URI.create("https://foo/bar"); } @Override @@ -362,7 +362,7 @@ public class WireMockSnippetTests { @Override public URI getUri() { - return URI.create("http://foo/bar"); + return URI.create("https://foo/bar"); } @Override @@ -409,7 +409,7 @@ public class WireMockSnippetTests { @Override public URI getUri() { - return URI.create("http://foo/bar"); + return URI.create("https://foo/bar"); } @Override @@ -458,7 +458,7 @@ public class WireMockSnippetTests { @Override public URI getUri() { - return URI.create("http://foo/bar?myParam="); + return URI.create("https://foo/bar?myParam="); } @Override diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy index 7d4b9d950f..b623a6a7df 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy @@ -97,9 +97,9 @@ class StubRunnerSpringCloudEurekaAutoConfigurationSpec extends Specification { "${stubFinder.findStubUrl('fraudDetectionServer').toString()}/name".toURL().text == 'fraudDetectionServer' and: 'Stubs can be reached via load service discovery' conditions.eventually { - assert restTemplate.getForObject('http://loanIssuance/name', String) == 'loanIssuance' + assert restTemplate.getForObject('https://loanIssuance/name', String) == 'loanIssuance' } - restTemplate.getForObject('http://someNameThatShouldMapFraudDetectionServer/name', String) == 'fraudDetectionServer' + restTemplate.getForObject('https://someNameThatShouldMapFraudDetectionServer/name', String) == 'fraudDetectionServer' } @Configuration diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfigurationSpec.groovy b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfigurationSpec.groovy index 6905f8a450..f8cf3aff1f 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfigurationSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfigurationSpec.groovy @@ -75,8 +75,8 @@ class StubRunnerSpringCloudZookeeperAutoConfigurationSpec extends Specification "${stubFinder.findStubUrl('loanIssuance').toString()}/name".toURL().text == 'loanIssuance' "${stubFinder.findStubUrl('fraudDetectionServer').toString()}/name".toURL().text == 'fraudDetectionServer' and: 'Stubs can be reached via load service discovery' - restTemplate.getForObject('http://loanIssuance/name', String) == 'loanIssuance' - restTemplate.getForObject('http://someNameThatShouldMapFraudDetectionServer/name', String) == 'fraudDetectionServer' + restTemplate.getForObject('https://loanIssuance/name', String) == 'loanIssuance' + restTemplate.getForObject('https://someNameThatShouldMapFraudDetectionServer/name', String) == 'fraudDetectionServer' } def 'should have all apps registered in Service Discovery'() {