Merge branch 'master' into issue-9495

Author: 4kind

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java

@@ -60,6 +60,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
     protected static final String LIBRARY_PROMISE_KIT = "PromiseKit";
     protected static final String LIBRARY_RX_SWIFT = "RxSwift";
     protected static final String[] RESPONSE_LIBRARIES = {LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT};
+    protected static final String MODEL_CLASSES = "modelClasses";
     protected String projectName = "SwaggerClient";
     protected boolean unwrapRequired;
     protected boolean objcCompatible = false;
@@ -302,6 +303,10 @@ public void processOpts() {
             additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS);
         }
 
+        if (additionalProperties.containsKey(MODEL_CLASSES)) {
+            additionalProperties.put("useModelClasses", true);
+        }
+
         setLenientTypeCast(convertPropertyToBooleanAndWriteBack(LENIENT_TYPE_CAST));
 
         supportingFiles.add(new SupportingFile("Podspec.mustache",

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift5Codegen.java

@@ -47,6 +47,7 @@ public class Swift5Codegen extends DefaultCodegen implements CodegenConfig {
     private static final String LIBRARY_PROMISE_KIT = "PromiseKit";
     private static final String LIBRARY_RX_SWIFT = "RxSwift";
     private static final String[] RESPONSE_LIBRARIES = {LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT};
+    protected static final String MODEL_CLASSES = "modelClasses";
     protected String projectName = "SwaggerClient";
     private boolean unwrapRequired;
     private boolean objcCompatible = false;
@@ -289,6 +290,10 @@ public void processOpts() {
             additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS);
         }
 
+        if (additionalProperties.containsKey(MODEL_CLASSES)) {
+            additionalProperties.put("useModelClasses", true);
+        }
+
         setLenientTypeCast(convertPropertyToBooleanAndWriteBack(LENIENT_TYPE_CAST));
 
         supportingFiles.add(new SupportingFile("Podspec.mustache",

modules/swagger-codegen/src/main/resources/swift4/modelObject.mustache

@@ -1,5 +1,5 @@
 
-public struct {{classname}}: Codable {
+public {{#useModelClasses}}class{{/useModelClasses}}{{^useModelClasses}}struct{{/useModelClasses}} {{classname}}: Codable {
 
 {{#allVars}}
 {{#isEnum}}

modules/swagger-codegen/src/main/resources/swift5/modelObject.mustache

@@ -1,5 +1,5 @@
 
-public struct {{classname}}: Codable {
+public {{#useModelClasses}}class{{/useModelClasses}}{{^useModelClasses}}struct{{/useModelClasses}} {{classname}}: Codable {
 
 {{#allVars}}
 {{#isEnum}}