From 2d5c2dd9312f75fa2c4a5a862f1d680a6885e0b3 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 23 Oct 2018 22:53:23 +0200
Subject: [PATCH] Fixes missing casting; fixes gh-764

---
 pom.xml                                                       | 4 ++--
 spring-cloud-contract-dependencies/pom.xml                    | 2 +-
 .../cloud/contract/verifier/builder/MethodBodyBuilder.groovy  | 2 +-
 .../builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9fae3c4ed8..e80b818f83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -26,7 +26,7 @@
 		<checkstyle.version>2.17</checkstyle.version>
 		<pact.version>3.5.13</pact.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
-		<spring-cloud-build.version>2.0.4.RELEASE</spring-cloud-build.version>
+		<spring-cloud-build.version>2.0.5.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<spring-cloud-zookeeper.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
 		<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index 3327570bf9..b5557061c0 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.0.5.BUILD-SNAPSHOT</version>
     <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
index 7c26e8626a..f58c555c66 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
@@ -492,7 +492,7 @@ abstract class MethodBodyBuilder {
 
 	protected void methodForNullCheck(BodyMatcher bodyMatcher, BlockBuilder bb) {
 		String quotedAndEscaptedPath = quotedAndEscaped(bodyMatcher.path())
-		String method = "assertThat(parsedJson.read(${quotedAndEscaptedPath})).isNull()"
+		String method = "assertThat((Object) parsedJson.read(${quotedAndEscaptedPath})).isNull()"
 		bb.addLine(postProcessJsonPathCall(method))
 		addColonIfRequired(bb)
 	}
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy
index ce7b49fa2d..1ea995b393 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy
@@ -189,7 +189,7 @@ class MockMvcMethodBodyBuilderWithMatchersSpec extends Specification implements
 			test.contains('assertThat((java.lang.Iterable) parsedJson.read("' + rootElement + '.valueWithMaxEmpty", java.util.Collection.class)).as("' + rootElement + '.valueWithMaxEmpty").hasSizeLessThanOrEqualTo(0)')
 			test.contains('assertThatValueIsANumber(parsedJson.read("' + rootElement + '.duck")')
 			test.contains('assertThat(parsedJson.read("' + rootElement + '''.['key'].['complex.key']", String.class)).isEqualTo("foo")''')
-			test.contains('assertThat(parsedJson.read("' + rootElement + '.nullValue")).isNull()')
+			test.contains('assertThat((Object) parsedJson.read("' + rootElement + '.nullValue")).isNull()')
 			!test.contains('cursor')
 		and:
 			try {