diff --git a/modules/swagger-codegen/src/main/resources/swift4/model.mustache b/modules/swagger-codegen/src/main/resources/swift4/model.mustache index 7c342ac3473d..eb51bc23d091 100644 --- a/modules/swagger-codegen/src/main/resources/swift4/model.mustache +++ b/modules/swagger-codegen/src/main/resources/swift4/model.mustache @@ -11,7 +11,7 @@ import Foundation /** {{description}} */{{/description}} {{#isArrayModel}} -public typealias {{classname}} = [{{arrayModelType}}] +public typealias {{classname}} = {{parent}} {{/isArrayModel}} {{^isArrayModel}} {{#isEnum}} diff --git a/modules/swagger-codegen/src/test/resources/2_0/swift4Test.json b/modules/swagger-codegen/src/test/resources/2_0/swift4Test.json index d9de56b3d1aa..8607cfc0463e 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/swift4Test.json +++ b/modules/swagger-codegen/src/test/resources/2_0/swift4Test.json @@ -251,6 +251,28 @@ }, "description": "Example Error object" }, + "ModelStringArray": { + "type": "array", + "description": "This defines an array of strings.", + "items": { + "type": "string" + } + }, + "ModelDoubleArray": { + "type": "array", + "description": "This defines an array of doubles.", + "items": { + "type": "number", + "format": "double" + } + }, + "ModelErrorInfoArray": { + "type": "array", + "description": "This defines an array of ErrorInfo objects.", + "items": { + "$ref": "#/definitions/ErrorInfo" + } + }, "VariableNameTest": { "description": "This object contains property names which we know will be different from their variable name. Examples of this include snake case property names and property names which are Swift 4 reserved words.", "type": "object", diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift new file mode 100644 index 000000000000..1f075b441dc5 --- /dev/null +++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift @@ -0,0 +1,12 @@ +// +// ModelDoubleArray.swift +// +// Generated by swagger-codegen +// https://github.com/swagger-api/swagger-codegen +// + +import Foundation + + +/** This defines an array of doubles. */ +public typealias ModelDoubleArray = [Double] diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift new file mode 100644 index 000000000000..f9a48fbab1b7 --- /dev/null +++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift @@ -0,0 +1,12 @@ +// +// ModelErrorInfoArray.swift +// +// Generated by swagger-codegen +// https://github.com/swagger-api/swagger-codegen +// + +import Foundation + + +/** This defines an array of ErrorInfo objects. */ +public typealias ModelErrorInfoArray = [ErrorInfo] diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift new file mode 100644 index 000000000000..1c588f2ab7c1 --- /dev/null +++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift @@ -0,0 +1,12 @@ +// +// ModelStringArray.swift +// +// Generated by swagger-codegen +// https://github.com/swagger-api/swagger-codegen +// + +import Foundation + + +/** This defines an array of strings. */ +public typealias ModelStringArray = [String]