Skip to content
This repository has been archived by the owner on Sep 21, 2023. It is now read-only.

Commit

Permalink
Reverted changes (epam-cross-platform-lab#383)
Browse files Browse the repository at this point in the history
* Revert "Add default values for enums (epam-cross-platform-lab#381)"

This reverts commit c8899da.

* Revert "AllOf enum fix (epam-cross-platform-lab#380)"

This reverts commit 80ebc18.

* Revert "Fix sending integer enums (epam-cross-platform-lab#379)"

This reverts commit c06fc7e.

Co-authored-by: uladzimir_paliukhovich <>
  • Loading branch information
Vovanella95 authored Apr 14, 2022
1 parent c8899da commit c82f3ee
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 488 deletions.
32 changes: 7 additions & 25 deletions lib/src/code_generators/swagger_enums_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,7 @@ $enumsFromRequestBodies

final enumMap = '''
\n\tconst \$${enumName}Map = {
\t${getEnumValuesMapContent(
enumName,
enumValues: enumValues,
enumValuesNames: [],
isInteger: isInteger,
)}
\t${getEnumValuesMapContent(enumName, enumValues: enumValues, enumValuesNames: [])}
};
''';

Expand Down Expand Up @@ -272,12 +267,9 @@ $enumMap
return resultStrings.join(',\n');
}

String getEnumValuesMapContent(
String enumName, {
required List<String> enumValues,
required List<String> enumValuesNames,
required bool isInteger,
}) {
String getEnumValuesMapContent(String enumName,
{required List<String> enumValues,
required List<String> enumValuesNames}) {
final neededStrings = <String>[];
final fields = <String>[];

Expand All @@ -296,13 +288,8 @@ $enumMap
validatedValue = getValidatedEnumFieldName(validatedValue);

fields.add(validatedValue);
if (isInteger) {
neededStrings.add(
'\t$enumName.$validatedValue: ${value.replaceAll('\$', '\\\$')}');
} else {
neededStrings.add(
'\t$enumName.$validatedValue: \'${value.replaceAll('\$', '\\\$')}\'');
}
neededStrings.add(
'\t$enumName.$validatedValue: \'${value.replaceAll('\$', '\\\$')}\'');
}

return neededStrings.join(',\n');
Expand Down Expand Up @@ -379,12 +366,7 @@ $enumMap

final enumMap = '''
\n\tconst \$${enumName}Map = {
\t${getEnumValuesMapContent(
enumName,
enumValues: enumValues,
enumValuesNames: enumValuesNamesList,
isInteger: isInteger,
)}
\t${getEnumValuesMapContent(enumName, enumValues: enumValues, enumValuesNames: enumValuesNamesList)}
};
''';

Expand Down
18 changes: 5 additions & 13 deletions lib/src/code_generators/swagger_generator_base.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:swagger_dart_code_generator/src/code_generators/constants.dart';
import 'package:swagger_dart_code_generator/src/exception_words.dart';
import 'package:swagger_dart_code_generator/src/extensions/string_extension.dart';
import 'package:swagger_dart_code_generator/src/models/generator_options.dart';
import 'package:swagger_dart_code_generator/src/models/swagger_enum.dart';
import 'package:swagger_dart_code_generator/src/swagger_models/requests/swagger_request.dart';
import 'package:swagger_dart_code_generator/src/swagger_models/requests/swagger_request_parameter.dart';
import 'package:swagger_dart_code_generator/src/swagger_models/swagger_path.dart';
Expand Down Expand Up @@ -102,8 +101,8 @@ abstract class SwaggerGeneratorBase {
return jsonKey;
}

List<SwaggerEnum> getEnumsFromRequests(Map<String, dynamic> map) {
final enums = <SwaggerEnum>[];
List<String> getEnumNamesFromRequests(Map<String, dynamic> map) {
final enumNames = <String>[];
final swaggerRoot = SwaggerRoot.fromJson(map);

//Link defined parameters with requests
Expand All @@ -130,7 +129,7 @@ abstract class SwaggerGeneratorBase {
var name = generateRequestEnumName(
path, requestType, swaggerRequestParameter.name);

if (enums.any((element) => element.name == name)) {
if (enumNames.contains(name)) {
continue;
}

Expand All @@ -139,20 +138,13 @@ abstract class SwaggerGeneratorBase {
[];

if (enumValues.isNotEmpty) {
enums.add(
SwaggerEnum(
name: name,
isInteger: kIntegerTypes.contains(
swaggerRequestParameter.schema?.type,
),
),
);
enumNames.add(name);
}
}
});
});

return enums;
return enumNames;
}

SwaggerRequestParameter getOriginalOrOverriddenRequestParameter(
Expand Down
Loading

0 comments on commit c82f3ee

Please sign in to comment.