Refactor json marshalling on JVM to match unmarshaller signature for consistency.

Author: kierans

http-api-client/src/jvmMain/kotlin/au/com/redcrew/apisdkcreator/httpclient/json-marshaller.kt

@@ -6,8 +6,8 @@ import kotlin.reflect.KClass
 /**
  * A factory function to aid in marshalling JSON data into a HttpRequest.
  */
-fun jsonMarshaller(contentType: String = JSON_MIME_TYPE): (Marshaller) -> HttpRequestPolicy<*, UnstructuredData> =
-    marshallerFor(contentType)
+fun jsonMarshaller(marshaller: Marshaller, contentType: String = JSON_MIME_TYPE): HttpRequestPolicy<*, UnstructuredData> =
+    marshallerFor(contentType)(marshaller)
 
 /**
  * A factory function to aid in unmarshalling JSON data

http-api-client/src/jvmTest/kotlin/au/com/redcrew/apisdkcreator/httpclient/json-marshaller-test.kt

@@ -27,10 +27,10 @@ class JsonMarshallingTest : DescribeSpec({
             val request = aHttpRequest<TestBody>().withBody(body).build()
 
             suspend fun marshall(contentType: String): Either<SdkError, HttpRequest<UnstructuredData>> =
-                jsonMarshaller(contentType)(marshaller)(request)
+                jsonMarshaller(marshaller, contentType)(request)
 
             suspend fun marshall(): Either<SdkError, HttpRequest<UnstructuredData>> =
-                jsonMarshaller()(marshaller)(request)
+                jsonMarshaller(marshaller)(request)
 
             it("should set content type") {
                 val contentType = "application/json+vnd"