diff --git a/Sources/XXClient/Helpers/JSONDecoder.swift b/Sources/XXClient/Helpers/JSONDecoder.swift index 751a8b3997f956d4ea535947a4c418a2dc48d6a6..52de4ec8b2eddc6035c7f39dabd6cc79a9aee38f 100644 --- a/Sources/XXClient/Helpers/JSONDecoder.swift +++ b/Sources/XXClient/Helpers/JSONDecoder.swift @@ -8,14 +8,14 @@ class JSONDecoder: Foundation.JSONDecoder { override func decode<T>(_ type: T.Type, from data: Data) throws -> T where T: Decodable { do { - let data = convertNumberToString(in: data, at: "Value") + let data = Self.convertNumberToString(in: data, at: "Value") return try super.decode(type, from: data) } catch { throw JSONDecodingError(error, data: data) } } - func convertNumberToString( + static func convertNumberToString( in input: Data, at key: String ) -> Data { diff --git a/Sources/XXClient/Helpers/JSONEncoder.swift b/Sources/XXClient/Helpers/JSONEncoder.swift index 69b368594111f33a8b2c207a9104facf628f4143..cecc558ed753d8900828f8f2938ad879b1bb1a72 100644 --- a/Sources/XXClient/Helpers/JSONEncoder.swift +++ b/Sources/XXClient/Helpers/JSONEncoder.swift @@ -9,14 +9,14 @@ class JSONEncoder: Foundation.JSONEncoder { override func encode<T>(_ value: T) throws -> Data where T: Encodable { do { var data = try super.encode(value) - data = convertStringToNumber(in: data, at: "Value") + data = Self.convertStringToNumber(in: data, at: "Value") return data } catch { throw JSONEncodingError(error, value: value) } } - func convertStringToNumber( + static func convertStringToNumber( in input: Data, at key: String ) -> Data { diff --git a/Tests/XXClientTests/Helpers/JSONDecoderTests.swift b/Tests/XXClientTests/Helpers/JSONDecoderTests.swift index 16f2afcbf4e909fa428500289ab58ae73356b8b7..b5d3b2860d067d5bee7acb9cc085e4c55c6dfbce 100644 --- a/Tests/XXClientTests/Helpers/JSONDecoderTests.swift +++ b/Tests/XXClientTests/Helpers/JSONDecoderTests.swift @@ -71,7 +71,7 @@ private func assertConvertingNumberToString( ) { XCTAssertNoDifference( String( - data: JSONDecoder().convertNumberToString( + data: JSONDecoder.convertNumberToString( in: input.data(using: .utf8)!, at: key ), diff --git a/Tests/XXClientTests/Helpers/JSONEncoderTests.swift b/Tests/XXClientTests/Helpers/JSONEncoderTests.swift index 58fbfae7a4bc41ec1feb620fdb8cd75031252889..b583207ede2b6f3eaf5aa6f94d18a6c339890501 100644 --- a/Tests/XXClientTests/Helpers/JSONEncoderTests.swift +++ b/Tests/XXClientTests/Helpers/JSONEncoderTests.swift @@ -71,7 +71,7 @@ private func assertConvertingStringToNumber( ) { XCTAssertNoDifference( String( - data: JSONEncoder().convertStringToNumber( + data: JSONEncoder.convertStringToNumber( in: input.data(using: .utf8)!, at: key ),