Skip to content

Commit bb39eaa

Browse files
committed
ported codegen v2 issue 6941 to v3
1 parent f2adecb commit bb39eaa

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,14 +1484,6 @@ else if (schema instanceof ComposedSchema) {
14841484
}
14851485
}
14861486

1487-
System.out.println(codegenModel.name);
1488-
System.out.println(codegenModel.dataType);
1489-
System.out.println(codegenModel.getIsInteger());
1490-
System.out.println(codegenModel.getIsNumber());
1491-
System.out.println(codegenModel.getIsBoolean());
1492-
System.out.println("--------");
1493-
1494-
14951487
return codegenModel;
14961488
}
14971489

src/main/java/io/swagger/codegen/v3/generators/swift/AbstractSwiftCodegen.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ public abstract class AbstractSwiftCodegen extends DefaultCodegenConfig {
5151
public static final String SWIFT_USE_API_NAMESPACE = "swiftUseApiNamespace";
5252
public static final String DEFAULT_POD_AUTHORS = "Swagger Codegen";
5353
public static final String LENIENT_TYPE_CAST = "lenientTypeCast";
54+
protected static final String MODEL_CLASSES = "modelClasses";
55+
protected static final String USE_MODEL_CLASSES = "useModelClasses";
5456

5557
private static final String LIBRARY_PROMISE_KIT = "PromiseKit";
5658
private static final String LIBRARY_RX_SWIFT = "RxSwift";
@@ -192,6 +194,10 @@ public void processOpts() {
192194
additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS);
193195
}
194196

197+
if (additionalProperties.containsKey(MODEL_CLASSES)) {
198+
additionalProperties.put(USE_MODEL_CLASSES, true);
199+
}
200+
195201
setLenientTypeCast(convertPropertyToBooleanAndWriteBack(LENIENT_TYPE_CAST));
196202

197203
supportingFiles.add(new SupportingFile("Podspec.mustache",

src/main/resources/handlebars/swift4/modelObject.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
public struct {{classname}}: Codable {
2+
public {{#useModelClasses}}class{{/useModelClasses}}{{^useModelClasses}}struct{{/useModelClasses}} {{classname}}: Codable {
33
44
{{#allVars}}{{#is this 'enum'}}{{> modelInlineEnumDeclaration}}
55
{{/is}}{{/allVars}}{{#allVars}}{{#is this 'enum'}} {{#description}}/** {{description}} */

src/main/resources/handlebars/swift5/modelObject.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
public struct {{classname}}: Codable {
2+
public {{#useModelClasses}}class{{/useModelClasses}}{{^useModelClasses}}struct{{/useModelClasses}} {{classname}}: Codable {
33
44
{{#allVars}}
55
{{#isEnum}}

0 commit comments

Comments
 (0)