Merge pull request #931 from Backbase/fix/freeform_object_issue_in_swift

Fix for Map objects in the Swift generator

Author: DevAgani

boat-scaffold/src/main/java/org/openapitools/codegen/languages/BoatSwift5Codegen.java

@@ -112,7 +112,6 @@ public void setDependenciesAs(String[] dependenciesAs) {
         this.dependenciesAs = dependenciesAs;
     }
 
-
     /*
     This is added as a compatibility requirement for API specs containing free form objects
     missing `additionalProperties` property
@@ -134,9 +133,9 @@ private void fixAllFreeFormObject(CodegenModel codegenModel) {
     */
     private void fixFreeFormObject(List<CodegenProperty> codegenProperties) {
         for (CodegenProperty codegenProperty : codegenProperties) {
-            if (codegenProperty.isFreeFormObject && codegenProperty.isMap && !codegenProperty.items.isFreeFormObject) {
-                codegenProperty.isFreeFormObject = false;
-            }
+            //if (codegenProperty.isFreeFormObject && codegenProperty.isMap && !codegenProperty.items.isFreeFormObject) {
+            //    codegenProperty.isFreeFormObject = false;
+            //}
 
             if (codegenProperty.isArray && codegenProperty.items.isFreeFormObject) {
                 codegenProperty.isFreeFormObject = true;

boat-scaffold/src/main/templates/boat-swift5/modelObject.mustache

@@ -1,4 +1,4 @@
-{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}}  {{classname}}: Codable, Equatable {
+{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{classname}}: Codable, Equatable {
 {{#allVars}}
 {{#isEnum}}
 {{> modelInlineEnumDeclaration}}