no double cast

evermeer · Dec 26, 2016 · adcc2a3 · adcc2a3
1 parent 84d51b2
commit adcc2a3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/EVReflection.podspec b/EVReflection.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
 #
 
 s.name         = "EVReflection"
-s.version      = "3.5.1"
+s.version      = "3.5.2"
 s.summary      = "iOS: Swift helper library with reflection functions"
 s.description  = "Swift helper library with reflection functions including support for NSCoding, Printable, Hashable, Equatable and JSON"
 s.homepage     = "https://github.com/evermeer/EVReflection"

diff --git a/EVReflection/EVReflectionTests/EVReflectionIssue145.swift b/EVReflection/EVReflectionTests/EVReflectionIssue145.swift
@@ -83,8 +83,8 @@ class User145c: EVObject {
     var id: Int = 0
     var name: String = ""
     var email: String?
-    var company: AnyObject = NSDictionary()
-    var workHistory: [AnyObject] = []
+    var company: AnyObject? = NSDictionary()
+    var workHistory: [AnyObject]? = []
 }
 
 class Company145: EVObject {

diff --git a/EVReflection/EVReflectionTests/EVReflectionTests.swift b/EVReflection/EVReflectionTests/EVReflectionTests.swift
@@ -252,7 +252,7 @@ class EVReflectionTests: XCTestCase {
      */
     func testArrays() {
         let x = ArrayObjects()
-        print(x.toJsonString())
+        print(x)
     }
 
     func testCircular() {

diff --git a/EVReflection/EVReflectionTests/TestObjects.swift b/EVReflection/EVReflectionTests/TestObjects.swift
@@ -163,6 +163,10 @@ class ArrayObjects: EVObject {
     var arrays: [[String]] = [["a","b"], ["c","d"]]
     var dictionaries: [NSDictionary] = [NSDictionary(), NSDictionary()]
     var subobjects: [SubObject] = [SubObject(), SubObject()]
+    var nilObjects: [SubObject]?
+    var nilStrings: [String]?
+    var nilObjectsForced: [SubObject]!
+    var nilStringsForced: [String]!
 }
 
 class SubObject: EVObject {

diff --git a/EVReflection/pod/EVReflection.swift b/EVReflection/pod/EVReflection.swift
@@ -745,40 +745,40 @@ final public class EVReflection {
             return (theValue as! NSNumber, "NSNumber", false)
         }
         if theValue is Int64 {
-            return (NSNumber(value: theValue as! Int64 as Int64), "NSNumber", false)
+            return (NSNumber(value: theValue as! Int64), "NSNumber", false)
         }
         if theValue is UInt64 {
-            return (NSNumber(value: theValue as! UInt64 as UInt64), "NSNumber", false)
+            return (NSNumber(value: theValue as! UInt64), "NSNumber", false)
         }
         if theValue is Int32 {
-            return (NSNumber(value: theValue as! Int32 as Int32), "NSNumber", false)
+            return (NSNumber(value: theValue as! Int32), "NSNumber", false)
         }
         if theValue is UInt32 {
-            return (NSNumber(value: theValue as! UInt32 as UInt32), "NSNumber", false)
+            return (NSNumber(value: theValue as! UInt32), "NSNumber", false)
         }
         if theValue is Int16 {
-            return (NSNumber(value: theValue as! Int16 as Int16), "NSNumber", false)
+            return (NSNumber(value: theValue as! Int16), "NSNumber", false)
         }
         if theValue is UInt16 {
-            return (NSNumber(value: theValue as! UInt16 as UInt16), "NSNumber", false)
+            return (NSNumber(value: theValue as! UInt16), "NSNumber", false)
         }
         if theValue is Int8 {
-            return (NSNumber(value: theValue as! Int8 as Int8), "NSNumber", false)
+            return (NSNumber(value: theValue as! Int8), "NSNumber", false)
         }
         if theValue is UInt8 {
-            return (NSNumber(value: theValue as! UInt8 as UInt8), "NSNumber", false)
+            return (NSNumber(value: theValue as! UInt8), "NSNumber", false)
         }
         if theValue is NSString {
             return (theValue as! NSString, "NSString", false)
         }
         if theValue is Date {
-            return (theValue as! Date as AnyObject, "NSDate", false)
+            return (theValue as AnyObject, "NSDate", false)
         }
         if theValue is UUID {
             return ((theValue as! UUID).uuidString as AnyObject, "NSString", false)
         }
         if theValue is Array<Any> {
-            return ((theValue as! Array<Any>) as AnyObject, valueType, false)
+            return (theValue as AnyObject, valueType, false)
         }
         if theValue is EVReflectable && theValue is NSObject {
             if valueType.contains("<") {