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

Fixed the jdk16 problem

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-07-15 11:14:20 +02:00
parent abf926c7fe
commit 47e88db6b4
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.java
View File

@@ -133,10 +133,10 @@ public class TestSideRequestTemplateModel {
if (!headersEntriesPresent) {
return new HashMap<>();
}
return request.getHeaders().getEntries().stream()
return new HashMap<>(request.getHeaders().getEntries().stream()
.collect(Collectors.groupingBy(Header::getName,
Collectors.mapping((Function<Object, String>) o -> MapConverter.getTestSideValues(o).toString(),
Collectors.toList())));
Collectors.toList()))));
}
private static String fullUrl(String url, Map<String, List<Object>> query, boolean queryParamsPresent) {
@@ -153,8 +153,8 @@ public class TestSideRequestTemplateModel {
if (queryParameters == null) {
return new HashMap<>();
}
return queryParameters.getParameters().stream().collect(Collectors.groupingBy(QueryParameter::getName,
Collectors.mapping(MapConverter::getTestSideValues, Collectors.toList())));
return new HashMap<>(queryParameters.getParameters().stream().collect(Collectors.groupingBy(
QueryParameter::getName, Collectors.mapping(MapConverter::getTestSideValues, Collectors.toList()))));
}
private static List<String> buildPathsFromUrl(String url) {

6
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.template;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -64,8 +64,8 @@ public class HandlebarsTemplateProcessor implements TemplateProcessor, ContractT
@Override
public String transform(Request request, String testContents) {
TestSideRequestTemplateModel templateModel = TestSideRequestTemplateModel.from(request);
Map<String, TestSideRequestTemplateModel> model = Collections
.singletonMap(HandlebarsJsonPathHelper.REQUEST_MODEL_NAME, templateModel);
Map<String, TestSideRequestTemplateModel> model = new HashMap<>();
model.put(HandlebarsJsonPathHelper.REQUEST_MODEL_NAME, templateModel);
Template bodyTemplate = uncheckedCompileTemplate(testContents);
return templatedResponseBody(model, bodyTemplate);
}

3
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
View File

@@ -574,7 +574,6 @@ class MethodBodyBuilderSpec extends Specification implements WireMockStubVerifie
}
@Issue('#458')
@IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
def 'should reference request from body when body is a string [#methodBuilderName]'() {
given:
Contract contractDsl = Contract.make {
@@ -684,7 +683,6 @@ class MethodBodyBuilderSpec extends Specification implements WireMockStubVerifie
}
@Issue('#702')
@IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
def 'should generate proper type for large numbers [#methodBuilderName]'() {
given:
Contract contractDsl = Contract.make {
@@ -2033,7 +2031,6 @@ response:
}
}
@IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
def 'should resolve headers from request correctly'() {
given:
Contract contractDsl = Contract.make {

4
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy
View File

@@ -19,8 +19,6 @@ package org.springframework.cloud.contract.verifier.builder
import java.util.regex.Pattern
import org.junit.Rule
import org.spockframework.runtime.extension.builtin.PreconditionContext
import spock.lang.IgnoreIf
import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification
@@ -2790,7 +2788,6 @@ DocumentContext parsedJson = JsonPath.parse(json);
}
@Issue('#230')
@IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
def 'should manage to reference request in response [#methodBuilderName]'() {
given:
//tag::template_contract[]
@@ -2892,7 +2889,6 @@ DocumentContext parsedJson = JsonPath.parse(json);
}
@Issue('#230')
@IgnoreIf({ PreconditionContext it -> it.jvm.java16Compatible })
def 'should manage to reference request in response via WireMock native entries [#methodBuilderName]'() {
given:
//tag::template_contract[]