Fix free-form body params

Author: sir4ur0n

modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache

@@ -43,9 +43,8 @@ let {{{operationId}}} {{^hasParams}}(){{/hasParams}}{{#allParams}}{{> to_param}}
 {{/hasAuthMethods}}
 {{#bodyParams}}
     let body = Request.
-        {{#isFreeFormObject}}write_json_body {{{paramName}}}{{/isFreeFormObject}}
         {{#isByteArray}}write_string_body {{{paramName}}}{{/isByteArray}}
-        {{^isFreeFormObject}}{{^isByteArray}}write_as_json_body {{> to_json}} {{{paramName}}}{{/isByteArray}}{{/isFreeFormObject}}
+        {{^isByteArray}}write_as_json_body {{> to_json}} {{{paramName}}}{{/isByteArray}}
     in
 {{/bodyParams}}
 {{^hasBodyParam}}

modules/openapi-generator/src/main/resources/ocaml/to_json.mustache

@@ -33,3 +33,4 @@
     {{/isContainer}}
 {{/isModel}}
 {{#isBinary}}JsonSupport.of_string{{/isBinary}}
+{{#isAnyType}}(fun x -> x){{/isAnyType}}

samples/client/petstore/ocaml-fake-petstore/src/apis/another_fake_api.ml

@@ -11,7 +11,6 @@ let call_123_test_special_tags ~client_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -21,6 +20,7 @@ let call_123_test_special_tags ~client_t =
 
             Client.to_yojson
 
+
  client_t
     in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->

samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.ml

@@ -55,7 +55,6 @@ let fake_http_signature_test ~pet_t ?query_1 ?header_1 () =
  query_1 in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -65,6 +64,7 @@ let fake_http_signature_test ~pet_t ?query_1 ?header_1 () =
 
             Pet.to_yojson
 
+
  pet_t
     in
     Cohttp_lwt_unix.Client.call `GET uri ~headers ~body >>= fun (resp, body) ->
@@ -76,7 +76,6 @@ let fake_outer_boolean_serialize ~body () =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -85,6 +84,7 @@ let fake_outer_boolean_serialize ~body () =
 
 JsonSupport.of_bool
 
+
  body
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -96,7 +96,6 @@ let fake_outer_composite_serialize ~outer_composite_t () =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -106,6 +105,7 @@ let fake_outer_composite_serialize ~outer_composite_t () =
 
             Outer_composite.to_yojson
 
+
  outer_composite_t
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -117,7 +117,6 @@ let fake_outer_number_serialize ~body () =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -126,6 +125,7 @@ JsonSupport.of_float
 
 
 
+
  body
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -137,7 +137,6 @@ let fake_outer_string_serialize ~body () =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body JsonSupport.of_string
 
 
@@ -146,6 +145,7 @@ let fake_outer_string_serialize ~body () =
 
 
 
+
  body
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -157,7 +157,6 @@ let fake_property_enum_integer_serialize ~outer_object_with_enum_property_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -167,6 +166,7 @@ let fake_property_enum_integer_serialize ~outer_object_with_enum_property_t =
 
             Outer_object_with_enum_property.to_yojson
 
+
  outer_object_with_enum_property_t
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -177,9 +177,27 @@ let test_additional_properties_reference ~request_body =
     let uri = Request.build_uri "/fake/additionalProperties-reference" in
     let headers = Request.default_headers in
     let body = Request.
-        write_json_body request_body
-        
 
+        write_as_json_body         (JsonSupport.of_map_of 
+
+
+
+
+
+
+
+(fun x -> x)
+)
+
+
+
+
+
+
+
+
+
+ request_body
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
@@ -190,7 +208,6 @@ let test_body_with_binary ~body =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -199,6 +216,7 @@ let test_body_with_binary ~body =
 
 
 JsonSupport.of_string
+
  body
     in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
@@ -210,7 +228,6 @@ let test_body_with_file_schema ~file_schema_test_class_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -220,6 +237,7 @@ let test_body_with_file_schema ~file_schema_test_class_t =
 
             File_schema_test_class.to_yojson
 
+
  file_schema_test_class_t
     in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
@@ -246,7 +264,6 @@ let test_body_with_query_params ~query ~user_t =
  query in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -256,6 +273,7 @@ let test_body_with_query_params ~query ~user_t =
 
             User.to_yojson
 
+
  user_t
     in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
@@ -267,7 +285,6 @@ let test_client_model ~client_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -277,6 +294,7 @@ let test_client_model ~client_t =
 
             Client.to_yojson
 
+
  client_t
     in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->
@@ -668,7 +686,6 @@ let test_inline_additional_properties ~request_body =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body         (JsonSupport.of_map_of JsonSupport.of_string
 
 
@@ -677,6 +694,7 @@ let test_inline_additional_properties ~request_body =
 
 
 
+
 )
 
 
@@ -686,6 +704,7 @@ let test_inline_additional_properties ~request_body =
 
 
 
+
  request_body
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -697,7 +716,6 @@ let test_inline_freeform_additional_properties ~test_inline_freeform_additional_
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -707,6 +725,7 @@ let test_inline_freeform_additional_properties ~test_inline_freeform_additional_
 
             Test_inline_freeform_additional_properties_request.to_yojson
 
+
  test_inline_freeform_additional_properties_request_t
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -757,7 +776,6 @@ let test_nullable ~child_with_nullable_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -767,6 +785,7 @@ let test_nullable ~child_with_nullable_t =
 
             Child_with_nullable.to_yojson
 
+
  child_with_nullable_t
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -969,7 +988,6 @@ let test_string_map_reference ~request_body =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body         (JsonSupport.of_map_of JsonSupport.of_string
 
 
@@ -978,6 +996,7 @@ let test_string_map_reference ~request_body =
 
 
 
+
 )
 
 
@@ -987,6 +1006,7 @@ let test_string_map_reference ~request_body =
 
 
 
+
  request_body
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->

samples/client/petstore/ocaml-fake-petstore/src/apis/fake_classname_tags123_api.ml

@@ -12,7 +12,6 @@ let test_classname ~client_t =
     let uri = Uri.add_query_param' uri ("api_key_query", Request.api_key) in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -22,6 +21,7 @@ let test_classname ~client_t =
 
             Client.to_yojson
 
+
  client_t
     in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->

samples/client/petstore/ocaml-fake-petstore/src/apis/pet_api.ml

@@ -11,7 +11,6 @@ let add_pet ~pet_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -21,6 +20,7 @@ let add_pet ~pet_t =
 
             Pet.to_yojson
 
+
  pet_t
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
@@ -138,7 +138,6 @@ let update_pet ~pet_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -148,6 +147,7 @@ let update_pet ~pet_t =
 
             Pet.to_yojson
 
+
  pet_t
     in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->

samples/client/petstore/ocaml-fake-petstore/src/apis/store_api.ml

@@ -63,7 +63,6 @@ let place_order ~order_t =
     let headers = Request.default_headers in
     let body = Request.
 
-        
         write_as_json_body 
 
 
@@ -73,6 +72,7 @@ let place_order ~order_t =
 
             Order.to_yojson
 
+
  order_t
     in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->