Merge pull request #35 from noppoMan/static-serialize

make JSONSerializer serialize statically
soto-project · May 22, 2017 · 3f90d3f · 3f90d3f
2 parents a9df27f + 19e0664
commit 3f90d3f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Sources/Core/JSON/JSONSerializer.swift b/Sources/Core/JSON/JSONSerializer.swift
@@ -78,8 +78,8 @@ private func serialize(dictionary: [String: Any]) throws -> String {
     return s
 }
 
-struct JSONSerializer {
-    public func serialize(_ dictionary: [String: Any]) throws -> Data {
+public struct JSONSerializer {
+    public static func serialize(_ dictionary: [String: Any]) throws -> Data {
         let jsonString = try "{" + Core.serialize(dictionary: dictionary) + "}"
         return jsonString.data(using: .utf8) ?? Data()
     }

diff --git a/Sources/Core/Message/Body.swift b/Sources/Core/Message/Body.swift
@@ -86,7 +86,7 @@ extension Body {
             if jsonDictionary.isEmpty {
                 return nil
             } else {
-                return try JSONSerializer().serialize(jsonDictionary)
+                return try JSONSerializer.serialize(jsonDictionary)
             }
 
         case .xml(let node):

diff --git a/Tests/AWSSDKSwiftTests/Core/SerializableTests.swift b/Tests/AWSSDKSwiftTests/Core/SerializableTests.swift
@@ -52,7 +52,7 @@ class SerializableTests: XCTestCase {
 
     func testSerializeToDictionaryAndJSON() {
         let dict = try! A().serializeToDictionary()
-        let data = try! JSONSerializer().serialize(dict)
+        let data = try! JSONSerializer.serialize(dict)
         let jsonObect = try! JSONSerialization.jsonObject(with: data, options: []) as! [String: Any]
         XCTAssertEqual(dict.count, jsonObect.count)
     }