Skip to content

[Swift4] Allow for custom dateformatter to be used #6672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 6 commits into from
Nov 13, 2017
Merged

[Swift4] Allow for custom dateformatter to be used #6672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7e87d9
Add a custom dateformat to be set
DawidvanGraan Oct 13, 2017
9018f9f
Samples updated
DawidvanGraan Oct 13, 2017
5d24910
Update CodableHelper.swift
DawidvanGraan Oct 18, 2017
346e348
Update CodableHelper.mustache
DawidvanGraan Oct 18, 2017
e18d69a
Update CodableHelper.swift
DawidvanGraan Oct 18, 2017
db5af98
Update CodableHelper.swift
DawidvanGraan Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions modules/swagger-codegen/src/main/resources/swift4/CodableHelper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ public typealias EncodeResult = (data: Data?, error: Error?)

open class CodableHelper {

open static var dateformatter: DateFormatter?

open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
var returnedDecodable: T? = nil
var returnedError: Error? = nil

let decoder = JSONDecoder()
decoder.dataDecodingStrategy = .base64
Copy link
Contributor

@ehyche ehyche Oct 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being removed?

if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
if let df = self.dateformatter {
decoder.dateDecodingStrategy = .formatted(df)
} else {
decoder.dataDecodingStrategy = .base64
Copy link

@fl034 fl034 Feb 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DawidvanGraan Why is this inside the else scope?
Shouldn't the dataDecodingStrategy be applied, regardless of the custom date formatter?
Could be a mistake because date and data looks pretty much the same...

if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
}
}

do {
Expand Down
12 changes: 9 additions & 3 deletions samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ public typealias EncodeResult = (data: Data?, error: Error?)

open class CodableHelper {

open static var dateformatter: DateFormatter?

open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
var returnedDecodable: T? = nil
var returnedError: Error? = nil

let decoder = JSONDecoder()
decoder.dataDecodingStrategy = .base64
if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
if let df = self.dateformatter {
decoder.dateDecodingStrategy = .formatted(df)
} else {
decoder.dataDecodingStrategy = .base64
if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
}
}

do {
Expand Down
12 changes: 9 additions & 3 deletions ...les/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ public typealias EncodeResult = (data: Data?, error: Error?)

open class CodableHelper {

open static var dateformatter: DateFormatter?

open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
var returnedDecodable: T? = nil
var returnedError: Error? = nil

let decoder = JSONDecoder()
decoder.dataDecodingStrategy = .base64
if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
if let df = self.dateformatter {
decoder.dateDecodingStrategy = .formatted(df)
} else {
decoder.dataDecodingStrategy = .base64
if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
}
}

do {
Expand Down
12 changes: 9 additions & 3 deletions samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ public typealias EncodeResult = (data: Data?, error: Error?)

open class CodableHelper {

open static var dateformatter: DateFormatter?

open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
var returnedDecodable: T? = nil
var returnedError: Error? = nil

let decoder = JSONDecoder()
decoder.dataDecodingStrategy = .base64
if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
if let df = self.dateformatter {
decoder.dateDecodingStrategy = .formatted(df)
} else {
decoder.dataDecodingStrategy = .base64
if #available(iOS 10.0, *) {
decoder.dateDecodingStrategy = .iso8601
}
}

do {
Expand Down