fix: Message should return metadata as Map<String, Object> #1006

Author: Ronald Holshausen

Diff for: consumer/pact-jvm-consumer-junit/src/main/java/au/com/dius/pact/consumer/junit/MessagePactProviderRule.java

@@ -35,7 +35,7 @@ public class MessagePactProviderRule extends ExternalResource {
 	private byte[] message;
 	private Map<String, Message> providerStateMessages;
 	private MessagePact messagePact;
-	private Map<String, String> metadata;
+	private Map<String, Object> metadata;
 
 	/**
 	 * @param testClassInstance
@@ -237,7 +237,7 @@ public byte[] getMessage() {
 		return message;
 	}
 
-	public Map<String, String> getMetadata() {
+	public Map<String, Object> getMetadata() {
 		if (metadata == null) {
 			throw new UnsupportedOperationException("Message metadata was not created and cannot be retrieved." +
 								" Check @Pact and @PactVerification match.");

Diff for: consumer/pact-jvm-consumer/src/main/kotlin/au/com/dius/pact/consumer/MessagePactBuilder.kt

@@ -110,7 +110,7 @@ class MessagePactBuilder(
     if (contentTypeEntry == null) {
       metadata["contentType"] = contentType.toString()
     } else {
-      contentType = ContentType(contentTypeEntry.value)
+      contentType = ContentType(contentTypeEntry.value.toString())
       metadata.remove(contentTypeEntry.key)
       metadata["contentType"] = contentTypeEntry.value
     }

Diff for: core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt

@@ -116,7 +116,7 @@ object Matching : KLogging() {
   }
 
   @JvmStatic
-  fun compareMessageMetadata(e: Map<String, Any>, a: Map<String, Any>, matchers: MatchingRules?): List<MetadataMismatch> {
+  fun compareMessageMetadata(e: Map<String, Any?>, a: Map<String, Any?>, matchers: MatchingRules?): List<MetadataMismatch> {
     return e.entries.fold(listOf()) { list, value ->
       if (a.containsKey(value.key)) {
         val actual = a[value.key]

Diff for: core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/Message.kt

@@ -26,7 +26,7 @@ class Message @JvmOverloads constructor(
   var contents: OptionalBody = OptionalBody.missing(),
   var matchingRules: MatchingRules = MatchingRulesImpl(),
   var generators: Generators = Generators(),
-  var metaData: Map<String, String> = mapOf(),
+  var metaData: Map<String, Any?> = mapOf(),
   override val interactionId: String? = null
 ) : Interaction {
 
@@ -127,7 +127,7 @@ class Message @JvmOverloads constructor(
       "matchingRules=$matchingRules, generators=$generators, metaData=$metaData)"
   }
 
-  fun withMetaData(metadata: Map<String, String>): Message {
+  fun withMetaData(metadata: Map<String, Any>): Message {
     this.metaData = metadata
     return this
   }
@@ -147,7 +147,7 @@ class Message @JvmOverloads constructor(
       }
 
       val metaData = if (json.has("metaData"))
-        json["metaData"].obj.entrySet().associate { it.key to Json.toString(it.value) }
+        json["metaData"].obj.entrySet().associate { it.key to Json.fromJson(it.value) }
       else
         emptyMap()
 
@@ -184,7 +184,7 @@ class Message @JvmOverloads constructor(
       }
     }
 
-    fun getContentType(metaData: Map<String, Any>): String {
+    fun getContentType(metaData: Map<String, Any?>): String {
       return metaData.entries.find {
         it.key.toLowerCase() == "contenttype" || it.key.toLowerCase() == "content-type"
       }?.value?.toString() ?: JSON