SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumps versions

Browse Source 
Groovy to 2.5.10
Camel to 3.1.0
Pact to 4.0.9
This commit is contained in:
Marcin Grzejszczak
2020-04-06 11:31:08 +02:00
parent 06a26e82a6
commit 906c771c6c
39 changed files with 150 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@@ -24,9 +24,9 @@
<properties>
<activemq.version>5.15.11</activemq.version>
<camel.version>2.24.2</camel.version>
<camel.version>3.1.0</camel.version>
<checkstyle.version>2.17</checkstyle.version>
<pact.version>3.6.14</pact.version>
<pact.version>4.0.9</pact.version>
<jsch-agent.version>0.0.9</jsch-agent.version>
<spring-cloud-build.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-zookeeper.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
@@ -51,10 +51,10 @@
<junit-jupiter.version>5.5.2</junit-jupiter.version>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
<gmavenplus-plugin.version>1.6.3</gmavenplus-plugin.version>
<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
<!-- We need to have compatibility with Gradle -->
<groovy.version>2.5.9</groovy.version>
<groovy.version>2.5.10</groovy.version>
<!-- We need to have compatibility with Boot -->
<maven.version>3.5.4</maven.version>
<!-- Resolver has to be aligned with Maven (e.g resolver 1.4 and Maven 3.6 or resolver 1.3 and Maven 3.5) -->
@@ -113,7 +113,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
<version>${camel.version}</version>
</dependency>
@@ -123,7 +123,7 @@
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot</artifactId>
<version>${camel.version}</version>
</dependency>
@@ -148,9 +148,9 @@
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
<version>${activemq.version}</version>
<groupId>org.apache.camel</groupId>
<artifactId>camel-activemq</artifactId>
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -214,7 +214,7 @@
</dependency>
<dependency>
<groupId>au.com.dius</groupId>
<artifactId>pact-jvm-consumer-java8_2.12</artifactId>
<artifactId>pact-jvm-consumer-java8</artifactId>
<version>${pact.version}</version>
<exclusions>
<exclusion>
@@ -229,7 +229,7 @@
</dependency>
<dependency>
<groupId>au.com.dius</groupId>
<artifactId>pact-jvm-provider-junit_2.12</artifactId>
<artifactId>pact-jvm-provider-junit</artifactId>
<version>${pact.version}</version>
<exclusions>
<exclusion>

4
spring-cloud-contract-stub-runner/pom.xml
View File

@@ -89,12 +89,12 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot</artifactId>
<optional>true</optional>
</dependency>

4
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java
View File

