Fixed issue #311

epam-cross-platform-lab · Jan 14, 2022 · 0230ee8 · 0230ee8
1 parent fe39ba2
commit 0230ee8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/lib/src/code_generators/swagger_enums_generator.dart b/lib/src/code_generators/swagger_enums_generator.dart
@@ -367,7 +367,12 @@ $enumMap
 
  final gemeratedEnumsContent = map.keys
  .map((String key) {
- final enumValuesMap = map[key] as Map<String, dynamic>;
+ final enumValues = map[key];
+
+ final enumValuesMap = enumValues is Map<String, dynamic>
+ ? enumValues
+ : <String, dynamic>{};
+ map[key];
 
  if (enumValuesMap.containsKey('type')) {
  return generateEnumContentIfPossible(

diff --git a/lib/src/code_generators/swagger_models_generator.dart b/lib/src/code_generators/swagger_models_generator.dart
@@ -839,8 +839,12 @@ abstract class SwaggerModelsGenerator {
 
  for (var i = 0; i < propertiesMap.keys.length; i++) {
  var propertyName = propertiesMap.keys.elementAt(i);
- final propertyEntryMap =
- propertiesMap[propertyName] as Map<String, dynamic>;
+
+ final propertyEntry = propertiesMap[propertyName];
+ final propertyEntryMap = propertyEntry is Map<String, dynamic>
+ ? propertyEntry
+ : <String, dynamic>{};
+
  final propertyKey = propertyName;
 
  final basicTypesMap = generateBasicTypesMapFromSchemas(swagger);
@@ -1212,10 +1216,12 @@ $allHashComponents;
  final refString = allOfRef['\$ref'].toString();
  final schema = schemas[refString.getUnformattedRef()];
 
- final moreProperties =
- schema['properties'] as Map<String, dynamic>? ?? {};
+ if (schema != null) {
+ final moreProperties =
+ schema['properties'] as Map<String, dynamic>? ?? {};
 
- currentProperties.addAll(moreProperties);
+ currentProperties.addAll(moreProperties);
+ }
  }
 
  return currentProperties;
@@ -1303,10 +1309,13 @@ $allHashComponents;
  }
 
  properties.forEach((propertyName, propertyValue) {
- var property = propertyValue as Map<String, dynamic>;
+ if (propertyValue is! Map<String, dynamic>) {
+ return;
+ }
 
- if (property.containsKey('enum') ||
- (property['items'] != null && property['items']['enum'] != null)) {
+ if (propertyValue.containsKey('enum') ||
+ (propertyValue['items'] != null &&
+ propertyValue['items']['enum'] != null)) {
  results.add(SwaggerModelsGenerator.getValidatedClassName(
  SwaggerEnumsGeneratorV3().generateEnumName(
  SwaggerModelsGenerator.getValidatedClassName(className),