diff --git a/README.adoc b/README.adoc index f883e5127c..16d1df78bb 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,7 @@ and consumers, for HTTP and message-based interactions. Modules giving you the possibility to use http://wiremock.org[WireMock] with different servers by using the "ambient" server embedded in a Spring Boot application. Check out the -https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples[samples] +https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples[samples] for more details. IMPORTANT: The Spring Cloud Release Train BOM imports `spring-cloud-contract-dependencies` @@ -323,7 +323,7 @@ number of different ways, including as described above using === Spring Cloud Contract Verifier -:introduction_url: https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master +:introduction_url: https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x === Introduction @@ -352,7 +352,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] Let us assume that we have a system comprising of multiple microservices: -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/docs/src/main/asciidoc/images/Deps.png[Microservices Architecture] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/docs/src/main/asciidoc/images/Deps.png[Microservices Architecture] ===== Testing issues @@ -393,11 +393,11 @@ Disadvantages: To solve the aforementioned issues Spring Cloud Contract Verifier with Stub Runner were created. Their main idea is to give you very fast feedback, without the need to set up the whole world of microservices. -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/docs/src/main/asciidoc/images/Stubs1.png[Stubbed Services] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/docs/src/main/asciidoc/images/Stubs1.png[Stubbed Services] If you work on stubs then the only applications you need are those that your application is using directly. -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/docs/src/main/asciidoc/images/Stubs2.png[Stubbed Services] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/docs/src/main/asciidoc/images/Stubs2.png[Stubbed Services] Spring Cloud Contract Verifier gives you the certainty that the stubs that you're using were created by the service that you're calling. Also if you can use them it means that they were tested against the producer's side. In other words - you can trust those stubs. @@ -449,7 +449,7 @@ Technical remark - Fraud Detection will have artifact id `http-server`, Loan Iss Social remark - both client and server development teams need to communicate directly and discuss changes while going through the process. CDC is all about communication. -The https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-server[server side code is available here] and https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-client[the client side code here]. +The https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples/standalone/dsl/http-server[server side code is available here] and https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples/standalone/dsl/http-client[the client side code here]. TIP: In this case the ownership of the contracts lays on the producer side. It means that physically all the contract are present in the producer's repository @@ -873,28 +873,16 @@ That's because all the generated tests will extend that class. Over there you ca ---- package com.example.fraud; -import org.junit.Before; - +import com.example.fraud.FraudDetectionController; import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc; +import org.junit.Before; + public class FraudBase { @Before public void setup() { - RestAssuredMockMvc.standaloneSetup(new FraudDetectionController(), - new FraudStatsController(stubbedStatsProvider())); - } - - private StatsProvider stubbedStatsProvider() { - return fraudType -> { - switch (fraudType) { - case DRUNKS: - return 100; - case ALL: - return 200; - } - return 0; - }; + RestAssuredMockMvc.standaloneSetup(new FraudDetectionController()); } public void assertThatRejectionReasonIsNull(Object rejectionReason) { @@ -1272,7 +1260,7 @@ consumer will you break with your local changes. Let's assume that we have a producer with coordinates `com.example:server` and 3 consumers: `client1`, `client2`, `client3`. Then in the repository with common contracts you would have the following setup -(which you can checkout https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/contracts[here]: +(which you can checkout https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples/standalone/contracts[here]: [source,bash,indent=0] ---- @@ -1318,15 +1306,15 @@ Example of a `pom.xml` inside the `server` folder. org.springframework.boot spring-boot-starter-parent - 1.5.0.BUILD-SNAPSHOT + 1.4.2.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.0.BUILD-SNAPSHOT - Dalston.BUILD-SNAPSHOT + 1.0.4.BUILD-SNAPSHOT + Camden.BUILD-SNAPSHOT diff --git a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc index 9f1b2630d1..3ab5aede74 100644 --- a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc +++ b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc @@ -4,7 +4,7 @@ Modules giving you the possibility to use http://wiremock.org[WireMock] with different servers by using the "ambient" server embedded in a Spring Boot application. Check out the -https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples[samples] +https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples[samples] for more details. IMPORTANT: The Spring Cloud Release Train BOM imports `spring-cloud-contract-dependencies` diff --git a/docs/src/main/asciidoc/verifier/introduction.adoc b/docs/src/main/asciidoc/verifier/introduction.adoc index 66a20d6e1c..bba4085b06 100644 --- a/docs/src/main/asciidoc/verifier/introduction.adoc +++ b/docs/src/main/asciidoc/verifier/introduction.adoc @@ -1,4 +1,4 @@ -:introduction_url: https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master +:introduction_url: https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x === Introduction @@ -27,7 +27,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] Let us assume that we have a system comprising of multiple microservices: -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/docs/src/main/asciidoc/images/Deps.png[Microservices Architecture] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/docs/src/main/asciidoc/images/Deps.png[Microservices Architecture] ===== Testing issues @@ -68,11 +68,11 @@ Disadvantages: To solve the aforementioned issues Spring Cloud Contract Verifier with Stub Runner were created. Their main idea is to give you very fast feedback, without the need to set up the whole world of microservices. -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/docs/src/main/asciidoc/images/Stubs1.png[Stubbed Services] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/docs/src/main/asciidoc/images/Stubs1.png[Stubbed Services] If you work on stubs then the only applications you need are those that your application is using directly. -image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/docs/src/main/asciidoc/images/Stubs2.png[Stubbed Services] +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/docs/src/main/asciidoc/images/Stubs2.png[Stubbed Services] Spring Cloud Contract Verifier gives you the certainty that the stubs that you're using were created by the service that you're calling. Also if you can use them it means that they were tested against the producer's side. In other words - you can trust those stubs. @@ -124,7 +124,7 @@ Technical remark - Fraud Detection will have artifact id `http-server`, Loan Iss Social remark - both client and server development teams need to communicate directly and discuss changes while going through the process. CDC is all about communication. -The https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-server[server side code is available here] and https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-client[the client side code here]. +The https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples/standalone/dsl/http-server[server side code is available here] and https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples/standalone/dsl/http-client[the client side code here]. TIP: In this case the ownership of the contracts lays on the producer side. It means that physically all the contract are present in the producer's repository @@ -446,7 +446,7 @@ example of achieving the same by changing the properties. [source,yaml,indent=0] ---- -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/master/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/1.0.x/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml[] ---- And that's it! @@ -720,7 +720,7 @@ consumer will you break with your local changes. Let's assume that we have a producer with coordinates `com.example:server` and 3 consumers: `client1`, `client2`, `client3`. Then in the repository with common contracts you would have the following setup -(which you can checkout https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/contracts[here]: +(which you can checkout https://github.com/spring-cloud/spring-cloud-contract/tree/1.0.x/samples/standalone/contracts[here]: [source,bash,indent=0] ---- diff --git a/pom.xml b/pom.xml index a397f70e9c..0a3846b2ed 100644 --- a/pom.xml +++ b/pom.xml @@ -233,6 +233,7 @@ **/*Tests.* **/*Test.* + plain diff --git a/samples/wiremock-jetty/src/main/resources/application.properties b/samples/wiremock-jetty/src/main/resources/application.properties index e69de29bb2..1c421cf2b7 100644 --- a/samples/wiremock-jetty/src/main/resources/application.properties +++ b/samples/wiremock-jetty/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=0 \ No newline at end of file diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java index 8bc790dffa..94aff4b974 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java @@ -1,5 +1,10 @@ package com.example; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -7,7 +12,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; @@ -15,20 +19,15 @@ import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static org.assertj.core.api.Assertions.assertThat; - @ActiveProfiles("classrule") @DirtiesContext //tag::wiremock_test1[] @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@AutoConfigureWireMock public class WiremockForDocsClassRuleTests { // Start WireMock on some dynamic port + // for some reason `dynamicPort()` is not working properly @ClassRule public static WireMockClassRule wiremock = new WireMockClassRule( WireMockSpring.options().dynamicPort()); diff --git a/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java b/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java index c223a04abe..4bd913d950 100644 --- a/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java +++ b/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java @@ -15,6 +15,7 @@ import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.SocketUtils; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @@ -27,7 +28,7 @@ public class WiremockHttpsServerApplicationTests { @ClassRule public static WireMockClassRule wiremock = new WireMockClassRule( - WireMockSpring.options().httpsPort(7443)); + WireMockSpring.options().httpsPort(7443).port(SocketUtils.findAvailableTcpPort())); @Autowired private Service service; 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 f6d082651b..7328f59828 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 @@ -79,7 +79,7 @@ class StubRunnerSpringCloudEurekaAutoConfigurationSpec extends Specification { System.clearProperty("stubrunner.stubs.classifier") } - PollingConditions conditions = new PollingConditions(timeout: 40, delay: 1) + PollingConditions conditions = new PollingConditions(timeout: 240, delay: 1) def 'should make service discovery work'() { expect: 'WireMocks are running'