loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[OCaml] Fix enum returnType in of_json.mustache for Api Impl (#8631)

Browse Source 
* Fix OCaml enum returnType in of_json.mustache

* update samples (ocaml, python)

Co-authored-by: William Cheng <wing328hk@gmail.com>
This commit is contained in:
Frank T 2021-02-27 10:13:45 +01:00 committed by GitHub
parent bc4bc36de7
commit ebac91aa32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
View File

@ -727,6 +727,12 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig
if ("Yojson.Safe.t".equals(operation.returnBaseType)) { if ("Yojson.Safe.t".equals(operation.returnBaseType)) {
operation.vendorExtensions.put("x-return-free-form-object", true); operation.vendorExtensions.put("x-return-free-form-object", true);
} }
if (operation.returnType != null && operation.returnType.startsWith("Enums.")) {
String returnTypeEnum = operation.returnType.replaceAll(" list$", "");
operation.vendorExtensions.put("x-returntype-enum", returnTypeEnum);
operation.vendorExtensions.put("x-returntype-is-enum", true);
}
} }
for (Map.Entry<String, String> e : enumUniqNames.entrySet()) { for (Map.Entry<String, String> e : enumUniqNames.entrySet()) {

2
modules/openapi-generator/src/main/resources/ocaml/of_json.mustache vendored
View File

@ -1 +1 @@
{{#isEnum}}JsonSupport.unwrap Enums.{{{datatypeWithEnum}}}_of_yojson{{/isEnum}}{{^isEnum}}{{#returnType}}{{#returnTypeIsPrimitive}}JsonSupport.to_{{{returnBaseType}}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{#vendorExtensions.x-model-module}}JsonSupport.unwrap {{{vendorExtensions.x-model-module}}}.of_yojson{{/vendorExtensions.x-model-module}}{{^vendorExtensions.x-model-module}}JsonSupport.unwrap {{{returnBaseType}}}.of_yojson{{/vendorExtensions.x-model-module}}{{/returnTypeIsPrimitive}}{{/returnType}}{{/isEnum}} {{#vendorExtensions.x-returntype-is-enum}}JsonSupport.unwrap {{{vendorExtensions.x-returntype-enum}}}_of_yojson{{/vendorExtensions.x-returntype-is-enum}}{{^vendorExtensions.x-returntype-is-enum}}{{#returnType}}{{#returnTypeIsPrimitive}}JsonSupport.to_{{{returnBaseType}}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{#vendorExtensions.x-model-module}}JsonSupport.unwrap {{{vendorExtensions.x-model-module}}}.of_yojson{{/vendorExtensions.x-model-module}}{{^vendorExtensions.x-model-module}}JsonSupport.unwrap {{{returnBaseType}}}.of_yojson{{/vendorExtensions.x-model-module}}{{/returnTypeIsPrimitive}}{{/returnType}}{{/vendorExtensions.x-returntype-is-enum}}

19
samples/client/petstore/ocaml/.openapi-generator/FILES Normal file
View File

@ -0,0 +1,19 @@
README.md
dune
dune-project
petstore_client.opam
src/apis/pet_api.ml
src/apis/pet_api.mli
src/apis/store_api.ml
src/apis/store_api.mli
src/apis/user_api.ml
src/apis/user_api.mli
src/models/api_response.ml
src/models/category.ml
src/models/order.ml
src/models/pet.ml
src/models/tag.ml
src/models/user.ml
src/support/enums.ml
src/support/jsonSupport.ml
src/support/request.ml

2
samples/client/petstore/ocaml/.openapi-generator/VERSION
View File

@ -1 +1 @@
5.0.0-SNAPSHOT 5.0.1-SNAPSHOT