From 5f04ebdbd89ec5a2c7972f8943795a6e44ff5c34 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 29 Jun 2016 19:02:51 +0200 Subject: [PATCH] Updated the plugin according to new Contract naming --- .../cloud/contract/verifier/maven/GenerateTestsMojo.java | 2 +- .../basic/src/test/resources/contracts/Messaging.groovy | 2 +- .../projects/basic/src/test/resources/contracts/Sample.groovy | 2 +- .../src/test/contracts/brokenContract.groovy | 2 +- .../src/test/contracts/shouldMarkClientAsFraud.groovy | 2 +- .../src/test/contracts/shouldMarkClientAsNotFraud.groovy | 2 +- .../generatedStubs/target/stubs/contracts/Sample.groovy | 2 +- .../src/test/resources/contracts/greetings_ok.groovy | 2 +- .../resources/contracts/greetings_with_default_value.groovy | 2 +- .../src/test/projects/pomless/Sample.groovy | 2 +- .../src/test/resources/contracts/greetings_ok.groovy | 2 +- .../resources/contracts/greetings_with_default_value.groovy | 2 +- .../src/test/resources/contracts/greetings_ok.groovy | 2 +- .../resources/contracts/greetings_with_default_value.groovy | 2 +- .../projects/withStubs/src/test/resources/stubs/Sample.groovy | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java b/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java index d3a051961d..ddd78f7c2d 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java +++ b/spring-cloud-contract-verifier-maven-plugin/src/main/java/org/springframework/cloud/contract/verifier/maven/GenerateTestsMojo.java @@ -27,7 +27,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.springframework.cloud.contract.verifier.ContractVerifierException; +import org.springframework.cloud.contract.spec.ContractVerifierException; import org.springframework.cloud.contract.verifier.TestGenerator; import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties; import org.springframework.cloud.contract.verifier.config.TestFramework; diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Messaging.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Messaging.groovy index 60ff2c083a..b21f448049 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Messaging.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Messaging.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { label 'some_label' input { messageFrom('jms:input') diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Sample.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Sample.groovy index 8b10943730..094820225b 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Sample.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/basic/src/test/resources/contracts/Sample.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method 'POST' url('/users') { diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/brokenContract.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/brokenContract.groovy index 22b6f23bc6..48435cb1a2 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/brokenContract.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/brokenContract.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url '/fraudcheck' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsFraud.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsFraud.groovy index 315fc317f9..9cd6dec8b1 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsFraud.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsFraud.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method """PUT""" url """/fraudcheck""" diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsNotFraud.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsNotFraud.groovy index a85b6b2737..92b2646567 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsNotFraud.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/complex-configuration/src/test/contracts/shouldMarkClientAsNotFraud.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url '/fraudcheck' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy index b716f77dec..fb8ef5908e 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/generatedStubs/target/stubs/contracts/Sample.groovy @@ -1,4 +1,4 @@ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method 'POST' url('/users') { diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_ok.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_ok.groovy index 4fecfabb2e..4a5d9a792f 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_ok.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_ok.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { priority 2 request { method 'GET' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_with_default_value.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_with_default_value.groovy index f2412db397..5b65b65ca7 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_with_default_value.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/plugin-extension/src/test/resources/contracts/greetings_with_default_value.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { priority 2 request { method 'GET' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/pomless/Sample.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/pomless/Sample.groovy index 8b10943730..094820225b 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/pomless/Sample.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/pomless/Sample.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method 'POST' url('/users') { diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_ok.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_ok.groovy index e96a275e8f..e782af7b50 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_ok.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_ok.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { priority 2 request { method 'GET' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_with_default_value.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_with_default_value.groovy index 41ae428a8e..ad5e45965c 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_with_default_value.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-groovy/src/test/resources/contracts/greetings_with_default_value.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { priority 2 request { method 'GET' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_ok.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_ok.groovy index 4fecfabb2e..4a5d9a792f 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_ok.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_ok.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { priority 2 request { method 'GET' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_with_default_value.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_with_default_value.groovy index f2412db397..5b65b65ca7 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_with_default_value.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/spring-boot-java/src/test/resources/contracts/greetings_with_default_value.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { priority 2 request { method 'GET' diff --git a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy index 8b10943730..094820225b 100644 --- a/spring-cloud-contract-verifier-maven-plugin/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy +++ b/spring-cloud-contract-verifier-maven-plugin/src/test/projects/withStubs/src/test/resources/stubs/Sample.groovy @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { request { method 'POST' url('/users') {