better readable code

evermeer · Apr 5, 2018 · f27f302 · f27f302
1 parent 8d9bd1f
commit f27f302
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/EVReflection.xcworkspace/xcuserdata/evermeer.xcuserdatad/UserInterfaceState.xcuserstate b/EVReflection.xcworkspace/xcuserdata/evermeer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/UnitTests/EVReflectionTests/EVReflectionTests.swift b/UnitTests/EVReflectionTests/EVReflectionTests.swift
@@ -484,6 +484,7 @@ class EVReflectionTests: XCTestCase {
     }
 
     func testNestedArray(){
+        // For now using the propertyConverters workaround.
         let json = "{\"array\":[[{\"openId\":\"value1\"},{\"openId\":\"value2\"}],[{\"openId\":\"value3\"},{\"openId\":\"value4\"}]]}"
         let obj = A81b(json: json)
         print(obj)
@@ -492,6 +493,7 @@ class EVReflectionTests: XCTestCase {
     }
 
     func testNestedNestedArray(){
+        // For now using the propertyConverters workaround.
         let json = "{\"array\":[[[{\"openId\":\"value1\"},{\"openId\":\"value2\"},{\"openId\":\"value3\"}],[{\"openId\":\"value3\"},{\"openId\":\"value4\"}]]]}"
         let obj = A81c(json: json)
         print(obj)

diff --git a/UnitTests/EVReflectionTests/TestObjects.swift b/UnitTests/EVReflectionTests/TestObjects.swift
@@ -271,7 +271,11 @@ class A81b: EVObject {
     override func propertyConverters() -> [(key: String, decodeConverter: ((Any?) -> ()), encodeConverter: (() -> Any?))] {
         return [(key: "array",
                  decodeConverter: {
-                    self.array = (($0 as? NSArray)?.map { (($0 as? NSArray)?.map { A81(dictionary: ($0 as? NSDictionary ?? NSDictionary()))}) ?? [] }) ?? [[]]
+                    self.array = (($0 as? NSArray)?.map {
+                        (($0 as? NSArray)?.map {
+                            A81(dictionary: ($0 as? NSDictionary ?? NSDictionary()))
+                        }) ?? []
+                    }) ?? [[]]
         }, encodeConverter: { return self.array })]
     }
 }
@@ -284,7 +288,13 @@ class A81c: EVObject {
     override func propertyConverters() -> [(key: String, decodeConverter: ((Any?) -> ()), encodeConverter: (() -> Any?))] {
         return [(key: "array",
                  decodeConverter: {
-                    self.array = (($0 as? NSArray)?.map { (($0 as? NSArray)?.map { (($0 as? NSArray)?.map { A81(dictionary: ($0 as? NSDictionary ?? NSDictionary()))}) ?? [] }) ?? [[]] }) ?? [[[]]]
+                    self.array = (($0 as? NSArray)?.map {
+                        (($0 as? NSArray)?.map {
+                            (($0 as? NSArray)?.map {
+                                A81(dictionary: ($0 as? NSDictionary ?? NSDictionary()))
+                            }) ?? []
+                        }) ?? [[]]
+                    }) ?? [[[]]]
         }, encodeConverter: { return self.array })]
     }
 }