@@ -99,8 +99,8 @@ public class StubRunnerCamelConfiguration {
@Override
public void process(Exchange exchange) {
if (log.isDebugEnabled()) {
log.debug("Got exchange [" + exchange + "]");
if (log.isTraceEnabled()) {
log.trace("Got exchange [" + exchange + "]");
}
}

6
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelPredicateSpec.groovy
View File

@@ -19,8 +19,8 @@ package org.springframework.cloud.contract.stubrunner.messaging.camel
import org.apache.camel.Exchange
import org.apache.camel.Message
import org.apache.camel.impl.DefaultCamelContext
import org.apache.camel.impl.DefaultExchange
import org.apache.camel.impl.DefaultMessage
import org.apache.camel.support.DefaultExchange
import org.apache.camel.support.DefaultMessage
import spock.lang.Specification
import org.springframework.cloud.contract.spec.Contract
@@ -30,7 +30,7 @@ import org.springframework.cloud.contract.spec.Contract
*/
class StubRunnerCamelPredicateSpec extends Specification {
Exchange exchange = new DefaultExchange(new DefaultCamelContext())
Message message = new DefaultMessage()
Message message = new DefaultMessage(exchange)
def "should return false if headers don't match"() {
given:

BIN
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

BIN
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

BIN
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

4
spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
View File

@@ -40,11 +40,11 @@
</dependency>
<dependency>
<groupId>au.com.dius</groupId>
<artifactId>pact-jvm-consumer-java8_2.12</artifactId>
<artifactId>pact-jvm-consumer-java8</artifactId>
</dependency>
<dependency>
<groupId>au.com.dius</groupId>
<artifactId>pact-jvm-provider-junit_2.12</artifactId>
<artifactId>pact-jvm-provider-junit</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

23
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java
View File

@@ -31,14 +31,14 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import au.com.dius.pact.model.Pact;
import au.com.dius.pact.model.PactSpecVersion;
import au.com.dius.pact.core.model.Pact;
import au.com.dius.pact.core.model.PactSpecVersion;
import au.com.dius.pact.core.support.expressions.SystemPropertyResolver;
import au.com.dius.pact.core.support.expressions.ValueResolver;
import au.com.dius.pact.provider.junit.loader.PactBroker;
import au.com.dius.pact.provider.junit.loader.PactBrokerAuth;
import au.com.dius.pact.provider.junit.loader.PactBrokerLoader;
import au.com.dius.pact.provider.junit.loader.PactLoader;
import au.com.dius.pact.support.expressions.SystemPropertyResolver;
import au.com.dius.pact.support.expressions.ValueResolver;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.logging.Log;
@@ -267,11 +267,6 @@ class PactStubDownloader implements StubDownloader {
.resolveValue("pactbroker.port:" + pactBrokerUrl.getPort());
}
@Override
public String protocol() {
return scheme();
}
@Override
public String scheme() {
return resolver
@@ -288,11 +283,6 @@ class PactStubDownloader implements StubDownloader {
return new String[] { resolver.resolveValue("pactbroker.consumers:") };
}
@Override
public boolean failIfNoPactsFound() {
return true;
}
@Override
public PactBrokerAuth authentication() {
return new PactBrokerAuth() {
@@ -317,6 +307,11 @@ class PactStubDownloader implements StubDownloader {
return resolver.resolveValue(
"pactbroker.auth.password:" + stubRunnerPassword);
}
@Override
public String token() {
return resolver.resolveValue("pactbroker.auth.token:");
}
};
}

22
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/BodyConverter.groovy
View File

@@ -21,11 +21,11 @@ import java.util.regex.Pattern
import au.com.dius.pact.consumer.dsl.DslPart
import au.com.dius.pact.consumer.dsl.PactDslJsonArray
import au.com.dius.pact.consumer.dsl.PactDslJsonBody
import au.com.dius.pact.model.OptionalBody
import au.com.dius.pact.model.Request
import au.com.dius.pact.model.Response
import au.com.dius.pact.model.generators.Generator
import au.com.dius.pact.model.v3.messaging.Message
import au.com.dius.pact.core.model.OptionalBody
import au.com.dius.pact.core.model.Request
import au.com.dius.pact.core.model.Response
import au.com.dius.pact.core.model.generators.Generator
import au.com.dius.pact.core.model.messaging.Message
import com.jayway.jsonpath.Configuration
import com.jayway.jsonpath.internal.EvaluationContext
import com.jayway.jsonpath.internal.Path
@@ -158,9 +158,9 @@ class BodyConverter {
def body = parseBody(request.body)
if (request.generators.isNotEmpty()
&& request.generators.categories.
containsKey(au.com.dius.pact.model.generators.Category.BODY)) {
containsKey(au.com.dius.pact.core.model.generators.Category.BODY)) {
applyGenerators(body, request.generators.categories.
get(au.com.dius.pact.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue ->
get(au.com.dius.pact.core.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue ->
return new DslProperty<Object>(new ClientDslProperty(pattern, generatedValue), currentValue)
}
}
@@ -171,9 +171,9 @@ class BodyConverter {
def body = parseBody(response.body)
if (response.generators.isNotEmpty()
&& response.generators.categories.
containsKey(au.com.dius.pact.model.generators.Category.BODY)) {
containsKey(au.com.dius.pact.core.model.generators.Category.BODY)) {
applyGenerators(body, response.generators.categories.
get(au.com.dius.pact.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue ->
get(au.com.dius.pact.core.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue ->
return new DslProperty<Object>(currentValue, new ServerDslProperty(pattern, generatedValue))
}
}
@@ -184,9 +184,9 @@ class BodyConverter {
def body = parseBody(message.contents)
if (message.generators.isNotEmpty()
&& message.generators.categories.
containsKey(au.com.dius.pact.model.generators.Category.BODY)) {
containsKey(au.com.dius.pact.core.model.generators.Category.BODY)) {
applyGenerators(body, message.generators.categories.
get(au.com.dius.pact.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue ->
get(au.com.dius.pact.core.model.generators.Category.BODY)) { Object currentValue, Pattern pattern, Object generatedValue ->
return new DslProperty<Object>(new ClientDslProperty(pattern, generatedValue), currentValue)
}
}

24
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MatchingRulesConverter.groovy
View File

@@ -16,18 +16,18 @@
package org.springframework.cloud.contract.verifier.spec.pact
import au.com.dius.pact.model.matchingrules.Category
import au.com.dius.pact.model.matchingrules.DateMatcher
import au.com.dius.pact.model.matchingrules.EqualsMatcher
import au.com.dius.pact.model.matchingrules.MaxTypeMatcher
import au.com.dius.pact.model.matchingrules.MinMaxTypeMatcher
import au.com.dius.pact.model.matchingrules.MinTypeMatcher
import au.com.dius.pact.model.matchingrules.NullMatcher
import au.com.dius.pact.model.matchingrules.NumberTypeMatcher
import au.com.dius.pact.model.matchingrules.RegexMatcher
import au.com.dius.pact.model.matchingrules.TimeMatcher
import au.com.dius.pact.model.matchingrules.TimestampMatcher
import au.com.dius.pact.model.matchingrules.TypeMatcher
import au.com.dius.pact.core.model.matchingrules.Category
import au.com.dius.pact.core.model.matchingrules.DateMatcher
import au.com.dius.pact.core.model.matchingrules.EqualsMatcher
import au.com.dius.pact.core.model.matchingrules.MaxTypeMatcher
import au.com.dius.pact.core.model.matchingrules.MinMaxTypeMatcher
import au.com.dius.pact.core.model.matchingrules.MinTypeMatcher
import au.com.dius.pact.core.model.matchingrules.NullMatcher
import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher
import au.com.dius.pact.core.model.matchingrules.RegexMatcher
import au.com.dius.pact.core.model.matchingrules.TimeMatcher
import au.com.dius.pact.core.model.matchingrules.TimestampMatcher
import au.com.dius.pact.core.model.matchingrules.TypeMatcher
import groovy.transform.CompileStatic
import groovy.transform.PackageScope

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagePactCreator.groovy
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.spec.pact
import au.com.dius.pact.consumer.MessagePactBuilder
import au.com.dius.pact.consumer.dsl.DslPart
import au.com.dius.pact.model.v3.messaging.MessagePact
import au.com.dius.pact.core.model.messaging.MessagePact
import groovy.transform.CompileStatic
import groovy.transform.PackageScope

35
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/MessagingSCContractCreator.groovy
View File

@@ -16,22 +16,22 @@
package org.springframework.cloud.contract.verifier.spec.pact
import au.com.dius.pact.model.matchingrules.Category
import au.com.dius.pact.model.matchingrules.DateMatcher
import au.com.dius.pact.model.matchingrules.MatchingRule
import au.com.dius.pact.model.matchingrules.MatchingRuleGroup
import au.com.dius.pact.model.matchingrules.MaxTypeMatcher
import au.com.dius.pact.model.matchingrules.MinMaxTypeMatcher
import au.com.dius.pact.model.matchingrules.MinTypeMatcher
import au.com.dius.pact.model.matchingrules.NullMatcher
import au.com.dius.pact.model.matchingrules.NumberTypeMatcher
import au.com.dius.pact.model.matchingrules.RegexMatcher
import au.com.dius.pact.model.matchingrules.RuleLogic
import au.com.dius.pact.model.matchingrules.TimeMatcher
import au.com.dius.pact.model.matchingrules.TimestampMatcher
import au.com.dius.pact.model.matchingrules.TypeMatcher
import au.com.dius.pact.model.v3.messaging.Message
import au.com.dius.pact.model.v3.messaging.MessagePact
import au.com.dius.pact.core.model.matchingrules.Category
import au.com.dius.pact.core.model.matchingrules.DateMatcher
import au.com.dius.pact.core.model.matchingrules.MatchingRule
import au.com.dius.pact.core.model.matchingrules.MatchingRuleGroup
import au.com.dius.pact.core.model.matchingrules.MaxTypeMatcher
import au.com.dius.pact.core.model.matchingrules.MinMaxTypeMatcher
import au.com.dius.pact.core.model.matchingrules.MinTypeMatcher
import au.com.dius.pact.core.model.matchingrules.NullMatcher
import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher
import au.com.dius.pact.core.model.matchingrules.RegexMatcher
import au.com.dius.pact.core.model.matchingrules.RuleLogic
import au.com.dius.pact.core.model.matchingrules.TimeMatcher
import au.com.dius.pact.core.model.matchingrules.TimestampMatcher
import au.com.dius.pact.core.model.matchingrules.TypeMatcher
import au.com.dius.pact.core.model.messaging.Message
import au.com.dius.pact.core.model.messaging.MessagePact
import groovy.transform.CompileStatic
import groovy.transform.PackageScope
@@ -144,7 +144,8 @@ class MessagingSCContractCreator {
}
if (!message.metaData.isEmpty()) {
headers {
message.metaData.each { String k, String v ->
message.metaData.each { String k, Object val ->
String v = val.toString()
if (k.equalsIgnoreCase("contentType")) {
messagingContentType(v)
}

15
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverter.groovy
View File

@@ -16,17 +16,16 @@
package org.springframework.cloud.contract.verifier.spec.pact
import au.com.dius.pact.model.Pact
import au.com.dius.pact.model.PactReader
import au.com.dius.pact.model.PactSpecVersion
import au.com.dius.pact.model.RequestResponsePact
import au.com.dius.pact.model.v3.messaging.MessagePact
import au.com.dius.pact.core.model.DefaultPactReader
import au.com.dius.pact.core.model.Pact
import au.com.dius.pact.core.model.PactSpecVersion
import au.com.dius.pact.core.model.RequestResponsePact
import au.com.dius.pact.core.model.messaging.MessagePact
import groovy.json.JsonOutput
import groovy.transform.CompileStatic
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.spec.ContractConverter
/**
* Converter of JSON PACT file
*
@@ -45,7 +44,7 @@ class PactContractConverter implements ContractConverter<Collection<Pact>> {
@Override
boolean isAccepted(File file) {
try {
PactReader.loadPact(file)
DefaultPactReader.INSTANCE.loadPact(file)
return true
}
catch (Exception e) {
@@ -55,7 +54,7 @@ class PactContractConverter implements ContractConverter<Collection<Pact>> {
@Override
Collection<Contract> convertFrom(File file) {
Pact pact = PactReader.loadPact(file)
Pact pact = DefaultPactReader.INSTANCE.loadPact(file)
if (pact instanceof RequestResponsePact) {
return requestResponseSCContractCreator.
convertFrom(pact as RequestResponsePact)

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponsePactCreator.groovy
View File

@@ -23,7 +23,7 @@ import au.com.dius.pact.consumer.dsl.DslPart
import au.com.dius.pact.consumer.dsl.PactDslRequestWithPath
import au.com.dius.pact.consumer.dsl.PactDslResponse
import au.com.dius.pact.consumer.dsl.PactDslWithProvider
import au.com.dius.pact.model.RequestResponsePact
import au.com.dius.pact.core.model.RequestResponsePact
import groovy.transform.CompileStatic
import groovy.transform.PackageScope

40
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/RequestResponseSCContractCreator.groovy
View File

@@ -18,26 +18,26 @@ package org.springframework.cloud.contract.verifier.spec.pact
import java.util.regex.Pattern
import au.com.dius.pact.model.OptionalBody
import au.com.dius.pact.model.ProviderState
import au.com.dius.pact.model.Request
import au.com.dius.pact.model.RequestResponseInteraction
import au.com.dius.pact.model.RequestResponsePact
import au.com.dius.pact.model.Response
import au.com.dius.pact.model.matchingrules.Category
import au.com.dius.pact.model.matchingrules.DateMatcher
import au.com.dius.pact.model.matchingrules.MatchingRule
import au.com.dius.pact.model.matchingrules.MatchingRuleGroup
import au.com.dius.pact.model.matchingrules.MaxTypeMatcher
import au.com.dius.pact.model.matchingrules.MinMaxTypeMatcher
import au.com.dius.pact.model.matchingrules.MinTypeMatcher
import au.com.dius.pact.model.matchingrules.NullMatcher
import au.com.dius.pact.model.matchingrules.NumberTypeMatcher
import au.com.dius.pact.model.matchingrules.RegexMatcher
import au.com.dius.pact.model.matchingrules.RuleLogic
import au.com.dius.pact.model.matchingrules.TimeMatcher
import au.com.dius.pact.model.matchingrules.TimestampMatcher
import au.com.dius.pact.model.matchingrules.TypeMatcher
import au.com.dius.pact.core.model.OptionalBody
import au.com.dius.pact.core.model.ProviderState
import au.com.dius.pact.core.model.Request
import au.com.dius.pact.core.model.RequestResponseInteraction
import au.com.dius.pact.core.model.RequestResponsePact
import au.com.dius.pact.core.model.Response
import au.com.dius.pact.core.model.matchingrules.Category
import au.com.dius.pact.core.model.matchingrules.DateMatcher
import au.com.dius.pact.core.model.matchingrules.MatchingRule
import au.com.dius.pact.core.model.matchingrules.MatchingRuleGroup
import au.com.dius.pact.core.model.matchingrules.MaxTypeMatcher
import au.com.dius.pact.core.model.matchingrules.MinMaxTypeMatcher
import au.com.dius.pact.core.model.matchingrules.MinTypeMatcher
import au.com.dius.pact.core.model.matchingrules.NullMatcher
import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher
import au.com.dius.pact.core.model.matchingrules.RegexMatcher
import au.com.dius.pact.core.model.matchingrules.RuleLogic
import au.com.dius.pact.core.model.matchingrules.TimeMatcher
import au.com.dius.pact.core.model.matchingrules.TimestampMatcher
import au.com.dius.pact.core.model.matchingrules.TypeMatcher
import groovy.transform.CompileStatic
import groovy.transform.PackageScope

26
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/groovy/org/springframework/cloud/contract/verifier/spec/pact/ValueGeneratorConverter.groovy
View File

@@ -18,19 +18,19 @@ package org.springframework.cloud.contract.verifier.spec.pact
import java.util.regex.Pattern
import au.com.dius.pact.model.generators.Category
import au.com.dius.pact.model.generators.DateGenerator
import au.com.dius.pact.model.generators.DateTimeGenerator
import au.com.dius.pact.model.generators.Generator
import au.com.dius.pact.model.generators.Generators
import au.com.dius.pact.model.generators.RandomBooleanGenerator
import au.com.dius.pact.model.generators.RandomDecimalGenerator
import au.com.dius.pact.model.generators.RandomHexadecimalGenerator
import au.com.dius.pact.model.generators.RandomIntGenerator
import au.com.dius.pact.model.generators.RandomStringGenerator
import au.com.dius.pact.model.generators.RegexGenerator
import au.com.dius.pact.model.generators.TimeGenerator
import au.com.dius.pact.model.generators.UuidGenerator
import au.com.dius.pact.core.model.generators.Category
import au.com.dius.pact.core.model.generators.DateGenerator
import au.com.dius.pact.core.model.generators.DateTimeGenerator
import au.com.dius.pact.core.model.generators.Generator
import au.com.dius.pact.core.model.generators.Generators
import au.com.dius.pact.core.model.generators.RandomBooleanGenerator
import au.com.dius.pact.core.model.generators.RandomDecimalGenerator
import au.com.dius.pact.core.model.generators.RandomHexadecimalGenerator
import au.com.dius.pact.core.model.generators.RandomIntGenerator
import au.com.dius.pact.core.model.generators.RandomStringGenerator
import au.com.dius.pact.core.model.generators.RegexGenerator
import au.com.dius.pact.core.model.generators.TimeGenerator
import au.com.dius.pact.core.model.generators.UuidGenerator
import groovy.transform.CompileStatic
import groovy.transform.PackageScope

6
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilderSpec.groovy
View File

@@ -18,10 +18,10 @@ package org.springframework.cloud.contract.stubrunner
import java.nio.file.Files
import au.com.dius.pact.model.Pact
import au.com.dius.pact.model.PactSource
import au.com.dius.pact.core.model.Pact
import au.com.dius.pact.core.model.PactSource
import au.com.dius.pact.provider.junit.loader.PactLoader
import au.com.dius.pact.support.expressions.ValueResolver
import au.com.dius.pact.core.support.expressions.ValueResolver
import com.github.tomakehurst.wiremock.stubbing.StubMapping
import org.jetbrains.annotations.NotNull
import spock.lang.Ignore

10
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.contract.verifier.spec.pact
import java.nio.file.Files
import au.com.dius.pact.model.Pact
import au.com.dius.pact.model.PactSpecVersion
import au.com.dius.pact.core.model.Pact
import au.com.dius.pact.core.model.PactSpecVersion
import groovy.json.JsonOutput
import org.skyscreamer.jsonassert.JSONAssert
import spock.lang.Issue
@@ -65,12 +65,12 @@ class PactContractConverterSpec extends Specification {
converter.isAccepted(pactJson)
}
def "should reject json files that are pact files"() {
def "should reject json files that are invalid pact files"() {
given:
File invalidPact = new File(PactContractConverterSpec.
getResource("/pact/invalid_pact.json").toURI())
expect:
converter.isAccepted(invalidPact)
!converter.isAccepted(invalidPact)
}
def "should convert from pact to contract"() {
@@ -347,7 +347,7 @@ class PactContractConverterSpec extends Specification {
],
"metadata": {
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json
View File

@@ -147,7 +147,7 @@
],
"metadata": {
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json
View File

@@ -274,7 +274,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json
View File

@@ -98,7 +98,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json
View File

@@ -90,7 +90,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json
View File

@@ -70,7 +70,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json
View File

@@ -39,7 +39,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json
View File

@@ -38,7 +38,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json
View File

@@ -22,7 +22,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "3.6.14"
"version": "4.0.9"
}
}
}

2
spring-cloud-contract-verifier/pom.xml
View File

@@ -59,7 +59,7 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
<optional>true</optional>
</dependency>

5
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/config/framework/TestFrameworkDefinition.java
View File

@@ -92,9 +92,8 @@ public interface TestFrameworkDefinition {
/**
* @param annotationValue value of the annotation
* @return the test rule or extension annotation with the annotationValue passed as
* an argument. E.g. for JUnit 5 tests that could be
* {@code @ExtendWith(Example.class)}
* @return the test rule or extension annotation with the annotationValue passed as an
* argument. E.g. for JUnit 5 tests that could be {@code @ExtendWith(Example.class)}
*/
String getRuleAnnotation(String annotationValue);

2
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java
View File

@@ -24,7 +24,7 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.support.DefaultExchange;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.support.DefaultMessage;
/**
* @author Marcin Grzejszczak

6
tests/samples-messaging-camel/pom.xml
View File

@@ -15,7 +15,7 @@
<description>Spring Cloud Contract Sample Camel</description>
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
@@ -23,8 +23,8 @@
<artifactId>camel-jms</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
<groupId>org.apache.camel</groupId>
<artifactId>camel-activemq</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>

6
tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java
View File

@@ -16,10 +16,10 @@
package com.example;
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.activemq.ActiveMQComponent;
import org.apache.camel.model.dataformat.JsonLibrary;
import org.apache.camel.spring.SpringRouteBuilder;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -41,7 +41,7 @@ public class BookRouteConfiguration {
@Bean
RoutesBuilder myRouter(final BookService bookService, final BookDeleter bookDeleter) {
return new SpringRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() throws Exception {

6
tests/samples-messaging-camel/src/main/java/com/example/BookService.java
View File

@@ -36,9 +36,9 @@ public class BookService {
*/
public void returnBook(Exchange exchange) {
BookReturned bookReturned = exchange.getIn().getBody(BookReturned.class);
log.info("Returning book [$bookReturned]");
exchange.getOut().setBody(bookReturned);
exchange.getOut().setHeader("BOOK-NAME", bookReturned.bookName);
log.info("Returning book [" + bookReturned + "]");
exchange.getMessage().setBody(bookReturned);
exchange.getMessage().setHeader("BOOK-NAME", bookReturned.bookName);
}
}

6
tests/spring-cloud-contract-stub-runner-camel/pom.xml
View File

@@ -24,7 +24,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
@@ -56,8 +56,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
<groupId>org.apache.camel</groupId>
<artifactId>camel-activemq</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
tests/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy
View File

@@ -18,14 +18,14 @@ package org.springframework.cloud.contract.stubrunner.messaging.camel
import groovy.json.JsonOutput
import groovy.json.JsonSlurper
import org.apache.activemq.camel.component.ActiveMQComponent
import org.apache.activemq.spring.ActiveMQConnectionFactory
import org.apache.camel.CamelContext
import org.apache.camel.ConsumerTemplate
import org.apache.camel.Exchange
import org.apache.camel.ProducerTemplate
import org.apache.camel.component.activemq.ActiveMQComponent
import org.apache.camel.component.jms.JmsConfiguration
import org.apache.camel.impl.DefaultShutdownStrategy
import org.apache.camel.impl.engine.DefaultShutdownStrategy
import spock.lang.IgnoreIf
import spock.lang.Specification