[Swift6][Client] Make Swift 6 generator thread safe

4brunu · 4brunu · commit 4d5c478405c5 · 2026-03-09T21:55:49.000Z
diff --git a/modules/openapi-generator/src/main/resources/swift6/CodableHelper.mustache b/modules/openapi-generator/src/main/resources/swift6/CodableHelper.mustache
@@ -30,7 +30,13 @@ import Foundation
 
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ internal class CodableHelper: @unchecked Sendable {
 
     internal var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     internal var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
diff --git a/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift b/samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/CodableHelper.swift
@@ -30,7 +30,13 @@ open class CodableHelper: @unchecked Sendable {
 
     public var dateFormatter: DateFormatter {
         get { _state.withValue { $0.customDateFormatter ?? $0.defaultDateFormatter } }
-        set { _state.withValue { $0.customDateFormatter = newValue } }
+        set {
+            _state.withValue { state in
+                state.customDateFormatter = newValue
+                state.defaultJSONDecoder = nil
+                state.defaultJSONEncoder = nil
+            }
+        }
     }
 
     public var jsonDecoder: JSONDecoder {
