[297]Remove implicit mapping when an explicit is present in the spec (#…

…298) * [297]Remove implicit mapping when an explicit is present in the spec * changelog
yonaskolb · Mar 31, 2022 · 6e0f18c · 6e0f18c
1 parent a6fd379
commit 6e0f18c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixed
 - Fixed compilation with Xcode 13 #282 @sroebert
+- Fixed duplicated switch cases when using explicit mappings in oneOf discriminator #297 @JanC
 
 ### Changed
 - Improved `CodeFormatter` efficiency #272 @zntfdr

diff --git a/Sources/SwagGenKit/CodeFormatter.swift b/Sources/SwagGenKit/CodeFormatter.swift
@@ -213,6 +213,7 @@ public class CodeFormatter {
  for (key, value) in discriminatorMapping {
  // TODO: could reference another spec
  let reference = Reference<Schema>(value)
+ mapping.removeValue(forKey: reference.name)
  mapping[key] = getReferenceContext(reference)
  }
  }

diff --git a/Specs/TestSpec/generated/Swift/Sources/Models/SingleAnimal.swift b/Specs/TestSpec/generated/Swift/Sources/Models/SingleAnimal.swift
@@ -13,10 +13,6 @@ public enum SingleAnimal: Codable, Equatable {
  let container = try decoder.container(keyedBy: StringCodingKey.self)
  let discriminator: String = try container.decode("type")
  switch discriminator {
- case "Cat":
- self = .cat(try Cat(from: decoder))
- case "Dog":
- self = .dog(try Dog(from: decoder))
  case "cat":
  self = .cat(try Cat(from: decoder))
  case "dog":