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

Merge branch '3.0.x' into main

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-08-16 11:31:28 +02:00
parent 583dabd275 e5c8207d57
commit af65ea9d31
8 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -62,6 +62,7 @@
<contract.kotlin.version>1.5.20</contract.kotlin.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<sisu-inject-plexus.version>2.6.0</sisu-inject-plexus.version>
<javadoc.failOnError>true</javadoc.failOnError>
<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
@@ -421,6 +422,11 @@
<artifactId>maven-settings-builder</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
<version>${sisu-inject-plexus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>

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

@@ -15,7 +15,7 @@
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.30.0</wiremock.version>
<wiremock.version>2.30.1</wiremock.version>
<jsonassert.version>0.6.1</jsonassert.version>
</properties>
<dependencyManagement>

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

@@ -79,6 +79,10 @@
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
</dependency>
</dependencies>
<build>
<plugins>

11
spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/java/org/springframework/cloud/contract/verifier/wiremock/DefaultWireMockStubPostProcessorTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.cloud.contract.verifier.wiremock;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -151,10 +152,12 @@ class DefaultWireMockStubPostProcessorTests {
then(result.getRequest().getMethod().getName()).isEqualTo("GET");
then(result.getResponse().getStatus()).isEqualTo(200);
then(result.getResponse().getBody()).isEqualTo("pong");
then(result.getPostServeActions()).extracting("name").contains("webhook");
PostServeActionDefinition webhook = result.getPostServeActions().stream()
.filter(def -> "webhook".equals(def.getName())).findFirst().get();
then(webhook.getParameters().get("method")).isEqualTo("POST");
then(result.getPostServeActions().stream().map(a -> a.getName()).collect(Collectors.toList()))
.contains("webhook");
PostServeActionDefinition definition = result.getPostServeActions().stream()
.filter(a -> a.getName().equals("webhook")).findFirst()
.orElseThrow(() -> new AssertionError("No webhook action found"));
then(definition.getParameters().getString("method")).isEqualTo("POST");
}
}

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

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.30.0
wiremockVersion=2.30.1
jsonAssertVersion=0.6.1
verifierVersion=3.1.0-SNAPSHOT
groovyVersion=2.4.17

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

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.30.0
wiremockVersion=2.30.1
jsonAssertVersion=0.6.1
verifierVersion=3.1.0-SNAPSHOT
bootVersion=2.6.0-M1

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

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.30.0
wiremockVersion=2.30.1
jsonAssertVersion=0.6.1
verifierVersion=3.1.0-SNAPSHOT
bootVersion=2.6.0-M1

2
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/dsl/wiremock/DefaultResponseTransformer.java
View File

@@ -42,7 +42,7 @@ public class DefaultResponseTransformer extends ResponseTemplateTransformer {
super(global);
}
public DefaultResponseTransformer(boolean global, String helperName, Helper helper) {
public DefaultResponseTransformer(boolean global, String helperName, Helper<?> helper) {
super(global, helperName, helper);
}