diff --git a/samples/samples-messaging-camel/.springBeans b/samples/samples-messaging-camel/.springBeans index 053f88a382..b74cfc29b8 100644 --- a/samples/samples-messaging-camel/.springBeans +++ b/samples/samples-messaging-camel/.springBeans @@ -7,7 +7,7 @@ - java:com.example.CamelMessagingApplication + java:com.example.fraud.CamelMessagingApplication diff --git a/samples/samples-messaging-integration/.springBeans b/samples/samples-messaging-integration/.springBeans index f74f9fabe3..34d395dc49 100644 --- a/samples/samples-messaging-integration/.springBeans +++ b/samples/samples-messaging-integration/.springBeans @@ -7,7 +7,7 @@ - java:com.example.IntegrationMessagingApplication + java:com.example.fraud.IntegrationMessagingApplication diff --git a/samples/samples-messaging-spring/.springBeans b/samples/samples-messaging-spring/.springBeans index 46e2233a4e..1307180635 100644 --- a/samples/samples-messaging-spring/.springBeans +++ b/samples/samples-messaging-spring/.springBeans @@ -7,7 +7,7 @@ - java:com.example.SpringMessagingApplication + java:com.example.fraud.SpringMessagingApplication diff --git a/samples/samples-messaging-stream/.springBeans b/samples/samples-messaging-stream/.springBeans index afe5f5aa9d..09593a31a7 100644 --- a/samples/samples-messaging-stream/.springBeans +++ b/samples/samples-messaging-stream/.springBeans @@ -7,7 +7,7 @@ - java:com.example.StreamMessagingApplication + java:com.example.fraud.StreamMessagingApplication diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index f914c6c111..8413a08877 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -66,6 +66,11 @@ spring-cloud-contract-stub-runner-boot ${project.version} + + org.springframework.cloud.contract + spring-cloud-contract-stub-runner-stream + ${project.version} + org.springframework.cloud.contract spring-cloud-contract-verifier-messaging-core @@ -125,6 +130,11 @@ + + com.jayway.restassured + spring-mock-mvc + 2.9.0 + com.toomuchcoding.jsonassert jsonassert diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle index 6721b1cd9c..fb3d56e58d 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url "http://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.3.5.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT" } } @@ -32,10 +32,7 @@ dependencyManagement { } dependencies { - compile("org.springframework.boot:spring-boot-starter-web") { - exclude module: "spring-boot-starter-tomcat" - } - compile("org.springframework.boot:spring-boot-starter-jetty") + compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-actuator") compile("org.springframework.cloud:spring-cloud-starter-stream-rabbit") diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/pom.xml b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/pom.xml index 6127eec4c3..626732706a 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/pom.xml +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.BUILD-SNAPSHOT @@ -38,13 +38,19 @@ org.springframework.cloud.contract spring-cloud-contract-stub-runner-stream - ${spring-cloud-contract-verifier.version} test + + org.springframework.cloud.contract + spring-cloud-contract-dependencies + ${spring-cloud-contract.version} + pom + import + org.springframework.cloud spring-cloud-dependencies diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/org/springframework/cloud/stream/verifier/sample/sink/ContractVerifierSampleStreamSinkApplication.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java similarity index 91% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/org/springframework/cloud/stream/verifier/sample/sink/ContractVerifierSampleStreamSinkApplication.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java index 75ced70b0e..452c496a33 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/org/springframework/cloud/stream/verifier/sample/sink/ContractVerifierSampleStreamSinkApplication.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.stream.verifier.sample.sink; +package com.example.sink; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/org/springframework/cloud/stream/verifier/sample/sink/SensorData.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java similarity index 93% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/org/springframework/cloud/stream/verifier/sample/sink/SensorData.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java index 6cd7f84e28..dcf51ab3ba 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/org/springframework/cloud/stream/verifier/sample/sink/SensorData.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.verifier.sample.sink; +package com.example.sink; /** * @author Marius Bogoevici diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/org/springframework/cloud/stream/verifier/sample/sink/ContractVerifierSampleStreamSinkApplicationTests.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java similarity index 82% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/org/springframework/cloud/stream/verifier/sample/sink/ContractVerifierSampleStreamSinkApplicationTests.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java index 8523a76b78..6c0d0234ce 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/org/springframework/cloud/stream/verifier/sample/sink/ContractVerifierSampleStreamSinkApplicationTests.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java @@ -1,10 +1,12 @@ -package org.springframework.cloud.stream.verifier.sample.sink; +package com.example.sink; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.example.sink.ContractVerifierSampleStreamSinkApplication; + @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = ContractVerifierSampleStreamSinkApplication.class) public class ContractVerifierSampleStreamSinkApplicationTests { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/org/springframework/cloud/stream/verifier/sample/sink/MessageConsumedTests.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java similarity index 93% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/org/springframework/cloud/stream/verifier/sample/sink/MessageConsumedTests.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java index b5e9b94af2..2df2796550 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/org/springframework/cloud/stream/verifier/sample/sink/MessageConsumedTests.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.verifier.sample.sink; +package com.example.sink; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,6 +25,8 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.contract.stubrunner.StubTrigger; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.example.sink.ContractVerifierSampleStreamSinkApplication; + /** * @author Marius Bogoevici */ diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle index 410d605af7..a11184022f 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "http://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.3.5.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT" classpath "org.springframework.cloud.contract:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } @@ -41,15 +41,12 @@ ext { } contractVerifier { - baseClassForTests = 'org.springframework.cloud.stream.sample.verifier.source.SensorSourceTestBase' + baseClassForTests = 'com.example.source.SensorSourceTestBase' stubsOutputDir = stubsOutputDirRoot } dependencies { - compile("org.springframework.boot:spring-boot-starter-web") { - exclude module: "spring-boot-starter-tomcat" - } - compile("org.springframework.boot:spring-boot-starter-jetty") + compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-actuator") compile("org.springframework.cloud:spring-cloud-starter-stream-rabbit") compile("org.springframework.cloud.contract:spring-cloud-contract-verifier-stream:${findProperty('verifierVersion') ?: verifierVersion}") diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/pom.xml b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/pom.xml index 2f506b4858..0bba647ebc 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/pom.xml +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/pom.xml @@ -14,15 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT + 1.0.0.BUILD-SNAPSHOT @@ -40,27 +39,31 @@ org.springframework.cloud.contract spring-cloud-contract-verifier-core - ${spring-cloud-contract-verifier.version} test org.springframework.cloud.contract spring-cloud-contract-verifier-stream - ${spring-cloud-contract-verifier.version} test org.assertj assertj-core - 2.4.1 test + + org.springframework.cloud.contract + spring-cloud-contract-dependencies + ${spring-cloud-contract.version} + pom + import + org.springframework.cloud spring-cloud-dependencies @@ -80,17 +83,17 @@ org.springframework.cloud.contract spring-cloud-contract-verifier-maven-plugin - ${spring-cloud-contract-verifier-maven-plugin.version} + ${spring-cloud-contract.version} true - org.springframework.cloud.stream.sample.verifier.source.SensorSourceTestBase + com.example.source.SensorSourceTestBase org.springframework.cloud.contract spring-cloud-contract-verifier-core - ${spring-cloud-contract-verifier.version} + ${spring-cloud-contract.version} @@ -101,6 +104,36 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-maven-plugin + [1.0.0.BUILD-SNAPSHOT,) + + convert + generateTests + + + + + + + + + + + + diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/org/springframework/cloud/stream/sample/verifier/source/ContractVerifierSampleStreamSourceApplication.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java similarity index 92% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/org/springframework/cloud/stream/sample/verifier/source/ContractVerifierSampleStreamSourceApplication.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java index 2fca9839a2..da39f43082 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/org/springframework/cloud/stream/sample/verifier/source/ContractVerifierSampleStreamSourceApplication.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.stream.sample.verifier.source; +package com.example.source; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/org/springframework/cloud/stream/sample/verifier/source/ContractVerifierSampleStreamSourceApplicationTests.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java similarity index 81% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/org/springframework/cloud/stream/sample/verifier/source/ContractVerifierSampleStreamSourceApplicationTests.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java index d3c5a1a13c..24e2bc2173 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/org/springframework/cloud/stream/sample/verifier/source/ContractVerifierSampleStreamSourceApplicationTests.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java @@ -1,10 +1,12 @@ -package org.springframework.cloud.stream.sample.verifier.source; +package com.example.source; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.example.source.ContractVerifierSampleStreamSourceApplication; + @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = ContractVerifierSampleStreamSourceApplication.class) public class ContractVerifierSampleStreamSourceApplicationTests { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/org/springframework/cloud/stream/sample/verifier/source/SensorSourceTestBase.java b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java similarity index 93% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/org/springframework/cloud/stream/sample/verifier/source/SensorSourceTestBase.java rename to spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java index 838452cd1b..82c270161f 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/org/springframework/cloud/stream/sample/verifier/source/SensorSourceTestBase.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.sample.verifier.source; +package com.example.source; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +22,8 @@ import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.example.source.ContractVerifierSampleStreamSourceApplication; + /** * Base class for sensor autogenerated tests (used by Spring Cloud Contract). * diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle index 43c398e2d0..d8163c669e 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle @@ -6,11 +6,11 @@ buildscript { maven { url "http://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.3.5.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT" } } -group = 'org.springframework.cloud.contract.testprojects' +group = 'com.example' version = '0.0.1-SNAPSHOT' repositories { @@ -26,10 +26,7 @@ apply plugin: 'spring-boot' apply plugin: 'maven-publish' dependencies { - compile("org.springframework.boot:spring-boot-starter-web") { - exclude module: "spring-boot-starter-tomcat" - } - compile("org.springframework.boot:spring-boot-starter-jetty") + compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-actuator") testRuntime "org.spockframework:spock-spring" diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/pom.xml b/spring-cloud-contract-verifier-standalone-test-samples/http-client/pom.xml index a0ad75fce3..3a76b94ba0 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/pom.xml +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/pom.xml @@ -1,187 +1,191 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.springframework.cloud.contract.testprojects - http-client - 0.0.1-SNAPSHOT + com.example + http-client + 0.0.1-SNAPSHOT - Spring Cloud Contract Verifier Http Client Sample - Spring Cloud Contract Verifier Http Client Sample + Spring Cloud Contract Verifier Http Client Sample + Spring Cloud Contract Verifier Http Client Sample - - org.springframework.boot - spring-boot-starter-parent - 1.3.5.RELEASE - - + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.BUILD-SNAPSHOT + + - - UTF-8 - 1.8 - 1.0.0.BUILD-SNAPSHOT - + + UTF-8 + 1.8 + 1.0.0.BUILD-SNAPSHOT + - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-actuator - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + - - org.springframework.boot - spring-boot-starter-test - test - + + org.springframework.cloud.contract + spring-cloud-contract-wiremock + test + + + org.springframework.boot + spring-boot-starter-test + test + - - org.springframework.cloud.contract - spring-cloud-contract-stub-runner-spring - ${spring-cloud-contract-verifier.version} - test - - - org.spockframework - spock-spring - test - + + org.springframework.cloud.contract + spring-cloud-contract-stub-runner-spring + test + + + org.spockframework + spock-spring + test + - + + + + + org.springframework.cloud.contract + spring-cloud-contract-dependencies + ${spring-cloud-contract.version} + pom + import + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.codehaus.gmavenplus - gmavenplus-plugin - 1.5 - - - - testCompile - - - - - - - ${project.basedir}/src/test/groovy - - **/*.groovy - - - - ${project.build.directory}/generated-test-sources/accurest - - **/*.groovy - - - - - - - maven-surefire-plugin - 2.19.1 - - - **/*Spec.java - - - - - maven-deploy-plugin - - true - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.5 + + + + testCompile + + + + + + + ${project.basedir}/src/test/groovy + + **/*.groovy + + + + ${project.build.directory}/generated-test-sources/accurest + + **/*.groovy + + + + + + + maven-surefire-plugin + + + **/*Spec.java + + + + + maven-deploy-plugin + + true + + + + - - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-plugin-snapshots - Spring Snapshots - http://repo.spring.io/plugins-snapshot-local - - true - - - - spring-plugin-milestones - Spring Milestones - http://repo.spring.io/plugins-milestone-local - - false - - - - - + + + spring + + true + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-plugin-snapshots + Spring Snapshots + http://repo.spring.io/plugins-snapshot-local + + true + + + + spring-plugin-milestones + Spring Milestones + http://repo.spring.io/plugins-milestone-local + + false + + + + + diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/Application.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/Application.java similarity index 82% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/Application.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/Application.java index bd0b4354b3..6f36301172 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/Application.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/Application.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection; +package com.example.loan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/LoanApplicationService.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/LoanApplicationService.java similarity index 77% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/LoanApplicationService.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/LoanApplicationService.java index 3e6c4612a3..c6ee01aa2d 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/LoanApplicationService.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/LoanApplicationService.java @@ -1,11 +1,5 @@ -package org.springframework.cloud.contract.frauddetection; +package com.example.loan; -import org.springframework.cloud.contract.frauddetection.model.FraudCheckStatus; -import org.springframework.cloud.contract.frauddetection.model.FraudServiceRequest; -import org.springframework.cloud.contract.frauddetection.model.FraudServiceResponse; -import org.springframework.cloud.contract.frauddetection.model.LoanApplicationResult; -import org.springframework.cloud.contract.frauddetection.model.LoanApplication; -import org.springframework.cloud.contract.frauddetection.model.LoanApplicationStatus; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -13,6 +7,13 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import com.example.loan.model.FraudCheckStatus; +import com.example.loan.model.FraudServiceRequest; +import com.example.loan.model.FraudServiceResponse; +import com.example.loan.model.LoanApplication; +import com.example.loan.model.LoanApplicationResult; +import com.example.loan.model.LoanApplicationStatus; + @Service public class LoanApplicationService { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/Client.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/Client.java similarity index 71% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/Client.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/Client.java index da99caabff..c93978173b 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/Client.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/Client.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.loan.model; public class Client { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java new file mode 100644 index 0000000000..c5217ef471 --- /dev/null +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java @@ -0,0 +1,5 @@ +package com.example.loan.model; + +public enum FraudCheckStatus { + OK, FRAUD +} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudServiceRequest.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java similarity index 90% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudServiceRequest.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java index fca478dbae..2a39aa0a5f 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudServiceRequest.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.loan.model; import java.math.BigDecimal; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudServiceResponse.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java similarity index 88% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudServiceResponse.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java index 9093492eea..50e64478b9 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudServiceResponse.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.loan.model; public class FraudServiceResponse { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplication.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplication.java similarity index 89% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplication.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplication.java index ae4f4d1696..a4c9212c0e 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplication.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.loan.model; import java.math.BigDecimal; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplicationResult.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java similarity index 92% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplicationResult.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java index 89db3c993a..ffd44e1a26 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplicationResult.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.loan.model; public class LoanApplicationResult { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplicationStatus.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java similarity index 55% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplicationStatus.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java index 54a3f2255c..34cf91a89f 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/LoanApplicationStatus.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.loan.model; public enum LoanApplicationStatus { LOAN_APPLIED, LOAN_APPLICATION_REJECTED diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckStatus.java b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckStatus.java deleted file mode 100644 index f0b2785556..0000000000 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.cloud.contract.frauddetection.model; - -public enum FraudCheckStatus { - OK, FRAUD -} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/org/springframework/cloud/contract/LoanApplicationServiceSpec.groovy b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy similarity index 61% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/org/springframework/cloud/contract/LoanApplicationServiceSpec.groovy rename to spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy index 1388c3f723..bd5a0b7332 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/org/springframework/cloud/contract/LoanApplicationServiceSpec.groovy +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy @@ -1,17 +1,17 @@ -package org.springframework.cloud.contract +package com.example.loan -import org.springframework.cloud.contract.frauddetection.Application -import org.springframework.cloud.contract.frauddetection.LoanApplicationService -import org.springframework.cloud.contract.frauddetection.model.Client -import org.springframework.cloud.contract.frauddetection.model.LoanApplication -import org.springframework.cloud.contract.frauddetection.model.LoanApplicationResult -import org.springframework.cloud.contract.frauddetection.model.LoanApplicationStatus import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.SpringApplicationContextLoader +import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.test.context.ContextConfiguration + import spock.lang.Specification -@ContextConfiguration(loader = SpringApplicationContextLoader, classes = Application) +import com.example.loan.model.Client +import com.example.loan.model.LoanApplication +import com.example.loan.model.LoanApplicationResult +import com.example.loan.model.LoanApplicationStatus + +@ContextConfiguration(loader = SpringBootContextLoader, classes = Application) class LoanApplicationServiceSpec extends Specification { @Autowired diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/resources/application.yaml b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/resources/application.yaml index 37250e3d43..8f1dbbd48a 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/resources/application.yaml +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/resources/application.yaml @@ -1,3 +1,3 @@ stubrunner: work-offline: true - stubs.ids: 'org.springframework.cloud.contract.testprojects:http-server:+:stubs:8080' + stubs.ids: 'com.example:http-server:+:stubs:8080' diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle index 7425ad2cb3..63d462783c 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle @@ -9,12 +9,12 @@ buildscript { maven { url 'http://repo.spring.io/plugins-snapshot' } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.3.5.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT" classpath "org.springframework.cloud.contract:spring-cloud-contract-verifier-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } -group = 'org.springframework.cloud.contract.testprojects' +group = 'com.example' version = '0.0.1-SNAPSHOT' repositories { @@ -38,10 +38,7 @@ contractVerifier { } dependencies { - compile("org.springframework.boot:spring-boot-starter-web") { - exclude module: "spring-boot-starter-tomcat" - } - compile("org.springframework.boot:spring-boot-starter-jetty") + compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-actuator") testRuntime "org.spockframework:spock-spring" diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/pom.xml b/spring-cloud-contract-verifier-standalone-test-samples/http-server/pom.xml index 14c40c626f..2940bef78e 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/pom.xml +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/pom.xml @@ -1,174 +1,202 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.springframework.cloud.contract.testprojects - http-server - 0.0.1-SNAPSHOT + com.example + http-server + 0.0.1-SNAPSHOT - Spring Cloud Contract Verifier Http Server Sample - Spring Cloud Contract Verifier Http Server Sample + Spring Cloud Contract Verifier Http Server Sample + Spring Cloud Contract Verifier Http Server Sample - - org.springframework.boot - spring-boot-starter-parent - 1.3.5.RELEASE - - + + org.springframework.boot + spring-boot-starter-parent + 1.4.0.BUILD-SNAPSHOT + + - - UTF-8 - 1.8 - 1.0.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT - + + UTF-8 + 1.8 + 1.0.0.BUILD-SNAPSHOT + - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-actuator - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + - - org.springframework.boot - spring-boot-starter-test - test - + + org.springframework.boot + spring-boot-starter-test + test + - - - com.jayway.restassured - spring-mock-mvc - 2.9.0 - test - - - com.toomuchcoding.jsonassert - jsonassert - 0.4.7 - test - - - org.assertj - assertj-core - 3.4.1 - test - - + + + com.jayway.restassured + spring-mock-mvc + test + + + com.jayway.restassured + spring-mock-mvc + test + + + com.toomuchcoding.jsonassert + jsonassert + test + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-maven-plugin - ${spring-cloud-contract-verifier-maven-plugin.version} - true - - org.springframework.cloud.MvcTest - - - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-core - ${spring-cloud-contract-verifier.version} - - - - - maven-deploy-plugin - - true - - - - + + + + org.springframework.cloud.contract + spring-cloud-contract-dependencies + ${spring-cloud-contract.version} + pom + import + + + - - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-plugin-snapshots - Spring Snapshots - http://repo.spring.io/plugins-snapshot-local - - true - - - - spring-plugin-milestones - Spring Milestones - http://repo.spring.io/plugins-milestone-local - - false - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-maven-plugin + ${spring-cloud-contract.version} + true + + com.example.fraud.MvcTest + + + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-core + ${spring-cloud-contract.version} + + + + + maven-deploy-plugin + + true + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-maven-plugin + [1.0.0.BUILD-SNAPSHOT,) + + convert + generateTests + + + + + + + + + + + + + + + + + spring + + true + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-plugin-snapshots + Spring Snapshots + http://repo.spring.io/plugins-snapshot-local + + true + + + + spring-plugin-milestones + Spring Milestones + http://repo.spring.io/plugins-milestone-local + + false + + + + + diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/Application.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/Application.java similarity index 87% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/Application.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/Application.java index 5225f208ac..9117009b09 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/Application.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/Application.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection; +package com.example.fraud; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/FraudDetectionController.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/FraudDetectionController.java similarity index 79% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/FraudDetectionController.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/FraudDetectionController.java index ac529f2cf1..7a7a46bc4d 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/FraudDetectionController.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/FraudDetectionController.java @@ -1,13 +1,13 @@ -package org.springframework.cloud.contract.frauddetection; - -import org.springframework.cloud.contract.frauddetection.model.FraudCheck; -import org.springframework.cloud.contract.frauddetection.model.FraudCheckResult; -import org.springframework.cloud.contract.frauddetection.model.FraudCheckStatus; +package com.example.fraud; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.example.fraud.model.FraudCheck; +import com.example.fraud.model.FraudCheckResult; +import com.example.fraud.model.FraudCheckStatus; + import java.math.BigDecimal; import static org.springframework.web.bind.annotation.RequestMethod.PUT; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheck.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheck.java similarity index 87% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheck.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheck.java index d7f84b28bc..5eb393c178 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheck.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheck.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.fraud.model; import java.math.BigDecimal; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckResult.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java similarity index 91% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckResult.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java index ab033ef693..60b340276a 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckResult.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.contract.frauddetection.model; +package com.example.fraud.model; public class FraudCheckResult { diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java new file mode 100644 index 0000000000..5a6adcf274 --- /dev/null +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java @@ -0,0 +1,5 @@ +package com.example.fraud.model; + +public enum FraudCheckStatus { + OK, FRAUD +} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckStatus.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckStatus.java deleted file mode 100644 index f0b2785556..0000000000 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/org/springframework/cloud/contract/frauddetection/model/FraudCheckStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.cloud.contract.frauddetection.model; - -public enum FraudCheckStatus { - OK, FRAUD -} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/groovy/org/springframework/cloud/MvcSpec.groovy b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/groovy/org/springframework/cloud/MvcSpec.groovy deleted file mode 100644 index 6a9ffb8950..0000000000 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/groovy/org/springframework/cloud/MvcSpec.groovy +++ /dev/null @@ -1,15 +0,0 @@ -package com.toomuchcoding - -import org.springframework.cloud.contract.frauddetection.FraudDetectionController -import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc -import spock.lang.Specification - -class MvcSpec extends Specification { - def setup() { - RestAssuredMockMvc.standaloneSetup(new FraudDetectionController()) - } - - void assertThatRejectionReasonIsNull(def rejectionReason) { - assert !rejectionReason - } -} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/org/springframework/cloud/MvcTest.java b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/com/example/fraud/MvcTest.java similarity index 73% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/org/springframework/cloud/MvcTest.java rename to spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/com/example/fraud/MvcTest.java index d508c79025..deb787523d 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/org/springframework/cloud/MvcTest.java +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/com/example/fraud/MvcTest.java @@ -1,7 +1,7 @@ -package org.springframework.cloud; +package com.example.fraud; +import com.example.fraud.FraudDetectionController; import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc; -import org.springframework.cloud.contract.frauddetection.FraudDetectionController; import org.junit.Before; diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy index 5dd0aae07f..8bb47a08b2 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy @@ -22,7 +22,7 @@ org.springframework.cloud.contract.spec.Contract.make { "rejectionReason": "Amount too high" }""") headers { - header('Content-Type': 'application/vnd.fraud.v1+json') + header('Content-Type': value(server(regex('application/vnd.fraud.v1.json.*')), client('application/vnd.fraud.v1+json'))) } } diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy index e142c47d0e..c0c6417bef 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy +++ b/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy @@ -23,7 +23,7 @@ org.springframework.cloud.contract.spec.Contract.make { rejectionReason: $(client(null), server(execute('assertThatRejectionReasonIsNull($it)'))) ) headers { - header('Content-Type': 'application/vnd.fraud.v1+json') + header('Content-Type': value(test(regex('application/vnd.fraud.v1.json.*')), stub('application/vnd.fraud.v1+json'))) } } diff --git a/spring-cloud-contract-verifier-standalone-test-samples/pom.xml b/spring-cloud-contract-verifier-standalone-test-samples/pom.xml index c93d90cb7e..e3a5249bb2 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/pom.xml +++ b/spring-cloud-contract-verifier-standalone-test-samples/pom.xml @@ -4,12 +4,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.springframework.cloud spring-cloud-contract-samples 1.0.0-SNAPSHOT