From 47e88db6b4bdb720f1fc1567be4858a024c678a3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 15 Jul 2021 11:14:20 +0200 Subject: [PATCH] Fixed the jdk16 problem --- .../verifier/builder/TestSideRequestTemplateModel.java | 8 ++++---- .../verifier/template/HandlebarsTemplateProcessor.java | 6 +++--- .../verifier/builder/MethodBodyBuilderSpec.groovy | 3 --- .../builder/SpringTestMethodBodyBuildersSpec.groovy | 4 ---- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.java index c7489c8dac..b8423cb3cf 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.java @@ -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) o -> MapConverter.getTestSideValues(o).toString(), - Collectors.toList()))); + Collectors.toList())))); } private static String fullUrl(String url, Map> 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 buildPathsFromUrl(String url) { diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.java index 23f16090b5..30b315db74 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/template/HandlebarsTemplateProcessor.java @@ -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 model = Collections - .singletonMap(HandlebarsJsonPathHelper.REQUEST_MODEL_NAME, templateModel); + Map model = new HashMap<>(); + model.put(HandlebarsJsonPathHelper.REQUEST_MODEL_NAME, templateModel); Template bodyTemplate = uncheckedCompileTemplate(testContents); return templatedResponseBody(model, bodyTemplate); } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy index ef7c72213d..cac1447771 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy @@ -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 { diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy index 93a8d14c8b..b016313dc2 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy @@ -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[]