Fixed cases with application/json (#237)

* Fixed cases with application/json * Fixed some things * Small fix * Fixed summary field * Fixed some things * Removed not needed thing Co-authored-by: uladzimir_paliukhovich <>
epam-cross-platform-lab · Sep 3, 2021 · 63cdc32 · 63cdc32
1 parent f56bb7a
commit 63cdc32
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.1.1+2
+
+* Fixed issues when content has no application/json child
+
 # 2.1.1+1
 
 * Fixed Issue ([#235](https://github.com/epam-cross-platform-lab/swagger-dart-code-generator/issues/235))

diff --git a/lib/src/code_generators/swagger_models_generator.dart b/lib/src/code_generators/swagger_models_generator.dart
@@ -112,7 +112,8 @@ abstract class SwaggerModelsGenerator {
     paths.forEach((path, pathValue) {
       final requests = pathValue as Map<String, dynamic>;
 
-      requests.removeWhere((key, value) => key == 'parameters');
+      requests
+          .removeWhere((key, value) => key == 'parameters' || key == 'summary');
 
       requests.forEach((request, requestValue) {
         if (options.excludePaths.isNotEmpty &&

diff --git a/lib/src/code_generators/swagger_requests_generator.dart b/lib/src/code_generators/swagger_requests_generator.dart
@@ -474,6 +474,18 @@ class SwaggerRequestsGenerator {
     return result.distinctParameters();
   }
 
+  bool _isBasicTypeRef(String ref, SwaggerRoot root) {
+    final schemas = _getAllReusableObjects(root);
+
+    final neededSchema = schemas[ref.getUnformattedRef()];
+
+    if (neededSchema == null) {
+      return false;
+    }
+
+    return kBasicTypes.contains(neededSchema.type);
+  }
+
   bool _isEnumRef(String ref, SwaggerRoot root) {
     final schemas = root.components?.schemas ?? <String, SwaggerSchema>{};
     schemas.addAll(root.definitions);
@@ -507,6 +519,10 @@ class SwaggerRequestsGenerator {
           return ref.asEnum().asList();
         }
 
+        if (_isBasicTypeRef(ref, root)) {
+          return kObject.pascalCase;
+        }
+
         if (ref.isNotEmpty) {
           return SwaggerModelsGenerator.getValidatedClassName(
                   ref.withPostfix(modelPostfix))
@@ -524,6 +540,10 @@ class SwaggerRequestsGenerator {
         return schema.ref.getRef().asEnum();
       }
 
+      if (_isBasicTypeRef(schema.ref, root)) {
+        return kObject.pascalCase;
+      }
+
       return SwaggerModelsGenerator.getValidatedClassName(
           schema.ref.getRef().withPostfix(modelPostfix));
     }
@@ -610,10 +630,14 @@ class SwaggerRequestsGenerator {
     final ref = swaggerResponse.schema?.ref ?? swaggerResponse.ref;
 
     if (ref.isNotEmpty) {
-      final responses = root.components?.responses ?? {};
-      final neededResponse = responses[ref.getRef()];
+      final allReusableObjects = _getAllReusableObjects(root);
+      final neededResponse = allReusableObjects[ref.getUnformattedRef()];
 
-      if (neededResponse?.ref.isNotEmpty == true) {
+      if (neededResponse == null) {
+        return kObject.pascalCase;
+      }
+
+      if (neededResponse.ref.isNotEmpty) {
         return kObject.pascalCase;
       }
 
@@ -623,6 +647,16 @@ class SwaggerRequestsGenerator {
     return null;
   }
 
+  Map<String, SwaggerSchema> _getAllReusableObjects(SwaggerRoot root) {
+    final results = <String, SwaggerSchema>{};
+    results.addAll(root.definitions);
+    results.addAll(root.components?.schemas ?? {});
+    results.addAll(root.components?.responses ?? {});
+    results.addAll(root.components?.requestBodies ?? {});
+
+    return results;
+  }
+
   String? _getReturnTypeFromOriginalRef(
       SwaggerResponse swaggerResponse, String modelPostfix) {
     if (swaggerResponse.schema?.originalRef.isNotEmpty == true) {
@@ -651,13 +685,23 @@ class SwaggerRequestsGenerator {
 
     final schemaRef = content.schema?.ref ?? '';
     if (schemaRef.isNotEmpty) {
-      final neededSchema = swaggerRoot.components?.schemas[schemaRef.getRef()];
+      final allRefs = _getAllReusableObjects(swaggerRoot);
+      final neededSchema = allRefs[schemaRef.getUnformattedRef()];
+
+      if (neededSchema == null) {
+        return kObject.pascalCase;
+      }
+
+      if (kBasicTypes.contains(neededSchema.type)) {
+        return kObject.pascalCase;
+      }
+
       final typeName =
           SwaggerModelsGenerator.getValidatedClassName(schemaRef.getRef())
               .withPostfix(modelPostfix);
 
-      if (neededSchema?.type == kArray) {
-        return neededSchema?.items?.ref
+      if (neededSchema.type == kArray) {
+        return neededSchema.items?.ref
             .getRef()
             .withPostfix(modelPostfix)
             .asList();

diff --git a/lib/src/extensions/string_extension.dart b/lib/src/extensions/string_extension.dart
@@ -26,6 +26,8 @@ extension TypeExtension on String {
 
   String getRef() => split('/').last.pascalCase;
 
+  String getUnformattedRef() => split('/').last;
+
   String withPostfix(String postfix) => '${this}$postfix';
 
   String asList() => 'List<$this>';

diff --git a/lib/src/swagger_models/swagger_components.dart b/lib/src/swagger_models/swagger_components.dart
@@ -42,18 +42,17 @@ Map<String, SwaggerSchema> _mapResponses(Map<String, dynamic>? json) {
     final content =
         (value as Map<String, dynamic>)['content'] as Map<String, dynamic>?;
 
-    final appJsonKey = content?.keys.firstWhere(
-            (element) => element.startsWith('application/json'),
-            orElse: () => '') ??
-        '';
-
-    if (appJsonKey.isNotEmpty) {
-      final appJson = content?[appJsonKey] as Map<String, dynamic>?;
-
-      if (appJson != null && appJson['schema'] != null) {
-        results[key] =
-            SwaggerSchema.fromJson(appJson['schema'] as Map<String, dynamic>);
-      }
+    Map<String, dynamic>? appJson;
+
+    if (content?.length == 1) {
+      appJson = content?.values.first as Map<String, dynamic>?;
+    } else {
+      appJson = content?['application/json'] as Map<String, dynamic>?;
+    }
+
+    if (appJson != null && appJson['schema'] != null) {
+      results[key] =
+          SwaggerSchema.fromJson(appJson['schema'] as Map<String, dynamic>);
     }
   });
 

diff --git a/lib/src/swagger_models/swagger_root.dart b/lib/src/swagger_models/swagger_root.dart
@@ -64,7 +64,7 @@ Map<String, SwaggerPath> _mapPaths(Map<String, dynamic>? paths) {
   return paths.map((path, pathValue) {
     final value = pathValue as Map<String, dynamic>;
     final parameters = value['parameters'] as List<dynamic>?;
-    value.removeWhere((key, value) => key == 'parameters');
+    value.removeWhere((key, value) => key == 'parameters' || key == 'summary');
 
     return MapEntry(
       path,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: swagger_dart_code_generator
 
-version: 2.1.1+1
+version: 2.1.1+2
 
 homepage: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator
 repository: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator