Fix whitespace in Swift oneOf templates

lastMove · lastMove · commit 74aa7438c111 · 2026-01-12T11:53:05.000+01:00
Remove extra blank line before public init(from decoder:) in generated
oneOf Swift files by adjusting mustache tag placement.
diff --git a/modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache
@@ -19,16 +19,15 @@
         {{/oneOfUnknownDefaultCase}}
         }
     }
+{{#discriminator}}
 
-    {{#discriminator}}
     private enum DiscriminatorCodingKey: String, CodingKey {
         case {{discriminator.propertyName}} = "{{discriminator.propertyBaseName}}"
     }
-    {{/discriminator}}
+{{/discriminator}}
 
     public init(from decoder: Decoder) throws {
-        {{#discriminator}}
-        let keyedContainer = try decoder.container(keyedBy: DiscriminatorCodingKey.self)
+{{#discriminator}}        let keyedContainer = try decoder.container(keyedBy: DiscriminatorCodingKey.self)
         let discriminatorValue = try keyedContainer.decode(String.self, forKey: .{{discriminator.propertyName}})
 
         switch discriminatorValue {
@@ -49,9 +48,7 @@
             )
             {{/oneOfUnknownDefaultCase}}
         }
-        {{/discriminator}}
-        {{^discriminator}}
-        let container = try decoder.singleValueContainer()
+{{/discriminator}}{{^discriminator}}        let container = try decoder.singleValueContainer()
         {{#oneOf}}
         {{#-first}}
         if let value = try? container.decode({{.}}.self) {
@@ -69,6 +66,5 @@
             throw DecodingError.typeMismatch(Self.Type.self, .init(codingPath: decoder.codingPath, debugDescription: "Unable to decode instance of {{classname}}"))
             {{/oneOfUnknownDefaultCase}}
         }
-        {{/discriminator}}
-    }
+{{/discriminator}}    }
 }
diff --git a/modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/swift6/modelOneOf.mustache
@@ -19,16 +19,15 @@
         {{/oneOfUnknownDefaultCase}}
         }
     }
+{{#discriminator}}
 
-    {{#discriminator}}
     private enum DiscriminatorCodingKey: String, CodingKey {
         case {{discriminator.propertyName}} = "{{discriminator.propertyBaseName}}"
     }
-    {{/discriminator}}
+{{/discriminator}}
 
     public init(from decoder: Decoder) throws {
-        {{#discriminator}}
-        let keyedContainer = try decoder.container(keyedBy: DiscriminatorCodingKey.self)
+{{#discriminator}}        let keyedContainer = try decoder.container(keyedBy: DiscriminatorCodingKey.self)
         let discriminatorValue = try keyedContainer.decode(String.self, forKey: .{{discriminator.propertyName}})
 
         switch discriminatorValue {
@@ -49,9 +48,7 @@
             )
             {{/oneOfUnknownDefaultCase}}
         }
-        {{/discriminator}}
-        {{^discriminator}}
-        let container = try decoder.singleValueContainer()
+{{/discriminator}}{{^discriminator}}        let container = try decoder.singleValueContainer()
         {{#oneOf}}
         {{#-first}}
         if let value = try? container.decode({{.}}.self) {
@@ -69,6 +66,5 @@
             throw DecodingError.typeMismatch(Self.Type.self, .init(codingPath: decoder.codingPath, debugDescription: "Unable to decode instance of {{classname}}"))
             {{/oneOfUnknownDefaultCase}}
         }
-        {{/discriminator}}
-    }
+{{/discriminator}}    }
 }
diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift
@@ -27,7 +27,6 @@ public enum Fruit: Codable, JSONEncodable, Hashable {
         }
     }
 
-
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
         if let value = try? container.decode(Apple.self) {
diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Models/Fruit.swift
@@ -24,7 +24,6 @@ public enum Fruit: Sendable, Codable, ParameterConvertible, Hashable {
         }
     }
 
-
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
         if let value = try? container.decode(Apple.self) {

Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,15 @@`
`19`	`19`	`{{/oneOfUnknownDefaultCase}}`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+{{#discriminator}}`
`22`	`23`
`23`		`- {{#discriminator}}`
`24`	`24`	`private enum DiscriminatorCodingKey: String, CodingKey {`
`25`	`25`	`case {{discriminator.propertyName}} = "{{discriminator.propertyBaseName}}"`
`26`	`26`	`}`
`27`		`- {{/discriminator}}`
	`27`	`+{{/discriminator}}`
`28`	`28`
`29`	`29`	`public init(from decoder: Decoder) throws {`
`30`		`- {{#discriminator}}`
`31`		`- let keyedContainer = try decoder.container(keyedBy: DiscriminatorCodingKey.self)`
	`30`	`+{{#discriminator}} let keyedContainer = try decoder.container(keyedBy: DiscriminatorCodingKey.self)`
`32`	`31`	`let discriminatorValue = try keyedContainer.decode(String.self, forKey: .{{discriminator.propertyName}})`
`33`	`32`
`34`	`33`	`switch discriminatorValue {`
`@@ -49,9 +48,7 @@`
`49`	`48`	`)`
`50`	`49`	`{{/oneOfUnknownDefaultCase}}`
`51`	`50`	`}`
`52`		`- {{/discriminator}}`
`53`		`- {{^discriminator}}`
`54`		`- let container = try decoder.singleValueContainer()`
	`51`	`+{{/discriminator}}{{^discriminator}} let container = try decoder.singleValueContainer()`
`55`	`52`	`{{#oneOf}}`
`56`	`53`	`{{#-first}}`
`57`	`54`	`if let value = try? container.decode({{.}}.self) {`
`@@ -69,6 +66,5 @@`
`69`	`66`	`throw DecodingError.typeMismatch(Self.Type.self, .init(codingPath: decoder.codingPath, debugDescription: "Unable to decode instance of {{classname}}"))`
`70`	`67`	`{{/oneOfUnknownDefaultCase}}`
`71`	`68`	`}`
`72`		`- {{/discriminator}}`
`73`		`- }`
	`69`	`+{{/discriminator}} }`
`74`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public enum Fruit: Codable, JSONEncodable, Hashable {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-`
`31`	`30`	`public init(from decoder: Decoder) throws {`
`32`	`31`	`let container = try decoder.singleValueContainer()`
`33`	`32`	`if let value = try? container.decode(Apple.self) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public enum Fruit: Sendable, Codable, ParameterConvertible, Hashable {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-`
`28`	`27`	`public init(from decoder: Decoder) throws {`
`29`	`28`	`let container = try decoder.singleValueContainer()`
`30`	`29`	`if let value = try? container.decode(Apple.self) {`