From df61cd9cb36c135784c2ed7ede4dc5ef6ed80a4e Mon Sep 17 00:00:00 2001 From: Jaumard Date: Tue, 25 Sep 2018 11:22:19 +0200 Subject: [PATCH] fix model generator for snake case open api definition (#1076) --- .../src/main/resources/dart-jaguar/class.mustache | 1 + .../dart-jaguar/flutter_petstore/openapi/README.md | 2 +- .../flutter_petstore/openapi/lib/model/api_response.dart | 3 +++ .../flutter_petstore/openapi/lib/model/category.dart | 2 ++ .../flutter_petstore/openapi/lib/model/order.dart | 6 ++++++ .../flutter_petstore/openapi/lib/model/pet.dart | 6 ++++++ .../flutter_petstore/openapi/lib/model/tag.dart | 2 ++ .../flutter_petstore/openapi/lib/model/user.dart | 8 ++++++++ samples/client/petstore/dart-jaguar/openapi/README.md | 2 +- .../dart-jaguar/openapi/lib/model/api_response.dart | 3 +++ .../petstore/dart-jaguar/openapi/lib/model/category.dart | 2 ++ .../petstore/dart-jaguar/openapi/lib/model/order.dart | 6 ++++++ .../petstore/dart-jaguar/openapi/lib/model/pet.dart | 6 ++++++ .../petstore/dart-jaguar/openapi/lib/model/tag.dart | 2 ++ .../petstore/dart-jaguar/openapi/lib/model/user.dart | 8 ++++++++ 15 files changed, 57 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/class.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/class.mustache index 6507390a0f7..f4a1731a5f3 100644 --- a/modules/openapi-generator/src/main/resources/dart-jaguar/class.mustache +++ b/modules/openapi-generator/src/main/resources/dart-jaguar/class.mustache @@ -2,6 +2,7 @@ part '{{classFilename}}.jser.dart'; class {{classname}} { {{#vars}}{{#description}} /* {{{description}}} */{{/description}} + @Alias('{{{baseName}}}') final {{{datatype}}} {{name}}; {{#allowableValues}}{{#min}} // range from {{min}} to {{max}}{{/min}}//{{^min}}enum {{name}}Enum { {{#values}} {{.}}, {{/values}} };{{/min}}{{/allowableValues}}{{/vars}} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md index 8c9cf6f6e6f..bafbd7a90b8 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project: - API version: 1.0.0 -- Build date: 2018-09-12T15:26:49.382+08:00[Asia/Hong_Kong] +- Build date: 2018-09-21T14:54:05.021285+02:00[Europe/Paris] - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/api_response.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/api_response.dart index 2b9fa763b00..0d563a58a51 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/api_response.dart +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/api_response.dart @@ -4,10 +4,13 @@ part 'api_response.jser.dart'; class ApiResponse { + @Alias('code') final int code; + @Alias('type') final String type; + @Alias('message') final String message; diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/category.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/category.dart index 2f5e7bd9c50..a4f763cfc18 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/category.dart +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/category.dart @@ -4,8 +4,10 @@ part 'category.jser.dart'; class Category { + @Alias('id') final int id; + @Alias('name') final String name; diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/order.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/order.dart index a00485ad2ad..1f734184a85 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/order.dart +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/order.dart @@ -4,16 +4,22 @@ part 'order.jser.dart'; class Order { + @Alias('id') final int id; + @Alias('petId') final int petId; + @Alias('quantity') final int quantity; + @Alias('shipDate') final DateTime shipDate; /* Order Status */ + @Alias('status') final String status; //enum statusEnum { placed, approved, delivered, }; + @Alias('complete') final bool complete; diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/pet.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/pet.dart index 971c63a6719..97b6bd8a2a8 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/pet.dart +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/pet.dart @@ -6,16 +6,22 @@ part 'pet.jser.dart'; class Pet { + @Alias('id') final int id; + @Alias('category') final Category category; + @Alias('name') final String name; + @Alias('photoUrls') final List photoUrls; + @Alias('tags') final List tags; /* pet status in the store */ + @Alias('status') final String status; //enum statusEnum { available, pending, sold, }; diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/tag.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/tag.dart index 7b294b3008b..b98f2c58724 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/tag.dart +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/tag.dart @@ -4,8 +4,10 @@ part 'tag.jser.dart'; class Tag { + @Alias('id') final int id; + @Alias('name') final String name; diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/user.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/user.dart index fddc756616a..df3a400829f 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/user.dart +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/model/user.dart @@ -4,20 +4,28 @@ part 'user.jser.dart'; class User { + @Alias('id') final int id; + @Alias('username') final String username; + @Alias('firstName') final String firstName; + @Alias('lastName') final String lastName; + @Alias('email') final String email; + @Alias('password') final String password; + @Alias('phone') final String phone; /* User Status */ + @Alias('userStatus') final int userStatus; diff --git a/samples/client/petstore/dart-jaguar/openapi/README.md b/samples/client/petstore/dart-jaguar/openapi/README.md index a6db0333f31..e2e488210d7 100644 --- a/samples/client/petstore/dart-jaguar/openapi/README.md +++ b/samples/client/petstore/dart-jaguar/openapi/README.md @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project: - API version: 1.0.0 -- Build date: 2018-09-12T15:26:47.853+08:00[Asia/Hong_Kong] +- Build date: 2018-09-21T14:54:03.562304+02:00[Europe/Paris] - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/model/api_response.dart b/samples/client/petstore/dart-jaguar/openapi/lib/model/api_response.dart index 2b9fa763b00..0d563a58a51 100644 --- a/samples/client/petstore/dart-jaguar/openapi/lib/model/api_response.dart +++ b/samples/client/petstore/dart-jaguar/openapi/lib/model/api_response.dart @@ -4,10 +4,13 @@ part 'api_response.jser.dart'; class ApiResponse { + @Alias('code') final int code; + @Alias('type') final String type; + @Alias('message') final String message; diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/model/category.dart b/samples/client/petstore/dart-jaguar/openapi/lib/model/category.dart index 2f5e7bd9c50..a4f763cfc18 100644 --- a/samples/client/petstore/dart-jaguar/openapi/lib/model/category.dart +++ b/samples/client/petstore/dart-jaguar/openapi/lib/model/category.dart @@ -4,8 +4,10 @@ part 'category.jser.dart'; class Category { + @Alias('id') final int id; + @Alias('name') final String name; diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/model/order.dart b/samples/client/petstore/dart-jaguar/openapi/lib/model/order.dart index a00485ad2ad..1f734184a85 100644 --- a/samples/client/petstore/dart-jaguar/openapi/lib/model/order.dart +++ b/samples/client/petstore/dart-jaguar/openapi/lib/model/order.dart @@ -4,16 +4,22 @@ part 'order.jser.dart'; class Order { + @Alias('id') final int id; + @Alias('petId') final int petId; + @Alias('quantity') final int quantity; + @Alias('shipDate') final DateTime shipDate; /* Order Status */ + @Alias('status') final String status; //enum statusEnum { placed, approved, delivered, }; + @Alias('complete') final bool complete; diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/model/pet.dart b/samples/client/petstore/dart-jaguar/openapi/lib/model/pet.dart index 971c63a6719..97b6bd8a2a8 100644 --- a/samples/client/petstore/dart-jaguar/openapi/lib/model/pet.dart +++ b/samples/client/petstore/dart-jaguar/openapi/lib/model/pet.dart @@ -6,16 +6,22 @@ part 'pet.jser.dart'; class Pet { + @Alias('id') final int id; + @Alias('category') final Category category; + @Alias('name') final String name; + @Alias('photoUrls') final List photoUrls; + @Alias('tags') final List tags; /* pet status in the store */ + @Alias('status') final String status; //enum statusEnum { available, pending, sold, }; diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/model/tag.dart b/samples/client/petstore/dart-jaguar/openapi/lib/model/tag.dart index 7b294b3008b..b98f2c58724 100644 --- a/samples/client/petstore/dart-jaguar/openapi/lib/model/tag.dart +++ b/samples/client/petstore/dart-jaguar/openapi/lib/model/tag.dart @@ -4,8 +4,10 @@ part 'tag.jser.dart'; class Tag { + @Alias('id') final int id; + @Alias('name') final String name; diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/model/user.dart b/samples/client/petstore/dart-jaguar/openapi/lib/model/user.dart index fddc756616a..df3a400829f 100644 --- a/samples/client/petstore/dart-jaguar/openapi/lib/model/user.dart +++ b/samples/client/petstore/dart-jaguar/openapi/lib/model/user.dart @@ -4,20 +4,28 @@ part 'user.jser.dart'; class User { + @Alias('id') final int id; + @Alias('username') final String username; + @Alias('firstName') final String firstName; + @Alias('lastName') final String lastName; + @Alias('email') final String email; + @Alias('password') final String password; + @Alias('phone') final String phone; /* User Status */ + @Alias('userStatus') final int userStatus;