From 8f37b1823dc2f5716a9f1b636b8cc0c606e0e521 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 29 Jun 2016 18:59:44 +0200 Subject: [PATCH] Big refactoring moved the contract to the spec modules changed the package of the contract fixed a couple of bugs related to stream messaging fixed a bug related to not copying of contracts via Gradle --- docs/src/main/asciidoc/contract.adoc | 6 +- samples/samples-messaging-camel/build.gradle | 12 -- .../CamelMessagingApplicationSpec.groovy | 2 +- .../build.gradle | 12 -- ...IntegrationMessagingApplicationSpec.groovy | 2 +- .../spring/SpringApplicationSpec.groovy | 2 +- .../StreamMessagingApplicationSpec.groovy | 2 +- settings.gradle | 2 + .../cloud/contract/spec}/Contract.groovy | 10 +- .../spec}/ContractVerifierException.groovy | 2 +- .../cloud/contract/spec}/internal/Body.groovy | 2 +- .../spec}/internal/ClientDslProperty.groovy | 2 +- .../contract/spec}/internal/Common.groovy | 2 +- .../spec}/internal/DslProperty.groovy | 2 +- .../spec}/internal/ExecutionProperty.groovy | 2 +- .../contract/spec}/internal/Header.groovy | 2 +- .../contract/spec}/internal/Headers.groovy | 2 +- .../contract/spec}/internal/Input.groovy | 2 +- .../spec}/internal/JSONCompareMode.groovy | 2 +- .../spec}/internal/MatchingStrategy.groovy | 2 +- .../contract/spec}/internal/Multipart.groovy | 2 +- .../spec}/internal/NamedProperty.groovy | 2 +- .../spec}/internal/OptionalProperty.groovy | 2 +- .../spec}/internal/OutputMessage.groovy | 2 +- .../spec}/internal/QueryParameter.groovy | 4 +- .../spec}/internal/QueryParameters.groovy | 2 +- .../spec}/internal/RegexPatterns.groovy | 2 +- .../contract/spec}/internal/Request.groovy | 2 +- .../contract/spec}/internal/Response.groovy | 2 +- .../spec}/internal/ServerDslProperty.groovy | 2 +- .../cloud/contract/spec}/internal/Url.groovy | 4 +- .../contract/spec}/internal/UrlPath.groovy | 2 +- .../contract/spec}/util/ValidateUtils.groovy | 10 +- .../internal/ExecutionPropertySpec.groovy | 35 ++++++ .../spec/internal/RegexPatternsSpec.groovy | 78 +++++++++++++ .../streamService-0.0.1-SNAPSHOT-stubs.jar | Bin 1788 -> 1762 bytes .../stubrunner/junit/StubRunnerRule.java | 2 +- .../build.gradle | 12 -- .../camel/StubRunnerCamelConfiguration.groovy | 2 +- .../camel/StubRunnerCamelPredicate.groovy | 2 +- .../camel/StubRunnerCamelProcessor.groovy | 2 +- .../camel/CamelStubRunnerSpec.groovy | 2 +- .../camel/StubRunnerCamelProcessorSpec.groovy | 2 +- .../camelService-0.0.1-SNAPSHOT-stubs.jar | Bin 1797 -> 1773 bytes .../build.gradle | 11 -- .../StubRunnerIntegrationConfiguration.groovy | 2 +- ...tubRunnerIntegrationMessageSelector.groovy | 2 +- .../StubRunnerIntegrationTransformer.groovy | 2 +- .../IntegrationStubRunnerSpec.groovy | 2 +- ...tubRunnerIntegrationTransformerSpec.groovy | 2 +- ...ntegrationService-0.0.1-SNAPSHOT-stubs.jar | Bin 1788 -> 1762 bytes .../build.gradle | 12 -- .../StubRunnerStreamConfiguration.groovy | 2 +- .../StubRunnerStreamMessageSelector.groovy | 2 +- .../stream/StubRunnerStreamTransformer.groovy | 2 +- .../stream/StreamStubRunnerSpec.groovy | 2 +- .../StubRunnerStreamTransformerSpec.groovy | 2 +- .../streamService-0.0.1-SNAPSHOT-stubs.jar | Bin 1809 -> 1769 bytes .../stubrunner/BatchStubRunner.groovy | 4 +- .../stubrunner/GroovyDslWrapper.groovy | 2 +- .../cloud/contract/stubrunner/StubData.groovy | 2 +- .../contract/stubrunner/StubFinder.groovy | 2 +- .../contract/stubrunner/StubRepository.groovy | 2 +- .../contract/stubrunner/StubRunner.groovy | 2 +- .../stubrunner/StubRunnerExecutor.groovy | 5 +- .../contract/stubrunner/StubServer.groovy | 2 +- .../repository/contracts/contract1.groovy | 2 +- spring-cloud-contract-verifier/build.gradle | 1 + ...ConversionContractVerifierException.groovy | 2 +- .../wiremock/DslToWireMockConverter.groovy | 2 +- .../wiremock/RecursiveFilesConverter.groovy | 34 ++++-- .../wiremock/WireMockToDslConverter.groovy | 2 +- .../DslToWireMockClientConverterSpec.groovy | 10 +- .../RecursiveFilesConverterSpec.groovy | 10 +- .../WireMockToDslConverterSpec.groovy | 24 ++-- .../scenario/main_scenario/01_login.groovy | 2 +- .../scenario/main_scenario/02_showCart.groovy | 2 +- .../scenario/main_scenario/03_logout.groovy | 2 +- .../converter/source/dir1/dsl1.groovy | 2 +- .../converter/source/dir1/dsl1b.groovy | 2 +- .../converter/source/dir2/dsl2.groovy | 2 +- .../resources/converter/source/dslRoot.groovy | 2 +- .../contract/verifier/TestGenerator.groovy | 8 +- .../JUnitMessagingMethodBodyBuilder.groovy | 10 +- .../builder/JUnitMethodBodyBuilder.groovy | 10 +- .../JaxRsClientJUnitMethodBodyBuilder.groovy | 10 +- ...kMethodRequestProcessingBodyBuilder.groovy | 10 +- .../builder/MessagingMethodBodyBuilder.groovy | 6 +- .../verifier/builder/MethodBodyBuilder.groovy | 14 +-- .../verifier/builder/MethodBuilder.groovy | 6 +- .../MockMvcJUnitMethodBodyBuilder.groovy | 6 +- ...kMethodRequestProcessingBodyBuilder.groovy | 6 +- .../RequestProcessingMethodBodyBuilder.groovy | 16 +-- .../builder/SingleTestGenerator.groovy | 4 +- .../SpockMessagingMethodBodyBuilder.groovy | 10 +- ...kMethodRequestProcessingBodyBuilder.groovy | 10 +- .../wiremock/BaseWireMockStubStrategy.groovy | 4 +- .../WireMockRequestStubStrategy.groovy | 18 +-- .../WireMockResponseStubStrategy.groovy | 6 +- .../dsl/wiremock/WireMockStubStrategy.groovy | 2 +- .../verifier/util/BodyExtractor.groovy | 2 +- .../verifier/util/ContentUtils.groovy | 12 +- .../util/ContractVerifierDslConverter.groovy | 2 +- .../util/JsonToJsonPathsConverter.groovy | 4 +- .../verifier/util/MapConverter.groovy | 4 +- .../verifier/util/RegexpBuilders.groovy | 4 +- .../builder/ContractHttpDocsSpec.groovy | 44 ++++---- .../JaxRsClientMethodBuilderSpec.groovy | 104 +++++++++--------- .../MessagingMethodBodyBuilderSpec.groovy | 2 +- .../MockMvcMethodBodyBuilderSpec.groovy | 4 +- .../builder/SingleTestGeneratorSpec.groovy | 4 +- .../verifier/dsl/WireMockGroovyDslSpec.groovy | 70 ++++++------ .../verifier/dsl/WireMockStubVerifier.groovy | 4 +- .../dsl/internal/ExecutionPropertySpec.groovy | 2 +- .../dsl/internal/RegexPatternsSpec.groovy | 2 +- .../test/resources/dsl/basic/sampleDsl.groovy | 2 +- .../plugin/GenerateServerTestsTask.groovy | 2 +- ...ngCloudContractVerifierGradlePlugin.groovy | 2 +- .../pairId/collerate_PlacesFrom_Tweet.groovy | 2 +- .../pairId/moreComplexVersion.groovy | 2 +- .../repository/mappings/a_foo.groovy | 2 +- .../repository/mappings/bookDeleted.groovy | 2 +- .../repository/mappings/bookReturned1.groovy | 2 +- .../repository/mappings/bookReturned2.groovy | 2 +- .../shouldMarkClientAsFraud.groovy | 2 +- .../shouldMarkClientAsNotFraud.groovy | 2 +- .../shouldMarkClientAsFraud.groovy | 2 +- .../shouldMarkClientAsNotFraud.groovy | 2 +- .../1_shouldMarkClientAsNotFraud.groovy | 2 +- .../2_shouldMarkClientAsFraud.groovy | 2 +- 130 files changed, 470 insertions(+), 392 deletions(-) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/Contract.groovy (85%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/ContractVerifierException.groovy (94%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Body.groovy (96%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/ClientDslProperty.groovy (93%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Common.groovy (98%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/DslProperty.groovy (95%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/ExecutionProperty.groovy (95%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Header.groovy (95%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Headers.groovy (96%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Input.groovy (97%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/JSONCompareMode.groovy (92%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/MatchingStrategy.groovy (96%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Multipart.groovy (96%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/NamedProperty.groovy (95%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/OptionalProperty.groovy (94%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/OutputMessage.groovy (97%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/QueryParameter.groovy (90%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/QueryParameters.groovy (95%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/RegexPatterns.groovy (97%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Request.groovy (98%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Response.groovy (97%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/ServerDslProperty.groovy (94%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/Url.groovy (89%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/internal/UrlPath.groovy (94%) rename {spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier => spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec}/util/ValidateUtils.groovy (82%) create mode 100644 spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ExecutionPropertySpec.groovy create mode 100644 spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy diff --git a/docs/src/main/asciidoc/contract.adoc b/docs/src/main/asciidoc/contract.adoc index a7216e3bd0..9a3ee50346 100644 --- a/docs/src/main/asciidoc/contract.adoc +++ b/docs/src/main/asciidoc/contract.adoc @@ -5,14 +5,16 @@ == Contract DSL IMPORTANT: Remember that inside the contract file you have to provide the fully qualified name to -the `Contract` class and the `make` static import i.e. `org.springframework.cloud.contract.verifier.dsl.Contract.make { ... }`. -You can also provide an import to the `Contract` class `import org.springframework.cloud.contract.verifier.dsl.Contract` and then call +the `Contract` class and the `make` static import i.e. `org.springframework.cloud.contract.spec.Contract.make { ... }`. +You can also provide an import to the `Contract` class `import org.springframework.cloud.contract.spec.Contract` and then call `Contract.make { ... }` Contract DSL is written in Groovy, but don't be alarmed if you didn't use Groovy before. Knowledge of the language is not really needed as our DSL uses only a tiny subset of it (namely literals, method calls and closures). What's more the DSL is designed to be programmer-readable without any knowledge of the DSL itself - it's statically typed. +The Contract is present in the `spring-cloud-contract-spec` module of the Spring Cloud Contract Verifier repository. + Let's look at full example of a contract definition. [source,groovy,indent=0] diff --git a/samples/samples-messaging-camel/build.gradle b/samples/samples-messaging-camel/build.gradle index 067b6cdeb2..bf8efc7f10 100644 --- a/samples/samples-messaging-camel/build.gradle +++ b/samples/samples-messaging-camel/build.gradle @@ -13,18 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -repositories { - mavenLocal() - jcenter() - maven { - url "http://repo.spring.io/snapshot" - } - maven { - url "http://repo.spring.io/milestone" - } -} - String verifier = "spring-cloud-contract-verifier" dependencies { diff --git a/samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy b/samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy index 38337f6b76..09f5a23df7 100644 --- a/samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy +++ b/samples/samples-messaging-camel/src/test/groovy/org/springframework/cloud/contract/verifier/samples/camel/CamelMessagingApplicationSpec.groovy @@ -19,7 +19,7 @@ package org.springframework.cloud.contract.verifier.samples.camel import com.jayway.jsonpath.DocumentContext import com.jayway.jsonpath.JsonPath import com.toomuchcoding.jsonassert.JsonAssertion -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage import org.apache.camel.model.ModelCamelContext import org.springframework.beans.factory.annotation.Autowired diff --git a/samples/samples-messaging-integration/build.gradle b/samples/samples-messaging-integration/build.gradle index 990aa349b2..21eeaff00b 100644 --- a/samples/samples-messaging-integration/build.gradle +++ b/samples/samples-messaging-integration/build.gradle @@ -13,18 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -repositories { - mavenLocal() - jcenter() - maven { - url "http://repo.spring.io/snapshot" - } - maven { - url "http://repo.spring.io/milestone" - } -} - String verifier = "spring-cloud-contract-verifier" dependencies { diff --git a/samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy b/samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy index 7307d4ea71..68eaf5009b 100644 --- a/samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy +++ b/samples/samples-messaging-integration/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/IntegrationMessagingApplicationSpec.groovy @@ -21,7 +21,7 @@ import com.jayway.jsonpath.JsonPath import com.toomuchcoding.jsonassert.JsonAssertion import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.SpringApplicationContextLoader -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper diff --git a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy b/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy index 7737cd4270..082cf2f2fc 100644 --- a/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy +++ b/samples/samples-messaging-spring/src/test/groovy/org/springframework/cloud/contract/verifier/samples/spring/SpringApplicationSpec.groovy @@ -21,7 +21,7 @@ import com.jayway.jsonpath.JsonPath import com.toomuchcoding.jsonassert.JsonAssertion import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.SpringApplicationContextLoader -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper diff --git a/samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy b/samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy index 2aa6c241a9..1a21561554 100644 --- a/samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy +++ b/samples/samples-messaging-stream/src/test/groovy/org/springframework/cloud/contract/verifier/samples/messaging/StreamMessagingApplicationSpec.groovy @@ -19,7 +19,7 @@ package org.springframework.cloud.contract.verifier.samples.messaging import com.jayway.jsonpath.DocumentContext import com.jayway.jsonpath.JsonPath import com.toomuchcoding.jsonassert.JsonAssertion -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.SpringApplicationContextLoader diff --git a/settings.gradle b/settings.gradle index c86dce469d..bb28620d0c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,8 @@ rootProject.name = "$verifier-parent" include "docs" +include ":spring-cloud-contract-spec" + include ":$verifier:$verifier-core", ":$verifier:$verifier-gradle-plugin", ":$verifier:$verifier-converters", diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/Contract.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/Contract.groovy similarity index 85% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/Contract.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/Contract.groovy index 57ccd03dea..7e424d019d 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/Contract.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/Contract.groovy @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl +package org.springframework.cloud.contract.spec import groovy.transform.EqualsAndHashCode import groovy.transform.ToString import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.internal.Input -import org.springframework.cloud.contract.verifier.dsl.internal.OutputMessage -import org.springframework.cloud.contract.verifier.dsl.internal.Request -import org.springframework.cloud.contract.verifier.dsl.internal.Response +import org.springframework.cloud.contract.spec.internal.Input +import org.springframework.cloud.contract.spec.internal.OutputMessage +import org.springframework.cloud.contract.spec.internal.Request +import org.springframework.cloud.contract.spec.internal.Response /** * The point of entry to the DSL diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/ContractVerifierException.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/ContractVerifierException.groovy similarity index 94% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/ContractVerifierException.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/ContractVerifierException.groovy index 6b1d5a9c79..2750320176 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/ContractVerifierException.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/ContractVerifierException.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier +package org.springframework.cloud.contract.spec import groovy.transform.CompileStatic diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Body.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Body.groovy similarity index 96% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Body.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Body.groovy index 07051bd494..38e42ad8ba 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Body.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Body.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ClientDslProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ClientDslProperty.groovy similarity index 93% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ClientDslProperty.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ClientDslProperty.groovy index 4e0a7aad8e..e16afaffb5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ClientDslProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ClientDslProperty.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Common.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy similarity index 98% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Common.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy index f167521fa4..6cbf2a3a6f 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Common.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Common.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.PackageScope import groovy.transform.TypeChecked diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/DslProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/DslProperty.groovy similarity index 95% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/DslProperty.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/DslProperty.groovy index b7bea9e3fb..4be6c853ae 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/DslProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/DslProperty.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ExecutionProperty.groovy similarity index 95% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionProperty.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ExecutionProperty.groovy index 8948cccf0e..6f79e6dbcf 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ExecutionProperty.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Header.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Header.groovy similarity index 95% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Header.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Header.groovy index 3ab86a08b6..9989d875b4 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Header.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Header.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Headers.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Headers.groovy similarity index 96% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Headers.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Headers.groovy index 03af32fbe9..036a23598e 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Headers.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Headers.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Input.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Input.groovy similarity index 97% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Input.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Input.groovy index 34a16d1579..124b25ce50 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Input.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Input.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/JSONCompareMode.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/JSONCompareMode.groovy similarity index 92% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/JSONCompareMode.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/JSONCompareMode.groovy index 8fb8d92738..c1e3b21e7d 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/JSONCompareMode.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/JSONCompareMode.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal /** * Represents JSON comparison modes diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/MatchingStrategy.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/MatchingStrategy.groovy similarity index 96% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/MatchingStrategy.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/MatchingStrategy.groovy index f4d1ec0248..0b30b40f23 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/MatchingStrategy.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/MatchingStrategy.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Multipart.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Multipart.groovy similarity index 96% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Multipart.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Multipart.groovy index 554afad2ae..59efa9fe77 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Multipart.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Multipart.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/NamedProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/NamedProperty.groovy similarity index 95% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/NamedProperty.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/NamedProperty.groovy index 6c1ca066c7..798ddcb0f2 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/NamedProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/NamedProperty.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/OptionalProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OptionalProperty.groovy similarity index 94% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/OptionalProperty.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OptionalProperty.groovy index d822cb043f..6ac232f29c 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/OptionalProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OptionalProperty.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/OutputMessage.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OutputMessage.groovy similarity index 97% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/OutputMessage.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OutputMessage.groovy index 0435ac5a76..260bd68f5a 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/OutputMessage.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OutputMessage.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/QueryParameter.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/QueryParameter.groovy similarity index 90% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/QueryParameter.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/QueryParameter.groovy index 21e6aab67c..d34ea61383 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/QueryParameter.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/QueryParameter.groovy @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode import groovy.transform.ToString -import static org.springframework.cloud.contract.verifier.util.ValidateUtils.validateServerValueIsAvailable +import static org.springframework.cloud.contract.spec.util.ValidateUtils.validateServerValueIsAvailable /** * Represents a single HTTP query parameter diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/QueryParameters.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/QueryParameters.groovy similarity index 95% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/QueryParameters.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/QueryParameters.groovy index dd69ff707a..26cbec3730 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/QueryParameters.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/QueryParameters.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.EqualsAndHashCode import groovy.transform.ToString diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatterns.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy similarity index 97% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatterns.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy index 4315e7965c..7177ecf7c0 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatterns.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Request.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Request.groovy similarity index 98% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Request.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Request.groovy index 8e189a9b60..724771d2f4 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Request.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Request.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Response.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Response.groovy similarity index 97% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Response.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Response.groovy index 44da4a5aa9..454841becd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Response.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Response.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ServerDslProperty.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ServerDslProperty.groovy similarity index 94% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ServerDslProperty.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ServerDslProperty.groovy index 3f2cf0e59e..3cf7ec93cc 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ServerDslProperty.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ServerDslProperty.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Url.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Url.groovy similarity index 89% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Url.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Url.groovy index 8c5b3e8a0f..1abee32aa5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/Url.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/Url.groovy @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode import groovy.transform.ToString -import static org.springframework.cloud.contract.verifier.util.ValidateUtils.validateServerValueIsAvailable +import static org.springframework.cloud.contract.spec.util.ValidateUtils.validateServerValueIsAvailable /** * Represents a URL that may contain query parameters diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/UrlPath.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/UrlPath.groovy similarity index 94% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/UrlPath.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/UrlPath.groovy index 62a8d8c60e..df4f277459 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/internal/UrlPath.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/UrlPath.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ValidateUtils.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/util/ValidateUtils.groovy similarity index 82% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ValidateUtils.groovy rename to spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/util/ValidateUtils.groovy index 98aebb1ca8..087ddb77f0 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ValidateUtils.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/util/ValidateUtils.groovy @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.util +package org.springframework.cloud.contract.spec.util import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty -import org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy +import org.springframework.cloud.contract.spec.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.MatchingStrategy import java.util.regex.Pattern -import static org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy.Type.ABSENT -import static org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy.Type.EQUAL_TO +import static org.springframework.cloud.contract.spec.internal.MatchingStrategy.Type.ABSENT +import static org.springframework.cloud.contract.spec.internal.MatchingStrategy.Type.EQUAL_TO /** * Checks the validity of DSL entries. diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ExecutionPropertySpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ExecutionPropertySpec.groovy new file mode 100644 index 0000000000..65b3997d99 --- /dev/null +++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/ExecutionPropertySpec.groovy @@ -0,0 +1,35 @@ +/* + * Copyright 2013-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.contract.spec.internal + +import spock.lang.Specification + +class ExecutionPropertySpec extends Specification { + + def 'should insert passed value in place of $it placeholder'() { + given: + String commandToExecute = 'commandToExecute($it)' + ExecutionProperty executionProperty = new ExecutionProperty(commandToExecute) + and: + String valueToInsert = 'someObject.itsValue' + when: + String commandWithInsertedValue = executionProperty.insertValue(valueToInsert) + then: + 'commandToExecute(someObject.itsValue)' == commandWithInsertedValue + } + +} 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 new file mode 100644 index 0000000000..80b9333bce --- /dev/null +++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy @@ -0,0 +1,78 @@ +/* + * Copyright 2013-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.contract.spec.internal + +import spock.lang.Specification + +import java.util.regex.Pattern + +class RegexPatternsSpec extends Specification { + + RegexPatterns regexPatterns = new RegexPatterns() + + def "should generate a regex for ip address [#textToMatch] that is a match [#shouldMatch]"() { + expect: + shouldMatch == Pattern.compile(regexPatterns.ipAddress()).matcher(textToMatch).matches() + where: + textToMatch || shouldMatch + '123.123.123.123' || true + 'a.b.' || false + } + + def "should generate a regex for hostname [#textToMatch] that is a match [#shouldMatch]"() { + expect: + shouldMatch == Pattern.compile(regexPatterns.hostname()).matcher(textToMatch).matches() + where: + textToMatch || shouldMatch + 'https://asd.com' || true + 'https://asd.com:8080' || true + 'https://localhost' || true + 'https://localhost:8080' || true + 'https://asd.com/asd' || false + 'asd.com' || false + } + + def "should generate a regex for email [#textToMatch] that is a match [#shouldMatch]"() { + expect: + shouldMatch == Pattern.compile(regexPatterns.email()).matcher(textToMatch).matches() + where: + textToMatch || shouldMatch + 'asd@asd.com' || true + 'a.b.' || false + } + + def "should generate a regex for url [#textToMatch] that is a match [#shouldMatch]"() { + expect: + shouldMatch == Pattern.compile(regexPatterns.url()).matcher(textToMatch).matches() + where: + textToMatch || shouldMatch + 'ftp://asd.com:9090/asd/a?a=b' || true + 'a.b.' || false + } + + def "should generate a regex for a number [#textToMatch] that is a match [#shouldMatch]"() { + expect: + shouldMatch == Pattern.compile(regexPatterns.number()).matcher(textToMatch).matches() + where: + textToMatch || shouldMatch + '1' || true + '1.0' || true + '0.1' || true + '.1' || true + '1.' || false + } +} diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT-stubs.jar b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT-stubs.jar index 4f874c72510c8870ffaf12cd6305e57ac2535711..a84e468496c7d48104dde102f229a12e49cb1bec 100644 GIT binary patch delta 884 zcmeyv`-peKeLkDcyBNNT=kp`%!i*8hwlaA(h6<{Mwai4 z3=AwHKt-l~2e}Rz@Hm{m8$Ko0$dNs6@5+ivnjPOSuHD#|d)C9+CFOsf^}WiA(991d$dr)hk=)%o@NDF^#qd_$Hvb39PK z9I?A4KX~Wlm(3begBb#=7F{}#m-nZghwu99%Ho^i>Ji=?zjFLOe)_^1;LQwnKL>*= z(953}ooG1#^o_@4UM7?Ji$HIl!t`ouuPyf>1A(^ZU&2dvbKN?4(brYbCH9VsO78iv zTTf1@y1M*%ucleY(^PP}`u%a|m}SeJcI%zj5smA7ZIZu2`_h~(sWYR~ljog__c|%{ zxLQSOW}-0j;?+xu)g zANo8oJMvL`hf}1&Yy-_z3PJ`!TX_!|wEYvFCO^^s)f(sAUqu;`SIYc3zxZ{e)xW%| z|0ZX9bpN)?XAe!T{ncA*!-(*+DbUYL`m>}~0sZ_Dh}9Tm7>ZI0@{2P|@{1-}SQl`;{xUpex`>MWgCN(KokB4kCroDAWn9wq?CSV(-*@q% z?#MgG=Xmc6O#E{9!WB80dndnpMbGNFWa7eawM=5`t-7hraz8gGh-qz!k=P>fF--95 zqJ+B!eubVh4+|_fxYtu%-Ci~D-yhzY?R!+t-uP7Ib2(ctYY|K0_5F_+4=&)JdGeOd z5{?IM-APA}-ah%nQnsbRZeCPJkj@?Bme_k{n_|3*4fivEJUw|8o7BYp+?!)rxEaxt zcp0lBC~Z&P#VVtSk`#a`T!TRZ7&r_JKqf;&<2y!%$qvktlLgpBnSn_JtOGM3k#z_# cgLG)Jv4R6~@)R~JMybi?+0@zmSU|=C0EUun(*OVf delta 916 zcmaFF`-gYJeZJJh3m*OtRHOGZFfgz)PJC-zZ&#fZZVAMt72FJrEZ-R!7+6GrlBRtJ zyABx$IGleO-V(R0iEYn2Uvd9MO%>C(%uI8>-QyGFy5xV}rK^vh?A;@owE9r*-0ixr z8Rd`6&8m{>%{t+J%{Qbx<+@c$s?++q{p*|G1?=Ox_*$x(v!^hner@Nj*HT;$|K#?} z>^@O{E-J<3b~@|K`RSr(pK`Ba)!{M}Z8|oiPS$`W_xTQv7mr)DeyB$Zo6ZzrsyJzM zz3=6#pnoSescJo);xO%Bfb3cgpZuwKJiLCjy zbrF&_!rM1pxH5f{!s|%UxPMCKq0Ktp%b#A4HC=V|%PfwyMOQQpe$9JpsGe2dFF&E< zSlM3w^27_4p^v*xrU<0YuzAWlb$X8d8>f~xWj_+|NzjwlQeVqe+dy z%PwR^KOx5{-bzw5M|K824TPH5; z_|_IP-E>pwqqo0avt=06s-1G~v%AV?>$c~KORrzZ-Ll#_+q4$=a)j(i<$5N3>E`+P ziPbYMub4W^@B3r!(;?GclwIcjZ?a}-*D(%`O;6n7@WSSm>#FX1El%HQ#85+XLz`XWBarhD-F0J5Z zU}X8u$iToN0#s?*caZCl0guD^yWvw}jU3tI_O7g$WI5sP(&*&5x1~I-T~hw%S$~zd zciOwd_nq9GsNz)92a|W4o;}ZPu6c^>>SOFZzWe_BH@^zlCwy_WR5fQ$T}t)J&RwUa zgf78;ah*YytO84=wR+z?JC}bVA$;2LtC`U<37U#8Hd`KjeVIML zn;Gl{4u;7X$ZOg7(sOR`k!Lnf8CQp1mp(p|Wvy#Hr?!*i$L=e} z{Xbqb3!TZocroi(OkMi-bVYrETz>0X$?FP53U9L`pSm8|Iw6+3M&{GQdNmud%e<3Vv3+^H{)#$Z_1}NfHqFkTo_BZW{mcF8hydsW20*WMEuoxsg$Us)=DpdyXUiXh%9FJpBHA*7XXfuemFWJ`I#7&z zlcvNbkr!bGZk@}7&>h86j^^RW@mbFU$@gJ+!F3YAX zU-c^#OrE4ZTa_jz#d0@+GfY!w{!E)=&VrvFUP-uMPniR jI;AGZG7GQ)^#H>Xs7GY-Mm9A@)yX&5)Y&3gK(+t?CwFO( delta 907 zcmaFM+sZfLKJVJN3m$sLddChkFfedWd}C5CTAmcn2gIcn+zgB?-x(PgSVVwwrhOap z4jBkIq(9eQqa(f~sdMVu5T8&7r#B}$_1Aema!y|^>h!bxO~A3w)pg}Z!dj)R^R2Hb z{}cSaN;bo2m8yK?_Q1bNyU!_V3$uOwS|?lD|0%G;(cHo#p-1?)xAT>FvjC3g`N3ym z>RrmNDJ{NvSNp`DEh{q4SF?1Vjn3j=ucnuz^d(ScUq`PN)XQj z#nUl1OHO<5oSNz$a>}w%=kEfu6NxYX@Qc3bJO2Lb!_D^&x3?_Oe>P|PdH(=!X0Ts4 z7*+s%J?&5VmD50lvX_)2o2N5W777 zVysq%nBLu$8ci#t%f%;dnQNCbNptd-IK4;vZ!h@~!Eq?(+#K~F%^dHon%tA5{!NgY zsQIR7;=)1|WA(bmSBuz$c7`VX{E>Cjp{94nB+V5wgm?6vv2@Kj7c95&)|R>TpKUHD ztkp^MT_Id|u}nT*r<&2;G{atrl=NW6#{KJ0vhj>rOoM?*(W1Uc-UAnrV zKiRIv>67lK_PMWDmo;1N(2*!Vl6d?8Tjj4($FD1^3N3QffB(#TdVBA$$lBe^h~U@& z3=V-tk5IV<$8%>@y;^yR zFW6KvNkjGE3BI|@I?Ll3d~Y9Y|KDD3=KZ{6Qr(-VgC6sBnzNbC-!rvQJE*pk-Shr8 zm2=qz=lACwX*~7*5X&0PDGxLQ7WL1nY&i7gvB`4NAk&E<8yAN^%y=mGb%*%EU#I8Y zsK5DrO>gA&^FMo&IdzNKX1?D4sPn?)7spJu`$h!x1S?of*y0eec?9mx6TcLEfD_n@wuse(ueFEZmH!Nq=%0s}nOY?N46KDx-**JS2dj!oUDb zDGUvbzZe-N^D$|&u`)0NQwdlDW&k2>B)5)!DR*bfj53s4T6|#Vg F1po~-c^d!# diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/build.gradle b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/build.gradle index 338123d564..714d543a31 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/build.gradle +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/build.gradle @@ -13,17 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -repositories { - mavenLocal() - jcenter() - maven { - url "http://repo.spring.io/snapshot" - } - maven { - url "http://repo.spring.io/milestone" - } -} String verifier = "spring-cloud-contract-verifier" String stubRunner = "spring-cloud-contract-stub-runner" diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy index 2d777d252e..70f082d629 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.stubrunner.messaging.integration import groovy.transform.CompileStatic -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.stubrunner.StubConfiguration import org.springframework.beans.factory.config.AutowireCapableBeanFactory import org.springframework.cloud.contract.stubrunner.BatchStubRunner diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.groovy index e3a7a87e69..ff4413d5d5 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationMessageSelector.groovy @@ -21,7 +21,7 @@ import com.jayway.jsonpath.JsonPath import com.toomuchcoding.jsonassert.JsonAssertion import com.toomuchcoding.jsonassert.JsonVerifiable import groovy.transform.CompileStatic -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper import org.springframework.cloud.contract.verifier.util.JsonPaths import org.springframework.cloud.contract.verifier.util.JsonToJsonPathsConverter diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.groovy index 6dd212e46a..0bf9278b01 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.groovy @@ -16,7 +16,7 @@ package org.springframework.cloud.contract.stubrunner.messaging.integration -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.util.BodyExtractor import org.springframework.integration.transformer.GenericTransformer import org.springframework.messaging.Message diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy index 3f7a37f357..bdd7368377 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy @@ -22,7 +22,7 @@ import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMes import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.EnableAutoConfiguration import org.springframework.boot.test.SpringApplicationContextLoader -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.stubrunner.StubFinder import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging import org.springframework.context.annotation.ComponentScan diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformerSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformerSpec.groovy index 010b849826..31b4d19ab4 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformerSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformerSpec.groovy @@ -1,6 +1,6 @@ package org.springframework.cloud.contract.stubrunner.messaging.integration -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.messaging.Message import org.springframework.messaging.support.MessageBuilder import spock.lang.Specification diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT-stubs.jar b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT-stubs.jar index a9abc9528a591ccbf363db42ffd2d2fcd98cf77b..9cb1d97128317912625c1aa09877b4e7431e6119 100644 GIT binary patch delta 884 zcmeyv`-peKeZDnqcRiM>J-ff1fq~&a!(=`twaKekx#~F?n4df-4!;Y;r4`%^j4a<7 z85meZfQn4}4ssnb;Bh#AH+)L0kt2KD-jx-TG&{auT)VL^_pFDtOUnN|>$`?~rcW1` zeTVl>#OH*okGprAeck6a_j-!$>RaqRrFAjO;bK6 zc0~_&8nQ`#&3ri5@yYf`*V=f8ZB3y{%UmwJI2_h^PSf~!tMlvkQx5jK_=YTT=6Ild zIbwH9e(=u8FPk-{1~UX!ExL3fFYiw~58w6ImBly3)g!z)e&zUm{Pcx2z?&KDeh!8W zKreq@bfV<|&^I2Fd6`V=-vGV&6w|A%y|&zk3gw|6y_#knPgB9^>i5T;W0oy@+O2n9M>MYUwMqU8?MrjEq|S^^Po8%!-s_~) z<7ySDnTf*8i{D1fH(K<|q|GCyV>BJXf=LlJNVpo@uO)nbHomnZ|}41 zeCYGU?8ry$9Zr!7vkf#?DF_(^ZRI^=(DqMwn*2ojS8JSee-&j&UMchE{NmS=cUWIAJo=F5{A>XIICU`@V}8 zbw}PgKF51sVB(j%7p}<3+&lT*D|%MXB@-8Zt7Q^fZ`Dn0mixImK}>5)jKmg+k70se z7bV;^@GJD3d01eh`LE|NijKY~Q1D_Qt0wpUc^LS&LW_ukU}vcyIy#%#*it zmT)|9>rOg)^!CXoma;7kcJrb-f^_Z}x5VBv+Z5wfY`C8R;;ul%xPm;TjAQz`$W(05TaG8s9N8Om<+FoGid5$_z{*U>%qNiL66_ c8Kgs#jTIb_lc%s*F-lE7&!*1i#{x1I0Ld3|UH||9 delta 916 zcmaFF`-gYJeZFIH7d-qQs7CK+U|?WpocPwb-laS#+zyCKE4UdLS-vweFtCUKB~AMd zb{#Sha5(=myd`c~6WgA5zT*CinkuGmnVIH%yT>QUb;kl` z*?pq^TvUq5?R3_e^V3DoKILA;s>5X{+H`D2ovZ;%?(-cSFCMpQ{ZNk-Hk~QLRB_Vi zdf&@eLH|x{Qq_7o#bMgN0O=nHbD_1=y1G5h>6x=aGqP5Sz8yFHt z&%a#$B3CPeulmb2y{-)_rtj_axaF6fIZ1PJiR+Q~`+U3V`3@b5d3Lt?z4?)?C9>w* z)JDY=j3Wq(s8)Euy>V9*~Xwbk0vz+ zFT2cfS;S4%?EWN!E58}HN**?Rdf}J+sf0Z)+5hzae&O4FU$l3rP7SbY z5EMvCa!PXG*x4JsO06_?xkAgY_gh$5n%k}C-=Dc-)1|_@VXDpttP7L5{r7HW-8yk$ z$G5ha>86`XAHDtcnk~biR_&B?pWRhHTem$=TzdUN?v~Zg*`~F?mm_3HD%UgNOE=HQ zPpqDCdBxOOe%~K+pAMPsqUiYXFm zV0vL_X#B=FIgeEdm`->>i3F?xE&LeN7?3q6GXph90fSS3jg^5J7@|NuB9r^r)EG@B NZ)H~VW7KdJ-^yk8uhEPH#_#IlYP|L&HZNv_b>S2Wuxy>siclUWDM z3#Xgg`da0ms0!=lmze$M%Y3%03;(Ds3OD^GB=PsiwpE?GviLhQ-dg-T(fa(FM9P(; z>dhG^-gkHX`pABh&8%~Vu;XO@XjQA_XN1K0*477Xd)B={HZ*WDpJBs#pX85Hc79JC zm-#OWImhVoveip@_tMRLk|Nu0rq|ye4{>DmyN5QlY!Y7=v{S8FSq*b1$tRv-sR;lrg7amc=2qPlE>=>vpbf&-RdT|G2hMP<&!SvxW|>OW?hsu(EY?JRgc&ZCR%Q1*eS ziO$kROqVBHJ?S``c!s$wC^lc_yh=vBZdQcAsSfM9<8!?C1txyE zd*Opxx9+5)M{l2e zVkz6wU^g$SBS`0taZBtyvrREx#fJMCK)#&3pG|7we(udhEZmH!>3VV(s}nOYVNX8K zDx-js3V_L5gFylq7z_+RCPPEx2gb>BS(Sh(gBO%6z#1^a4OxRYGf;!niI$J0U$Y21Z1ZI-} delta 918 zcmaFKJCSd~ecs5p3mz{n?VWjyfq{W%;v19tsX3ne>-Cr6EqTkD*zW9`d$gT9(D9DAuDVfciZG{N&lzV4o7nfkAxoO-`UPr;;#pA zJgDU(!TYsN{H%1l81t_=i?Q3ur*(nhvTKaa7s{q}H`v9k`1R`bm2)dH zPN+y8h@N({!e{;TPwvxX12vb6q`ctY>d3eG`RhZ}{_+9d z%wX?uFr)xIZXeKf2<(Li5nFvu_zr4~&5COcV=iMPHR7z8bt!O-e=I_t23fX(Un zhqGfmN>6OuK1+?4MZNt=Sl7h2Uzxq5Hctw6`mjGd$m_QA!VT?rXWpFY_^M@YhC!@% z&|&sV8d@Teb;z*{^RMU!t^uyxSreTo?2Zm{iWXZ`SHj9K7NSF zajFWach{ef2$m3Fu*_RCgUx0OFkF63)?+rRF8~HZ24+zB_8sIpWWdvQ{%-J_Yh0Ju zKWHqPXTvGyq7uE?@|vFV%2N~e?!GJXMc~B$=jW#jTo0?t+qEl+XZ#p@EO^+EEu0TCj QjGmMCu&J}vvVhD70QLTT`2YX_ diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/BatchStubRunner.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/BatchStubRunner.groovy index 978ca3e109..a39d74fbe6 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/BatchStubRunner.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/BatchStubRunner.groovy @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.stubrunner import groovy.transform.CompileStatic -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /** * Manages lifecycle of multiple {@link StubRunner} instances. * @@ -84,7 +84,7 @@ class BatchStubRunner implements StubRunning { if (!triggered) { throw new IllegalArgumentException("No label with name [$labelName] for " + "dependency [$ivyNotation] was found. Here you have the list of dependencies " + - "and their labels [${ivyToLabels()}") + "and their labels [${ivyToLabels()}]") } return triggered } diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.groovy index 252a60510c..2f2ca4f0b0 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/GroovyDslWrapper.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.stubrunner import groovy.transform.CompileStatic import groovy.transform.PackageScope -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /** * @author Marcin Grzejszczak diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubData.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubData.groovy index c203c5659d..e66fbb3217 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubData.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubData.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.stubrunner import groovy.transform.CompileStatic import groovy.transform.EqualsAndHashCode -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /** * @author Marcin Grzejszczak diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubFinder.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubFinder.groovy index 368494fb04..d2ba01caa9 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubFinder.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubFinder.groovy @@ -16,7 +16,7 @@ package org.springframework.cloud.contract.stubrunner -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract interface StubFinder extends StubTrigger { /** diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy index b82b1c1694..2f7f77c74a 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy @@ -19,7 +19,7 @@ package org.springframework.cloud.contract.stubrunner import groovy.transform.CompileStatic import groovy.transform.PackageScope import groovy.util.logging.Slf4j -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConverter /** diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunner.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunner.groovy index 388eafcbce..7b460ebce7 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunner.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunner.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.stubrunner import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy index f2734d618a..7e49ad4ee0 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy @@ -16,9 +16,10 @@ package org.springframework.cloud.contract.stubrunner +import groovy.json.JsonOutput import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging @@ -129,7 +130,7 @@ class StubRunnerExecutor implements StubFinder { return } ContractVerifierMessage message = contractVerifierMessaging.create( - BodyExtractor.extractClientValueFromBody(groovyDsl.outputMessage?.body?.clientValue), + new JsonOutput().toJson(BodyExtractor.extractClientValueFromBody(groovyDsl.outputMessage?.body?.clientValue)), groovyDsl.outputMessage?.headers?.asStubSideMap()) contractVerifierMessaging.send(message, groovyDsl.outputMessage.sentTo.clientValue) } diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubServer.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubServer.groovy index 5889584035..5ef2d0968d 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubServer.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubServer.groovy @@ -22,7 +22,7 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration import groovy.transform.CompileStatic import groovy.transform.PackageScope import groovy.util.logging.Slf4j -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract @CompileStatic @Slf4j diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/resources/repository/contracts/contract1.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/resources/repository/contracts/contract1.groovy index bd67b68b91..94fc426530 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/resources/repository/contracts/contract1.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/resources/repository/contracts/contract1.groovy @@ -1,4 +1,4 @@ -org.springframework.cloud.contract.verifier.dsl.Contract.make { +org.springframework.cloud.contract.spec.Contract.make { // Human readable description description 'Sends an order message' // Label by means of which the output message can be triggered diff --git a/spring-cloud-contract-verifier/build.gradle b/spring-cloud-contract-verifier/build.gradle index 178c42a48e..7872495400 100644 --- a/spring-cloud-contract-verifier/build.gradle +++ b/spring-cloud-contract-verifier/build.gradle @@ -19,6 +19,7 @@ String verifier = "spring-cloud-contract-verifier" project(":$verifier-root:$verifier-core") { dependencies { + compile project(":spring-cloud-contract-spec") compile 'org.slf4j:slf4j-api:1.6.0' compile 'commons-io:commons-io:2.0' compile 'org.apache.commons:commons-lang3:3.3' diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/ConversionContractVerifierException.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/ConversionContractVerifierException.groovy index 205dd170e4..f6f9d5a6ee 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/ConversionContractVerifierException.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/ConversionContractVerifierException.groovy @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.verifier.wiremock import groovy.transform.CompileStatic -import org.springframework.cloud.contract.verifier.ContractVerifierException +import org.springframework.cloud.contract.spec.ContractVerifierException /** * Thrown when a a DSL can't be properly converted diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.groovy index 289b1d6ed0..7cb8172674 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.groovy @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.verifier.wiremock import groovy.transform.CompileStatic -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.converter.SingleFileConverter import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConverter diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy index 57a56c9c77..8cc1c372d4 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverter.groovy @@ -21,14 +21,14 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties import org.springframework.cloud.contract.verifier.converter.SingleFileConverter -import org.springframework.cloud.contract.verifier.file.ContractMetadata import org.springframework.cloud.contract.verifier.file.ContractFileScanner +import org.springframework.cloud.contract.verifier.file.ContractMetadata import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths - +import java.nio.file.StandardCopyOption /** * Recursively converts contracts into their stub representations * @@ -38,6 +38,8 @@ import java.nio.file.Paths @CompileStatic class RecursiveFilesConverter { + private static final String DEFAULT_CONTRACTS_FOLDER = "contracts" + private static final String DEFAULT_MAPPINGS_FOLDER = "mappings" private final SingleFileConverter singleFileConverter private final ContractVerifierConfigProperties properties @@ -49,6 +51,8 @@ class RecursiveFilesConverter { void processFiles() { ContractFileScanner scanner = new ContractFileScanner(properties.contractsDslDir, properties.excludedFiles as Set, [] as Set) ListMultimap contracts = scanner.findContracts() + log.debug("Found the following contracts $contracts") + createContractDirInOutputStubsFolder() contracts.asMap().entrySet().each { entry -> entry.value.each { ContractMetadata contract -> File sourceFile = contract.path.toFile() @@ -56,13 +60,15 @@ class RecursiveFilesConverter { if (!singleFileConverter.canHandleFileName(sourceFile.name)) { return } + Path targetContractDir = createAndReturnTargetDirectory(sourceFile, DEFAULT_CONTRACTS_FOLDER) + Files.copy(sourceFile.toPath(), new File(targetContractDir.toFile(), sourceFile.name).toPath(), StandardCopyOption.REPLACE_EXISTING) String convertedContent = singleFileConverter.convertContent(entry.key.last().toString(), contract) if (!convertedContent) { return } - Path absoluteTargetPath = createAndReturnTargetDirectory(sourceFile) - File newGroovyFile = createTargetFileWithProperName(absoluteTargetPath, sourceFile) - newGroovyFile.setText(convertedContent, StandardCharsets.UTF_8.toString()) + Path absoluteTargetPath = createAndReturnTargetDirectory(sourceFile, DEFAULT_MAPPINGS_FOLDER) + File newJsonFile = createTargetFileWithProperName(absoluteTargetPath, sourceFile) + newJsonFile.setText(convertedContent, StandardCharsets.UTF_8.toString()) } catch (Exception e) { throw new ConversionContractVerifierException("Unable to make conversion of ${sourceFile.name}", e) } @@ -70,16 +76,24 @@ class RecursiveFilesConverter { } } - private Path createAndReturnTargetDirectory(File sourceFile) { + private boolean createContractDirInOutputStubsFolder() { + return contractDir().mkdirs() + } + + private File contractDir() { + return new File(properties.stubsOutputDir, DEFAULT_CONTRACTS_FOLDER) + } + + private Path createAndReturnTargetDirectory(File sourceFile, String defaultFolder) { Path relativePath = Paths.get(properties.contractsDslDir.toURI()).relativize(sourceFile.parentFile.toPath()) - Path absoluteTargetPath = properties.stubsOutputDir.toPath().resolve(relativePath) + Path absoluteTargetPath = new File(properties.stubsOutputDir, defaultFolder).toPath().resolve(relativePath) Files.createDirectories(absoluteTargetPath) return absoluteTargetPath } private File createTargetFileWithProperName(Path absoluteTargetPath, File sourceFile) { - File newGroovyFile = new File(absoluteTargetPath.toFile(), singleFileConverter.generateOutputFileNameForInput(sourceFile.name)) - log.info("Creating new json [$newGroovyFile.path]") - return newGroovyFile + File newJsonFile = new File(absoluteTargetPath.toFile(), singleFileConverter.generateOutputFileNameForInput(sourceFile.name)) + log.info("Creating new json [$newJsonFile.path]") + return newJsonFile } } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverter.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverter.groovy index 7844605653..960797316c 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverter.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/main/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverter.groovy @@ -22,7 +22,7 @@ import groovy.json.JsonParserType import groovy.json.JsonSlurper import groovy.transform.CompileDynamic import groovy.xml.XmlUtil -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import nl.flotsam.xeger.Xeger import java.nio.charset.StandardCharsets diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy index 9bd88e86c7..dbd37a54f3 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy @@ -34,7 +34,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: File file = tmpFolder.newFile("dsl1.groovy") file.write(""" - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method('PUT') url \$(client(~/\\/[0-9]{2}/), server('/12')) @@ -59,7 +59,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: File file = tmpFolder.newFile("dsl-delay.groovy") file.write(""" - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { } response { @@ -82,7 +82,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: File file = tmpFolder.newFile("dsl2.groovy") file.write(""" - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url '/api/12' @@ -188,7 +188,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: File file = tmpFolder.newFile("dsl-mapinlist.groovy") file.write(""" - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath '/foos' @@ -222,7 +222,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: File file = tmpFolder.newFile("dsl_from_docs.groovy") file.write(''' - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { priority 1 request { method 'POST' diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverterSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverterSpec.groovy index 0e3de65413..6e58c029f2 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverterSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/RecursiveFilesConverterSpec.groovy @@ -30,7 +30,12 @@ import java.nio.file.Paths class RecursiveFilesConverterSpec extends Specification { private static - final Set EXPECTED_TARGET_FILES = [Paths.get("dslRoot.json"), Paths.get("dir1/dsl1.json"), Paths.get("dir1/dsl1b.json"), Paths.get("dir2/dsl2.json")] + final Set EXPECTED_TARGET_FILES = [ + Paths.get("contracts/dir1/dsl1.groovy"), Paths.get("contracts/dir1/dsl1b.groovy"), + Paths.get("contracts/dir2/dsl2.groovy"), Paths.get("contracts/dslRoot.groovy"), + Paths.get("mappings/dslRoot.json"), Paths.get("mappings/dir1/dsl1.json"), + Paths.get("mappings/dir1/dsl1b.json"), Paths.get("mappings/dir2/dsl2.json") + ] @Rule public TemporaryFolder tmpFolder = new TemporaryFolder(); @@ -79,7 +84,8 @@ class RecursiveFilesConverterSpec extends Specification { then: Collection createdFiles = FileUtils.listFiles(properties.stubsOutputDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE) Set relativizedCreatedFiles = getRelativePathsForFilesInDirectory(createdFiles, properties.stubsOutputDir) - [Paths.get("dslRoot.json"), Paths.get("dir2/dsl2.json")] as Set == relativizedCreatedFiles as Set + [ Paths.get("mappings/dslRoot.json"), Paths.get("mappings/dir2/dsl2.json") , + Paths.get("contracts/dslRoot.groovy"), Paths.get("contracts/dir2/dsl2.groovy")] as Set == relativizedCreatedFiles as Set and: createdFiles.each { it.text == "converted" } } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy index f564abadb2..9b1e4c2367 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.wiremock import com.github.tomakehurst.wiremock.stubbing.StubMapping import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConverter -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import spock.lang.Specification class WireMockToDslConverterSpec extends Specification { @@ -85,7 +85,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") == expectedGroovyDsl } @@ -139,7 +139,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") == expectedGroovyDsl } @@ -190,7 +190,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") == expectedGroovyDsl } @@ -244,7 +244,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") == expectedGroovyDsl } @@ -309,7 +309,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") == expectedGroovyDsl } @@ -347,7 +347,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: Contract evaluatedGroovyDsl = ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") and: @@ -387,7 +387,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: Contract evaluatedGroovyDsl = ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") and: @@ -428,7 +428,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: Contract evaluatedGroovyDsl = ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") and: @@ -468,7 +468,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: Contract evaluatedGroovyDsl = ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") and: @@ -508,7 +508,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: Contract evaluatedGroovyDsl = ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") and: @@ -546,7 +546,7 @@ class WireMockToDslConverterSpec extends Specification { String groovyDsl = WireMockToDslConverter.fromWireMockStub(wireMockStub) then: Contract evaluatedGroovyDsl = ContractVerifierDslConverter.convert( - """org.springframework.cloud.contract.verifier.dsl.Contract.make { + """org.springframework.cloud.contract.spec.Contract.make { $groovyDsl }""") and: diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/01_login.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/01_login.groovy index c2c151e460..2911d82295 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/01_login.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/01_login.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/02_showCart.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/02_showCart.groovy index a4284fe016..c7ed09b07c 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/02_showCart.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/02_showCart.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/03_logout.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/03_logout.groovy index d2675b3a90..221416f88a 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/03_logout.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/scenario/main_scenario/03_logout.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1.groovy index b23e11ed01..c724017ffd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1b.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1b.groovy index 3a8bed4ecc..daaf2950e8 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1b.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir1/dsl1b.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir2/dsl2.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir2/dsl2.groovy index b23e11ed01..c724017ffd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir2/dsl2.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dir2/dsl2.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dslRoot.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dslRoot.groovy index b23e11ed01..c724017ffd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dslRoot.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-converters/src/test/resources/converter/source/dslRoot.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy index 47f3da17b1..5457f654a7 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy @@ -19,19 +19,17 @@ package org.springframework.cloud.contract.verifier import com.google.common.collect.ListMultimap import groovy.transform.PackageScope import org.apache.commons.lang3.StringUtils +import org.springframework.cloud.contract.spec.ContractVerifierException import org.springframework.cloud.contract.verifier.builder.SingleTestGenerator import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties -import org.springframework.cloud.contract.verifier.file.ContractMetadata import org.springframework.cloud.contract.verifier.file.ContractFileScanner +import org.springframework.cloud.contract.verifier.file.ContractMetadata import java.nio.charset.StandardCharsets import java.nio.file.Path import java.util.concurrent.atomic.AtomicInteger -import static org.springframework.cloud.contract.verifier.util.NamesUtil.afterLast -import static org.springframework.cloud.contract.verifier.util.NamesUtil.beforeLast -import static org.springframework.cloud.contract.verifier.util.NamesUtil.convertIllegalPackageChars -import static org.springframework.cloud.contract.verifier.util.NamesUtil.directoryToPackage +import static org.springframework.cloud.contract.verifier.util.NamesUtil.* /** * @author Jakub Kubrynski, codearte.io diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMessagingMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMessagingMethodBodyBuilder.groovy index bf58dbef87..e43b17e1c6 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMessagingMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMessagingMethodBodyBuilder.groovy @@ -19,11 +19,11 @@ package org.springframework.cloud.contract.verifier.builder import groovy.json.StringEscapeUtils import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.Input -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.Input +import org.springframework.cloud.contract.spec.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.ExecutionProperty import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMethodBodyBuilder.groovy index 8c3fc89258..153542ea8d 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMethodBodyBuilder.groovy @@ -19,11 +19,11 @@ package org.springframework.cloud.contract.verifier.builder import groovy.json.StringEscapeUtils import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty -import org.springframework.cloud.contract.verifier.dsl.internal.Request -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.Request +import org.springframework.cloud.contract.spec.internal.ExecutionProperty import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientJUnitMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientJUnitMethodBodyBuilder.groovy index feb23dfd57..2e5a36af8b 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientJUnitMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientJUnitMethodBodyBuilder.groovy @@ -18,11 +18,11 @@ package org.springframework.cloud.contract.verifier.builder import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameter -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameters +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.QueryParameter +import org.springframework.cloud.contract.spec.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.internal.QueryParameters import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientSpockMethodRequestProcessingBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientSpockMethodRequestProcessingBodyBuilder.groovy index b45c7981f2..c639383e0e 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientSpockMethodRequestProcessingBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientSpockMethodRequestProcessingBodyBuilder.groovy @@ -18,11 +18,11 @@ package org.springframework.cloud.contract.verifier.builder import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameter -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameters -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.QueryParameter +import org.springframework.cloud.contract.spec.internal.QueryParameters +import org.springframework.cloud.contract.spec.internal.ExecutionProperty import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy index 33229a001a..29e0b6d415 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilder.groovy @@ -19,9 +19,9 @@ package org.springframework.cloud.contract.verifier.builder import groovy.json.JsonOutput import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Input -import org.springframework.cloud.contract.verifier.dsl.internal.OutputMessage +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Input +import org.springframework.cloud.contract.spec.internal.OutputMessage import org.springframework.cloud.contract.verifier.util.ContentType import static org.springframework.cloud.contract.verifier.util.ContentUtils.recognizeContentTypeFromContent diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy index eb7b7fc1ea..c1c4ca440e 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy @@ -18,13 +18,13 @@ package org.springframework.cloud.contract.verifier.builder import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.NamedProperty import org.springframework.cloud.contract.verifier.util.MapConverter -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameter +import org.springframework.cloud.contract.spec.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.MatchingStrategy +import org.springframework.cloud.contract.spec.internal.QueryParameter import org.springframework.cloud.contract.verifier.util.ContentType import org.springframework.cloud.contract.verifier.util.JsonPaths import org.springframework.cloud.contract.verifier.util.JsonToJsonPathsConverter @@ -329,7 +329,7 @@ abstract class MethodBodyBuilder { } /** - * Converts the {@link org.springframework.cloud.contract.verifier.dsl.internal.QueryParameter} server side value into its String + * Converts the {@link org.springframework.cloud.contract.spec.internal.QueryParameter} server side value into its String * representation */ protected String resolveParamValue(QueryParameter param) { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy index 090f87273e..29176013d8 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilder.groovy @@ -38,11 +38,11 @@ import org.springframework.cloud.contract.verifier.file.ContractMetadata class MethodBuilder { private final String methodName - private final org.springframework.cloud.contract.verifier.dsl.Contract stubContent + private final org.springframework.cloud.contract.spec.Contract stubContent private final ContractVerifierConfigProperties configProperties private final boolean ignored - private MethodBuilder(String methodName, org.springframework.cloud.contract.verifier.dsl.Contract stubContent, ContractVerifierConfigProperties configProperties, boolean ignored) { + private MethodBuilder(String methodName, org.springframework.cloud.contract.spec.Contract stubContent, ContractVerifierConfigProperties configProperties, boolean ignored) { this.ignored = ignored this.stubContent = stubContent this.methodName = methodName @@ -52,7 +52,7 @@ class MethodBuilder { /** * A factory method that creates a {@link MethodBuilder} for the given arguments */ - static MethodBuilder createTestMethod(ContractMetadata contract, File stubsFile, org.springframework.cloud.contract.verifier.dsl.Contract stubContent, ContractVerifierConfigProperties configProperties) { + static MethodBuilder createTestMethod(ContractMetadata contract, File stubsFile, org.springframework.cloud.contract.spec.Contract stubContent, ContractVerifierConfigProperties configProperties) { log.debug("Stub content Groovy DSL [$stubContent]") String methodName = NamesUtil.camelCase(NamesUtil.toLastDot(NamesUtil.afterLast(stubsFile.path, File.separator))) return new MethodBuilder(methodName, stubContent, configProperties, contract.ignored) diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcJUnitMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcJUnitMethodBodyBuilder.groovy index 406ad8a5f2..baf893c1b6 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcJUnitMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcJUnitMethodBodyBuilder.groovy @@ -18,9 +18,9 @@ package org.springframework.cloud.contract.verifier.builder import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.ExecutionProperty import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcSpockMethodRequestProcessingBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcSpockMethodRequestProcessingBodyBuilder.groovy index 742a49ab41..cc0c873546 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcSpockMethodRequestProcessingBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcSpockMethodRequestProcessingBodyBuilder.groovy @@ -18,9 +18,9 @@ package org.springframework.cloud.contract.verifier.builder import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty -import org.springframework.cloud.contract.verifier.dsl.internal.Header +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.internal.Header import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/RequestProcessingMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/RequestProcessingMethodBodyBuilder.groovy index ce3385a18d..c80a3e902f 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/RequestProcessingMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/RequestProcessingMethodBodyBuilder.groovy @@ -20,14 +20,14 @@ import groovy.json.JsonOutput import groovy.transform.PackageScope import groovy.transform.TypeChecked import groovy.transform.TypeCheckingMode -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Request -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameter -import org.springframework.cloud.contract.verifier.dsl.internal.Response -import org.springframework.cloud.contract.verifier.dsl.internal.Url +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Request +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.MatchingStrategy +import org.springframework.cloud.contract.spec.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.QueryParameter +import org.springframework.cloud.contract.spec.internal.Response +import org.springframework.cloud.contract.spec.internal.Url import org.springframework.cloud.contract.verifier.util.ContentType import org.springframework.cloud.contract.verifier.util.MapConverter diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy index 58e406b66a..dcfa2d4757 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy @@ -120,7 +120,7 @@ class SingleTestGenerator { return listOfFiles.collectEntries { File stubsFile = it.path.toFile() log.debug("Stub content from file [${stubsFile.text}]") - org.springframework.cloud.contract.verifier.dsl.Contract stubContent = ContractVerifierDslConverter.convert(stubsFile) + org.springframework.cloud.contract.spec.Contract stubContent = ContractVerifierDslConverter.convert(stubsFile) TestType testType = (stubContent.input || stubContent.outputMessage) ? TestType.MESSAGING : TestType.HTTP return [(new ParsedDsl(it, stubContent, stubsFile)): testType] } @@ -130,7 +130,7 @@ class SingleTestGenerator { @EqualsAndHashCode private static class ParsedDsl { ContractMetadata contract - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl + org.springframework.cloud.contract.spec.Contract groovyDsl File stubsFile } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMessagingMethodBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMessagingMethodBodyBuilder.groovy index 7996f413f7..701ae25501 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMessagingMethodBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMessagingMethodBodyBuilder.groovy @@ -19,11 +19,11 @@ package org.springframework.cloud.contract.verifier.builder import groovy.json.StringEscapeUtils import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.Input -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.Input +import org.springframework.cloud.contract.spec.internal.NamedProperty import java.util.regex.Pattern /** diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMethodRequestProcessingBodyBuilder.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMethodRequestProcessingBodyBuilder.groovy index cc60ff5055..dac23ae776 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMethodRequestProcessingBodyBuilder.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMethodRequestProcessingBodyBuilder.groovy @@ -19,11 +19,11 @@ package org.springframework.cloud.contract.verifier.builder import groovy.json.StringEscapeUtils import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Header -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty -import org.springframework.cloud.contract.verifier.dsl.internal.Request -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Header +import org.springframework.cloud.contract.spec.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.Request +import org.springframework.cloud.contract.spec.internal.ExecutionProperty import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy index 914c705bb6..1226c39bf1 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy @@ -19,9 +19,9 @@ package org.springframework.cloud.contract.verifier.dsl.wiremock import groovy.json.JsonBuilder import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.internal.Headers +import org.springframework.cloud.contract.spec.internal.Headers import org.springframework.cloud.contract.verifier.util.MapConverter -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.DslProperty import org.springframework.cloud.contract.verifier.util.ContentType import org.springframework.cloud.contract.verifier.util.ContentUtils diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy index 0fad82f131..68606b280c 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockRequestStubStrategy.groovy @@ -23,19 +23,19 @@ import groovy.json.JsonOutput import groovy.transform.PackageScope import groovy.transform.TypeChecked import groovy.transform.TypeCheckingMode -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Body -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty -import org.springframework.cloud.contract.verifier.dsl.internal.QueryParameters +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Body +import org.springframework.cloud.contract.spec.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.QueryParameters import org.springframework.cloud.contract.verifier.util.ContentUtils import org.springframework.cloud.contract.verifier.util.JsonPaths import org.springframework.cloud.contract.verifier.util.MapConverter -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty -import org.springframework.cloud.contract.verifier.dsl.internal.OptionalProperty -import org.springframework.cloud.contract.verifier.dsl.internal.RegexPatterns -import org.springframework.cloud.contract.verifier.dsl.internal.Request +import org.springframework.cloud.contract.spec.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.OptionalProperty +import org.springframework.cloud.contract.spec.internal.RegexPatterns +import org.springframework.cloud.contract.spec.internal.Request import org.springframework.cloud.contract.verifier.util.JsonToJsonPathsConverter -import org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy +import org.springframework.cloud.contract.spec.internal.MatchingStrategy import org.springframework.cloud.contract.verifier.util.ContentType import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockResponseStubStrategy.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockResponseStubStrategy.groovy index 96eda8c33b..e1c6ecf4d2 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockResponseStubStrategy.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockResponseStubStrategy.groovy @@ -22,9 +22,9 @@ import com.github.tomakehurst.wiremock.http.HttpHeaders import com.github.tomakehurst.wiremock.http.ResponseDefinition import groovy.transform.PackageScope import groovy.transform.TypeChecked -import org.springframework.cloud.contract.verifier.dsl.Contract -import org.springframework.cloud.contract.verifier.dsl.internal.Request -import org.springframework.cloud.contract.verifier.dsl.internal.Response +import org.springframework.cloud.contract.spec.Contract +import org.springframework.cloud.contract.spec.internal.Request +import org.springframework.cloud.contract.spec.internal.Response import org.springframework.cloud.contract.verifier.util.ContentType import static org.springframework.cloud.contract.verifier.util.ContentUtils.recognizeContentTypeFromContent diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy index e40850cbe4..41c1ed1615 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubStrategy.groovy @@ -39,7 +39,7 @@ class WireMockStubStrategy { private final ContractMetadata contract private final String rootName - WireMockStubStrategy(String rootName, ContractMetadata contract, org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl) { + WireMockStubStrategy(String rootName, ContractMetadata contract, org.springframework.cloud.contract.spec.Contract groovyDsl) { this.rootName = rootName this.contract = contract this.wireMockRequestStubStrategy = new WireMockRequestStubStrategy(groovyDsl) diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractor.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractor.groovy index c5f4b4279a..9e69876737 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractor.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractor.groovy @@ -19,7 +19,7 @@ package org.springframework.cloud.contract.verifier.util import groovy.json.JsonOutput import groovy.json.StringEscapeUtils import groovy.transform.CompileStatic -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.DslProperty import static ContentUtils.extractValue /** diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContentUtils.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContentUtils.groovy index c2168f564d..366c03f5d8 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContentUtils.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContentUtils.groovy @@ -20,13 +20,13 @@ import groovy.json.JsonOutput import groovy.json.JsonSlurper import groovy.transform.TypeChecked import groovy.util.logging.Slf4j -import org.springframework.cloud.contract.verifier.dsl.internal.Headers +import org.springframework.cloud.contract.spec.internal.Headers import org.codehaus.groovy.runtime.GStringImpl -import org.springframework.cloud.contract.verifier.dsl.internal.NamedProperty -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty -import org.springframework.cloud.contract.verifier.dsl.internal.MatchingStrategy -import org.springframework.cloud.contract.verifier.dsl.internal.OptionalProperty +import org.springframework.cloud.contract.spec.internal.NamedProperty +import org.springframework.cloud.contract.spec.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.internal.MatchingStrategy +import org.springframework.cloud.contract.spec.internal.OptionalProperty import java.util.regex.Matcher import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy index 31c29365f3..9cd8eb5956 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.util import groovy.transform.CompileStatic import org.codehaus.groovy.control.CompilerConfiguration -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /** * Converts a file or String into a {@link Contract} diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy index f4c35bb866..625fbc415d 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverter.groovy @@ -19,8 +19,8 @@ package org.springframework.cloud.contract.verifier.util import com.toomuchcoding.jsonassert.JsonAssertion import groovy.json.JsonOutput import groovy.json.JsonSlurper -import org.springframework.cloud.contract.verifier.dsl.internal.OptionalProperty -import org.springframework.cloud.contract.verifier.dsl.internal.ExecutionProperty +import org.springframework.cloud.contract.spec.internal.OptionalProperty +import org.springframework.cloud.contract.spec.internal.ExecutionProperty import java.util.regex.Pattern diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/MapConverter.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/MapConverter.groovy index ed83f76a3d..31c5aa1899 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/MapConverter.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/MapConverter.groovy @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.verifier.util import groovy.json.JsonSlurper -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.DslProperty /** * Converts an object into either client or server side representation. @@ -35,7 +35,7 @@ class MapConverter { public static final boolean TEST_SIDE = false /** - * Returns the object with client side values of {@link org.springframework.cloud.contract.verifier.dsl.internal.DslProperty} + * Returns the object with client side values of {@link org.springframework.cloud.contract.spec.internal.DslProperty} */ static def transformToClientValues(def value) { return transformValues(value) { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/RegexpBuilders.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/RegexpBuilders.groovy index cb284679a5..df267cfd87 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/RegexpBuilders.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/RegexpBuilders.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.util import groovy.transform.TypeChecked import org.codehaus.groovy.runtime.GStringImpl -import org.springframework.cloud.contract.verifier.dsl.internal.DslProperty +import org.springframework.cloud.contract.spec.internal.DslProperty import java.util.regex.Pattern @@ -53,7 +53,7 @@ class RegexpBuilders { } /** - * Converts the {@link org.springframework.cloud.contract.verifier.dsl.internal.DslProperty} passed values into their stub side String representations + * Converts the {@link org.springframework.cloud.contract.spec.internal.DslProperty} passed values into their stub side String representations */ static String buildGStringRegexpForStubSide(DslProperty dslProperty) { return buildGStringRegexpForStubSide(dslProperty.clientValue) diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy index 27b417a9e7..c2a34bd06f 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy @@ -25,9 +25,9 @@ import spock.lang.Specification */ class ContractHttpDocsSpec extends Specification { - org.springframework.cloud.contract.verifier.dsl.Contract httpDsl = + org.springframework.cloud.contract.spec.Contract httpDsl = // tag::http_dsl[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { // Definition of HTTP request part of the contract // (this can be a valid request or invalid depending // on type of contract being specified). @@ -49,9 +49,9 @@ class ContractHttpDocsSpec extends Specification { } // end::http_dsl[] - org.springframework.cloud.contract.verifier.dsl.Contract request = + org.springframework.cloud.contract.spec.Contract request = // tag::request[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { // HTTP request method (GET/POST/PUT/DELETE). method 'GET' @@ -66,9 +66,9 @@ class ContractHttpDocsSpec extends Specification { } // end::request[] - org.springframework.cloud.contract.verifier.dsl.Contract url = + org.springframework.cloud.contract.spec.Contract url = // tag::url[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' @@ -82,9 +82,9 @@ class ContractHttpDocsSpec extends Specification { } // end::url[] - org.springframework.cloud.contract.verifier.dsl.Contract urlPaths = + org.springframework.cloud.contract.spec.Contract urlPaths = // tag::urlpath[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { //... @@ -127,9 +127,9 @@ class ContractHttpDocsSpec extends Specification { } // end::urlpath[] - org.springframework.cloud.contract.verifier.dsl.Contract headers = + org.springframework.cloud.contract.spec.Contract headers = // tag::headers[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { //... @@ -147,9 +147,9 @@ class ContractHttpDocsSpec extends Specification { } // end::headers[] - org.springframework.cloud.contract.verifier.dsl.Contract body = + org.springframework.cloud.contract.spec.Contract body = // tag::body[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { //... @@ -164,9 +164,9 @@ class ContractHttpDocsSpec extends Specification { } // end::body[] - org.springframework.cloud.contract.verifier.dsl.Contract bodyAsXml = + org.springframework.cloud.contract.spec.Contract bodyAsXml = // tag::bodyAsXml[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { //... @@ -182,9 +182,9 @@ class ContractHttpDocsSpec extends Specification { } // end::bodyAsXml[] - org.springframework.cloud.contract.verifier.dsl.Contract response = + org.springframework.cloud.contract.spec.Contract response = // tag::response[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { //... } @@ -196,9 +196,9 @@ class ContractHttpDocsSpec extends Specification { } // end::response[] - org.springframework.cloud.contract.verifier.dsl.Contract regex = + org.springframework.cloud.contract.spec.Contract regex = // tag::regex[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(~/\/[0-9]{2}/), server('/12')) @@ -227,9 +227,9 @@ class ContractHttpDocsSpec extends Specification { } // end::regex[] - org.springframework.cloud.contract.verifier.dsl.Contract optionals = + org.springframework.cloud.contract.spec.Contract optionals = // tag::optionals[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { priority 1 request { method 'POST' @@ -282,9 +282,9 @@ class ContractHttpDocsSpec extends Specification { stripped(blockBuilder.toString()) == stripped(expectedTest) } - org.springframework.cloud.contract.verifier.dsl.Contract method = + org.springframework.cloud.contract.spec.Contract method = // tag::method[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url $(client(regex('^/api/[0-9]{2}$')), server('/api/12')) diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy index cf419bd745..105bcbce66 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy @@ -26,7 +26,7 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub def "should generate assertions for simple response body with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -50,14 +50,14 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } @Issue("#187") def "should generate assertions for null and boolean values with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -83,14 +83,14 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(new WireMockStubStrategy("Test", new ContractMetadata(null, false, 0, null), contractDsl).toWireMockClientStub()) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } @Issue("#79") def "should generate assertions for simple response body constructed from map with a list with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -119,14 +119,14 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(new WireMockStubStrategy("Test", new ContractMetadata(null, false, 0, null), contractDsl).toWireMockClientStub()) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } @Issue("#82") def "should generate proper request when body constructed from map with a list with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -148,14 +148,14 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | bodyString - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | """entity('{\"items\":[\"HOP\"]}', 'application/json')""" - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'entity("{\\"items\\":[\\"HOP\\"]}", "application/json")' + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | """entity('{\"items\":[\"HOP\"]}', 'application/json')""" + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'entity("{\\"items\\":[\\"HOP\\"]}", "application/json")' } @Issue("#88") def "should generate proper request when body constructed from GString with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -177,13 +177,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | bodyString - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | """entity('property1=VAL1', 'application/octet-stream')""" - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'entity("\\"property1=VAL1\\"", "application/octet-stream")' + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | """entity('property1=VAL1', 'application/octet-stream')""" + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'entity("\\"property1=VAL1\\"", "application/octet-stream")' } def "should generate assertions for array in response body with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -210,13 +210,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } def "should generate assertions for array inside response body element with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -242,13 +242,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } def "should generate assertions for nested objects in response body with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -274,13 +274,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } def "should generate regex assertions for map objects in response body with #methodBodyName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -312,13 +312,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } def "should generate regex assertions for string objects in response body with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -344,13 +344,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } } def "should ignore 'Accept' header and use 'request' method with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -372,13 +372,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | requestString - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | "request('text/plain')" - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'request("text/plain")' + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | "request('text/plain')" + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'request("text/plain")' } def "should ignore 'Content-Type' header and use 'entity' method with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "GET" url "test" @@ -405,13 +405,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | requestStrings - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | ["""entity('', 'text/plain')""", """header('Timer', '123')"""] - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | ['entity("\\"\\"", "text/plain")', 'header("Timer", "123")'] + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | ["""entity('', 'text/plain')""", """header('Timer', '123')"""] + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | ['entity("\\"\\"", "text/plain")', 'header("Timer", "123")'] } def "should generate a call with an url path and query parameters with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath('/users') { @@ -459,14 +459,14 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | modifyStringIfRequired - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | { String paramString -> paramString } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | { String paramString -> paramString.replace("'", "\"") } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | { String paramString -> paramString } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | { String paramString -> paramString.replace("'", "\"") } } @Issue('#169') def "should generate a call with an url path and query parameters with url containing a pattern with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url($(stub(regex('/foo/[0-9]+')), test('/foo/123456'))) { @@ -514,13 +514,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | modifyStringIfRequired - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | { String paramString -> paramString } - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | { String paramString -> paramString.replace("'", "\"") } + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | { String paramString -> paramString } + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | { String paramString -> paramString.replace("'", "\"") } } def "should generate test for empty body with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('POST') url("/ws/payments") @@ -542,13 +542,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | bodyString - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | "entity('', 'application/octet-stream')" - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'entity("\\"\\"", "application/octet-stream"' + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | "entity('', 'application/octet-stream')" + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'entity("\\"\\"", "application/octet-stream"' } def "should generate test for String in response body with #methodBodyName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "POST" url "test" @@ -570,14 +570,14 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | bodyDefinitionString | bodyEvaluationString - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | "String responseAsString = response.readEntity(String)" | 'responseBody == "test"' - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'Object responseBody = (responseAsString);' | 'assertThat(responseBody).isEqualTo("test");' + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | "String responseAsString = response.readEntity(String)" | 'responseBody == "test"' + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'Object responseBody = (responseAsString);' | 'assertThat(responseBody).isEqualTo("test");' } @Issue('#171') def "should generate test with uppercase method name with #methodBuilderName"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "get" url "/v1/some_cool_requests/e86df6f693de4b35ae648464c5b0dc08" @@ -603,13 +603,13 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub stubMappingIsValidWireMockStub(contractDsl) where: methodBuilderName | methodBuilder | methodString - "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | ".method('GET')" - "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.verifier.dsl.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'method("GET")' + "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl) } | ".method('GET')" + "JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl) } | 'method("GET")' } def "should generate a call with an url path and query parameters with JUnit - we'll put it into docs"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath('/users') { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy index 98e02596de..b23add6810 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy @@ -16,7 +16,7 @@ package org.springframework.cloud.contract.verifier.builder -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import spock.lang.Specification /** * @author Marcin Grzejszczak diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy index 42a9c7db8c..9918f7055a 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy @@ -16,7 +16,7 @@ package org.springframework.cloud.contract.verifier.builder -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.dsl.WireMockStubVerifier import spock.lang.Issue import spock.lang.Shared @@ -1398,7 +1398,7 @@ World.'''""" Contract dslForDocs = // tag::dsl_example[] - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url '/api/12' diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy index d4b3bb3485..8bb9f1591f 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy @@ -46,7 +46,7 @@ class SingleTestGeneratorSpec extends Specification { def setup() { file = tmpFolder.newFile() file.write(""" - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url 'url' @@ -105,7 +105,7 @@ class SingleTestGeneratorSpec extends Specification { given: File secondFile = tmpFolder.newFile() secondFile.write(""" - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { label 'some_label' input { messageFrom('delete') diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy index 458e94ab9e..92c0f26a49 100755 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy @@ -28,7 +28,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should convert groovy dsl stub to wireMock stub for the client side'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(~/\/[0-9]{2}/), server('/12')) @@ -77,7 +77,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie @Issue("#79") def 'should convert groovy dsl stub to wireMock stub for the client side with a body containing a map'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url '/ingredients' @@ -124,7 +124,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie @Issue("#86") def 'should convert groovy dsl stub with GString and regexp'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('POST') url('/ws/payments') @@ -176,7 +176,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should convert groovy dsl stub with Body as String to wireMock stub for the client side'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(~/\/[0-9]{2}/), server('/12')) @@ -221,7 +221,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should convert groovy dsl stub with simple Body as String to wireMock stub for the client side'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(regex('/[0-9]{2}')), server('/12')) @@ -271,7 +271,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use equalToJson when body match is defined as map'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(~/\/[0-9]{2}/), server('/12')) @@ -321,7 +321,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use equalToJson when content type ends with json'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url "/users" @@ -366,7 +366,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use equalToXml when content type ends with xml'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url "/users" @@ -411,7 +411,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use equalToXml when content type is parsable xml'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url "/users" @@ -448,7 +448,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should support xml as a response body'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url "/users" @@ -481,7 +481,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use equalToJson'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url "/users" @@ -516,7 +516,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use equalToXml'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url "/users" @@ -553,7 +553,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should convert groovy dsl stub with regexp Body as String to wireMock stub for the client side'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(regex('/[0-9]{2}')), server('/12')) @@ -603,7 +603,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should convert groovy dsl stub with a regexp and an integer in request body'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' url '/fraudcheck' @@ -665,7 +665,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate request with urlPath and queryParameters for client side"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath($(client("users"), server("items"))) { @@ -733,7 +733,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate request with urlPathPattern and queryParameters for client side\ when both contains regular expressions"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath($(client(regex("/users/[0-9]+")), server("/users/1"))) { @@ -772,7 +772,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate request with urlPath for client side"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath $(client("boxes"), server("items")) @@ -801,7 +801,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate simple request with urlPath for client side"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath "boxes" @@ -830,7 +830,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should not allow regexp in url for server value"() { when: - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url(regex(/users\/[0-9]*/)) { @@ -851,7 +851,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should not allow regexp in query parameter for server value"() { when: - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url("abc") { @@ -871,7 +871,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should not allow query parameter unresolvable for a server value"() { when: - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath("users") { @@ -892,7 +892,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should not allow query parameter with a different absent variation for server/client"() { when: - org.springframework.cloud.contract.verifier.dsl.Contract.make dsl + org.springframework.cloud.contract.spec.Contract.make dsl then: def e = thrown(IllegalStateException) e.message.contains "Absent cannot only be used only on one side" @@ -942,7 +942,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate request with url and queryParameters for client side"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' url($(client(regex(/users\/[0-9]*/)), server("users/123"))) { @@ -984,7 +984,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should convert groovy dsl stub with rich tree Body as String to wireMock stub for the client side'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('GET') url $(client(~/\/[0-9]{2}/), server('/12')) @@ -1055,7 +1055,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should use regexp matches when request body match is defined using a map with a pattern'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'POST' url '/reissue-payment-order' @@ -1115,7 +1115,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate stub for empty body"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('POST') url("test") @@ -1148,7 +1148,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def "should generate stub with priority"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { priority 9 request { method('POST') @@ -1178,7 +1178,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie @Issue("#127") def 'should use "test" as an alias for "server"'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('POST') body( @@ -1212,7 +1212,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie @Issue("#121") def 'should generate stub with empty list as a value of a field'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method('POST') body( @@ -1247,7 +1247,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should generate stub properly resolving GString with regular expression'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { priority 1 request { method 'POST' @@ -1306,7 +1306,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie def 'should generate stub properly resolving GString with regular expression in url'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'PUT' @@ -1383,7 +1383,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie stubMappingIsValidWireMockStub(wireMockStub) where: contractDsl << [ - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { priority 1 request { method 'POST' @@ -1407,7 +1407,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie ) } }, - org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract.make { priority 1 request { method 'POST' @@ -1455,7 +1455,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie @Issue('180') def 'should generate stub with multipart parameters'() { given: - org.springframework.cloud.contract.verifier.dsl.Contract contractDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract contractDsl = org.springframework.cloud.contract.spec.Contract.make { request { method "PUT" url "/multipart" @@ -1500,7 +1500,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie @Issue('#219') def "should generate request with an optional queryParameter for client side"() { given: - org.springframework.cloud.contract.verifier.dsl.Contract groovyDsl = org.springframework.cloud.contract.verifier.dsl.Contract.make { + org.springframework.cloud.contract.spec.Contract groovyDsl = org.springframework.cloud.contract.spec.Contract.make { request { method 'GET' urlPath ('/some/api') { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy index f0d7a9d50a..825b913136 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy @@ -29,10 +29,10 @@ trait WireMockStubVerifier { stubMapping.request.bodyPatterns.findAll { it.matches }.every { Pattern.compile(it.matches) } - assert !mappingDefinition.contains('org.springframework.cloud.contract.verifier.dsl.internal') + assert !mappingDefinition.contains('org.springframework.cloud.contract.spec.internal') } - void stubMappingIsValidWireMockStub(org.springframework.cloud.contract.verifier.dsl.Contract contractDsl) { + void stubMappingIsValidWireMockStub(org.springframework.cloud.contract.spec.Contract contractDsl) { stubMappingIsValidWireMockStub(new WireMockStubStrategy("Test", new ContractMetadata(null, false, 0, null), contractDsl).toWireMockClientStub()) } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionPropertySpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionPropertySpec.groovy index 4d3144371e..65b3997d99 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionPropertySpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/ExecutionPropertySpec.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import spock.lang.Specification diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatternsSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatternsSpec.groovy index 4f3b7cdcde..80b9333bce 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatternsSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/internal/RegexPatternsSpec.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.contract.verifier.dsl.internal +package org.springframework.cloud.contract.spec.internal import spock.lang.Specification diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/resources/dsl/basic/sampleDsl.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/resources/dsl/basic/sampleDsl.groovy index 38f5869fc5..a24fc9fb0a 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/resources/dsl/basic/sampleDsl.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/resources/dsl/basic/sampleDsl.groovy @@ -1,4 +1,4 @@ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract /* * Copyright 2013-2016 the original author or authors. diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy index 71935b4d5f..ce5301b3fd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy @@ -21,7 +21,7 @@ import org.gradle.api.internal.ConventionTask import org.gradle.api.tasks.InputDirectory import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction -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 diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy index e699653491..ff6d2a06f5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy @@ -107,7 +107,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { task.group = GROUP_NAME task.conventionMapping.with { contractsDslDir = { extension.contractsDslDir } - stubsOutputDir = { extension.stubsOutputDir } + stubsOutputDir = { extension.stubsOutputDir ?: project.file("${project.buildDir}/stubs") } configProperties = { extension } } } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/collerate_PlacesFrom_Tweet.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/collerate_PlacesFrom_Tweet.groovy index 2f01af1c93..ab1d853b3e 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/collerate_PlacesFrom_Tweet.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/collerate_PlacesFrom_Tweet.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { priority 2 diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/moreComplexVersion.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/moreComplexVersion.groovy index c98b51279d..887e54edf7 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/moreComplexVersion.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/bootSimple/repository/mappings/spring/cloud/twitter-places-analyzer/pairId/moreComplexVersion.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/a_foo.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/a_foo.groovy index 202c8808fe..476aa94eb3 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/a_foo.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/a_foo.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookDeleted.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookDeleted.groovy index 4c73b42e4d..4f7ca765f5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookDeleted.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookDeleted.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { label 'some_label' diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned1.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned1.groovy index 3d4ba32c3a..302e1d11f2 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned1.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned1.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { label 'some_label' diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned2.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned2.groovy index 91ae4361ef..c5a9919e99 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned2.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/messagingProject/repository/mappings/bookReturned2.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { label 'some_label' diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy index 2634bca6cc..1fc39340b5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy index 249de5bc5f..94026415f3 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy index 91246ddfee..a2e6875fd9 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsFraud.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy index 5a2f1a1312..76df090cd6 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/mappings/fraudDetectionService/shouldMarkClientAsNotFraud.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/1_shouldMarkClientAsNotFraud.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/1_shouldMarkClientAsNotFraud.groovy index 5a2f1a1312..76df090cd6 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/1_shouldMarkClientAsNotFraud.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/1_shouldMarkClientAsNotFraud.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/2_shouldMarkClientAsFraud.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/2_shouldMarkClientAsFraud.groovy index 2634bca6cc..1fc39340b5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/2_shouldMarkClientAsFraud.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/mappings/fraudDetectionService/2_shouldMarkClientAsFraud.groovy @@ -14,7 +14,7 @@ * limitations under the License. */ -import org.springframework.cloud.contract.verifier.dsl.Contract +import org.springframework.cloud.contract.spec.Contract Contract.make { request {