From 98783853b817e791f6361471a604648ebca8d83c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 14 Jul 2021 12:01:27 +0200 Subject: [PATCH] More fixes to the java16 build --- .../project/gradle/wrapper/gradle-wrapper.properties | 2 +- .../messaging/amqp/SpringAmqpStubMessagesSpec.groovy | 5 ++++- .../contract/verifier/messaging/amqp/AmqpMetadataTests.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties b/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties index f371643eed..05679dc3c1 100644 --- a/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties +++ b/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy index 9fa49e82d1..121b084368 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy @@ -75,6 +75,7 @@ class SpringAmqpStubMessagesSpec extends Specification { }) } + // for JDK 16 the merge option won't work and the metadata needs to be FULLY applied def "should send amqp message with metadata id"() { given: listenerContainer.setMessageListener(messageListenerAdapter) @@ -93,7 +94,9 @@ class SpringAmqpStubMessagesSpec extends Specification { "amqp": [ "input": ["messageProperties": [ correlationId: "correlationIdValue", - consumerQueue: "queue"]] + consumerQueue: "queue", + contentType: CONTENT_TYPE_JSON, + receivedRoutingKey: routingKey]] ], "verifierMessage" : [messageType: "INPUT"] ])) diff --git a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/messaging/amqp/AmqpMetadataTests.java b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/messaging/amqp/AmqpMetadataTests.java index 380f35fdc0..a006b4d9dc 100644 --- a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/messaging/amqp/AmqpMetadataTests.java +++ b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/messaging/amqp/AmqpMetadataTests.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.BDDAssertions.then; class AmqpMetadataTests { YAMLMapper mapper = new YAMLMapper(); - + @Test void should_parse_the_metadata_entry() throws JsonProcessingException { // @formatter:off