Skip to content

Commit 8a401bc

Browse files
authored
Merge pull request #2 from AAkira/dart-dio/json-serializer-enum
Dart dio/json serializer enum
2 parents 1245d98 + df9b7c9 commit 8a401bc

13 files changed

Lines changed: 79 additions & 30 deletions

File tree

modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: {{pubDescription}}
44
homepage: {{pubHomepage}}
55

66
environment:
7-
sdk: '>=2.15.0 <3.0.0'
7+
sdk: '>=2.17.0 <3.0.0'
88
99
dependencies:
1010
dio: '^5.0.0'

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@ enum {{{classname}}} {
1111
/// {{{.}}}
1212
{{/description}}
1313
@JsonValue({{#isString}}r{{/isString}}{{{value}}})
14-
{{{name}}},
14+
{{{name}}}({{#isString}}r{{/isString}}{{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
1515
{{/enumVars}}
1616
{{/allowableValues}}
17+
18+
const {{{classname}}}(this.name);
19+
20+
final String name;
21+
22+
@override
23+
String toString() => name;
1724
}

samples/openapi3/client/petstore/dart-dio/oneof/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: OpenAPI API client
44
homepage: homepage
55

66
environment:
7-
sdk: '>=2.15.0 <3.0.0'
7+
sdk: '>=2.17.0 <3.0.0'
88

99
dependencies:
1010
dio: '^5.0.0'

samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: OpenAPI API client
44
homepage: homepage
55

66
environment:
7-
sdk: '>=2.15.0 <3.0.0'
7+
sdk: '>=2.17.0 <3.0.0'
88

99
dependencies:
1010
dio: '^5.0.0'

samples/openapi3/client/petstore/dart-dio/oneof_primitive/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: OpenAPI API client
44
homepage: homepage
55

66
environment:
7-
sdk: '>=2.15.0 <3.0.0'
7+
sdk: '>=2.17.0 <3.0.0'
88

99
dependencies:
1010
dio: '^5.0.0'

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ import 'package:json_annotation/json_annotation.dart';
88

99
enum ModelEnumClass {
1010
@JsonValue(r'_abc')
11-
abc,
11+
abc(r'_abc'),
1212
@JsonValue(r'-efg')
13-
efg,
13+
efg(r'-efg'),
1414
@JsonValue(r'(xyz)')
15-
leftParenthesisXyzRightParenthesis,
15+
leftParenthesisXyzRightParenthesis(r'(xyz)'),
1616
@JsonValue(r'unknown_default_open_api')
17-
unknownDefaultOpenApi,
17+
unknownDefaultOpenApi(r'unknown_default_open_api');
18+
19+
const ModelEnumClass(this.name);
20+
21+
final String name;
22+
23+
@override
24+
String toString() => name;
1825
}

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ import 'package:json_annotation/json_annotation.dart';
88

99
enum OuterEnum {
1010
@JsonValue(r'placed')
11-
placed,
11+
placed(r'placed'),
1212
@JsonValue(r'approved')
13-
approved,
13+
approved(r'approved'),
1414
@JsonValue(r'delivered')
15-
delivered,
15+
delivered(r'delivered'),
1616
@JsonValue(r'unknown_default_open_api')
17-
unknownDefaultOpenApi,
17+
unknownDefaultOpenApi(r'unknown_default_open_api');
18+
19+
const OuterEnum(this.name);
20+
21+
final String name;
22+
23+
@override
24+
String toString() => name;
1825
}

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ import 'package:json_annotation/json_annotation.dart';
88

99
enum OuterEnumDefaultValue {
1010
@JsonValue(r'placed')
11-
placed,
11+
placed(r'placed'),
1212
@JsonValue(r'approved')
13-
approved,
13+
approved(r'approved'),
1414
@JsonValue(r'delivered')
15-
delivered,
15+
delivered(r'delivered'),
1616
@JsonValue(r'unknown_default_open_api')
17-
unknownDefaultOpenApi,
17+
unknownDefaultOpenApi(r'unknown_default_open_api');
18+
19+
const OuterEnumDefaultValue(this.name);
20+
21+
final String name;
22+
23+
@override
24+
String toString() => name;
1825
}

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ import 'package:json_annotation/json_annotation.dart';
88

99
enum OuterEnumInteger {
1010
@JsonValue(0)
11-
number0,
11+
number0(0),
1212
@JsonValue(1)
13-
number1,
13+
number1(1),
1414
@JsonValue(2)
15-
number2,
15+
number2(2),
1616
@JsonValue(11184809)
17-
unknownDefaultOpenApi,
17+
unknownDefaultOpenApi(11184809);
18+
19+
const OuterEnumInteger(this.name);
20+
21+
final String name;
22+
23+
@override
24+
String toString() => name;
1825
}

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ import 'package:json_annotation/json_annotation.dart';
88

99
enum OuterEnumIntegerDefaultValue {
1010
@JsonValue(0)
11-
number0,
11+
number0(0),
1212
@JsonValue(1)
13-
number1,
13+
number1(1),
1414
@JsonValue(2)
15-
number2,
15+
number2(2),
1616
@JsonValue(11184809)
17-
unknownDefaultOpenApi,
17+
unknownDefaultOpenApi(11184809);
18+
19+
const OuterEnumIntegerDefaultValue(this.name);
20+
21+
final String name;
22+
23+
@override
24+
String toString() => name;
1825
}

0 commit comments

Comments
 (0)