Indent to_json.mustache for easier maintenance

Author: sir4ur0n

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

@@ -1 +1,34 @@
-{{#isArray}}{{#items}}(JsonSupport.of_list_of {{> to_json}}){{/items}}{{/isArray}}{{#isMap}}{{#items}}(JsonSupport.of_map_of {{> to_json}}){{/items}}{{/isMap}}{{#isString}}JsonSupport.of_string{{/isString}}{{#isLong}}JsonSupport.of_int64{{/isLong}}{{#isInteger}}JsonSupport.of_int32{{/isInteger}}{{#isFloat}}JsonSupport.of_float{{/isFloat}}{{#isNumber}}JsonSupport.of_float{{/isNumber}}{{#isDouble}}JsonSupport.of_float{{/isDouble}}{{#isBoolean}}JsonSupport.of_bool{{/isBoolean}}{{^isEnum}}{{#isModel}}{{#vendorExtensions.x-model-module}}{{{vendorExtensions.x-model-module}}}.to_yojson{{/vendorExtensions.x-model-module}}{{^vendorExtensions.x-model-module}}{{{baseType}}}.to_yojson{{/vendorExtensions.x-model-module}}{{/isModel}}{{/isEnum}}{{^isModel}}{{^isContainer}}{{#isEnum}}Enums.{{{datatypeWithEnum}}}_to_yojson{{/isEnum}}{{/isContainer}}{{/isModel}}
+{{#isArray}}
+    {{#items}}
+        (JsonSupport.of_list_of {{> to_json}})
+    {{/items}}
+{{/isArray}}
+{{#isMap}}
+    {{#items}}
+        (JsonSupport.of_map_of {{> to_json}})
+    {{/items}}
+{{/isMap}}
+{{#isString}}JsonSupport.of_string{{/isString}}
+{{#isLong}}JsonSupport.of_int64{{/isLong}}
+{{#isInteger}}JsonSupport.of_int32{{/isInteger}}
+{{#isFloat}}JsonSupport.of_float{{/isFloat}}
+{{#isNumber}}JsonSupport.of_float{{/isNumber}}
+{{#isDouble}}JsonSupport.of_float{{/isDouble}}
+{{#isBoolean}}JsonSupport.of_bool{{/isBoolean}}
+{{^isEnum}}
+    {{#isModel}}
+        {{#vendorExtensions.x-model-module}}
+            {{{vendorExtensions.x-model-module}}}.to_yojson
+        {{/vendorExtensions.x-model-module}}
+        {{^vendorExtensions.x-model-module}}
+            {{{baseType}}}.to_yojson
+        {{/vendorExtensions.x-model-module}}
+    {{/isModel}}
+{{/isEnum}}
+{{^isModel}}
+    {{^isContainer}}
+        {{#isEnum}}
+            Enums.{{{datatypeWithEnum}}}_to_yojson
+        {{/isEnum}}
+    {{/isContainer}}
+{{/isModel}}

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

@@ -9,7 +9,15 @@ let call_123_test_special_tags ~client_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/another-fake/dummy" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Client.to_yojson client_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Client.to_yojson
+ client_t in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.unwrap Client.of_yojson) resp body
 

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

@@ -27,71 +27,146 @@ let fake_http_signature_test ~pet_t ?query_1 ?header_1 () =
  header_1 in
     let uri = Request.maybe_add_query_param uri "query_1" (fun x -> x)
  query_1 in
-    let body = Request.write_as_json_body Pet.to_yojson pet_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Pet.to_yojson
+ pet_t in
     Cohttp_lwt_unix.Client.call `GET uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
 let fake_outer_boolean_serialize ~body () =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/outer/boolean" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body JsonSupport.of_bool body in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+JsonSupport.of_bool
+ body in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.to_bool) resp body
 
 let fake_outer_composite_serialize ~outer_composite_t () =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/outer/composite" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Outer_composite.to_yojson outer_composite_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Outer_composite.to_yojson
+ outer_composite_t in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.unwrap Outer_composite.of_yojson) resp body
 
 let fake_outer_number_serialize ~body () =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/outer/number" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body JsonSupport.of_float body in
+    let body = Request.write_as_json_body 
+
+
+
+JsonSupport.of_float
+
+
+ body in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.to_float) resp body
 
 let fake_outer_string_serialize ~body () =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/outer/string" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body JsonSupport.of_string body in
+    let body = Request.write_as_json_body JsonSupport.of_string
+
+
+
+
+
+
+ body in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.to_string) resp body
 
 let fake_property_enum_integer_serialize ~outer_object_with_enum_property_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/property/enum-int" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Outer_object_with_enum_property.to_yojson outer_object_with_enum_property_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            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) ->
     Request.read_json_body_as (JsonSupport.unwrap Outer_object_with_enum_property.of_yojson) resp body
 
 let test_additional_properties_reference ~request_body =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/additionalProperties-reference" in
     let headers = Request.default_headers in
-    let body = Request.write_json_body (JsonSupport.of_map_of ) request_body in
+    let body = Request.write_json_body         (JsonSupport.of_map_of 
+
+
+
+
+
+
+)
+
+
+
+
+
+
+
+ request_body in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
 let test_body_with_binary ~body =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/body-with-binary" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body  body in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+ body in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
 let test_body_with_file_schema ~file_schema_test_class_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/body-with-file-schema" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body File_schema_test_class.to_yojson file_schema_test_class_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            File_schema_test_class.to_yojson
+ file_schema_test_class_t in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
@@ -101,15 +176,31 @@ let test_body_with_query_params ~query ~user_t =
     let headers = Request.default_headers in
     let uri = Request.add_query_param uri "query" (fun x -> x)
  query in
-    let body = Request.write_as_json_body User.to_yojson user_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            User.to_yojson
+ user_t in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
 let test_client_model ~client_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Client.to_yojson client_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Client.to_yojson
+ client_t in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.unwrap Client.of_yojson) resp body
 
@@ -204,15 +295,38 @@ let test_inline_additional_properties ~request_body =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/inline-additionalProperties" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body (JsonSupport.of_map_of JsonSupport.of_string) request_body in
+    let body = Request.write_as_json_body         (JsonSupport.of_map_of JsonSupport.of_string
+
+
+
+
+
+
+)
+
+
+
+
+
+
+
+ request_body in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
 let test_inline_freeform_additional_properties ~test_inline_freeform_additional_properties_request_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/inline-freeform-additionalProperties" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Test_inline_freeform_additional_properties_request.to_yojson test_inline_freeform_additional_properties_request_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            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) ->
     Request.handle_unit_response resp
 
@@ -233,7 +347,15 @@ let test_nullable ~child_with_nullable_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/nullable" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Child_with_nullable.to_yojson child_with_nullable_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Child_with_nullable.to_yojson
+ child_with_nullable_t in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
@@ -268,7 +390,22 @@ let test_string_map_reference ~request_body =
     let open Lwt.Infix in
     let uri = Request.build_uri "/fake/stringMap-reference" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body (JsonSupport.of_map_of JsonSupport.of_string) request_body in
+    let body = Request.write_as_json_body         (JsonSupport.of_map_of JsonSupport.of_string
+
+
+
+
+
+
+)
+
+
+
+
+
+
+
+ request_body in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 

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

@@ -10,7 +10,15 @@ let test_classname ~client_t =
     let uri = Request.build_uri "/fake_classname_test" in
     let headers = Request.default_headers in
     let uri = Uri.add_query_param' uri ("api_key_query", Request.api_key) in
-    let body = Request.write_as_json_body Client.to_yojson client_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Client.to_yojson
+ client_t in
     Cohttp_lwt_unix.Client.call `PATCH uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.unwrap Client.of_yojson) resp body
 

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

@@ -9,7 +9,15 @@ let add_pet ~pet_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/pet" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Pet.to_yojson pet_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Pet.to_yojson
+ pet_t in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 
@@ -58,7 +66,15 @@ let update_pet ~pet_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/pet" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Pet.to_yojson pet_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Pet.to_yojson
+ pet_t in
     Cohttp_lwt_unix.Client.call `PUT uri ~headers ~body >>= fun (resp, body) ->
     Request.handle_unit_response resp
 

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

@@ -35,7 +35,15 @@ let place_order ~order_t =
     let open Lwt.Infix in
     let uri = Request.build_uri "/store/order" in
     let headers = Request.default_headers in
-    let body = Request.write_as_json_body Order.to_yojson order_t in
+    let body = Request.write_as_json_body 
+
+
+
+
+
+
+            Order.to_yojson
+ order_t in
     Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) ->
     Request.read_json_body_as (JsonSupport.unwrap Order.of_yojson) resp body