Avoided double string<>data conversion in inits

jkmathew · jkmathew · commit 02619d9d3bad · 2014-09-14T19:52:48.000+05:30
Removed double string&lt;&gt;data conversion in
-(id)initWithString:(NSString *)string
usingEncoding:(NSStringEncoding)encoding error:(JSONModelError**)err
and
-(instancetype)initWithData:(NSData *)data error:(NSError
*__autoreleasing *)err
methods
diff --git a/JSONModel/JSONModel/JSONModel.m b/JSONModel/JSONModel/JSONModel.m
@@ -114,13 +114,21 @@ -(id)init
 
 -(instancetype)initWithData:(NSData *)data error:(NSError *__autoreleasing *)err
 {
-    //turn nsdata to an nsstring
-    NSString* string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-    if (!string) return nil;
-    
-    //create an instance
+    if (!data) return nil;
+
+    //read the json
     JSONModelError* initError = nil;
-    id objModel = [self initWithString:string usingEncoding:NSUTF8StringEncoding error:&initError];
+    id obj = [NSJSONSerialization JSONObjectWithData:data
+                                             options:kNilOptions
+                                               error:&initError];
+    
+    if (initError) {
+        if (err) *err = [JSONModelError errorBadJSON];
+        return nil;
+    }
+    
+    //init with dictionary
+    id objModel = [self initWithDictionary:obj error:&initError];
     if (initError && err) *err = initError;
     return objModel;
 }
@@ -141,21 +149,11 @@ -(id)initWithString:(NSString *)string usingEncoding:(NSStringEncoding)encoding
         return nil;
     }
     
-    //read the json
     JSONModelError* initError = nil;
-    id obj = [NSJSONSerialization JSONObjectWithData:[string dataUsingEncoding:encoding]
-                                             options:kNilOptions
-                                               error:&initError];
-
-    if (initError) {
-        if (err) *err = [JSONModelError errorBadJSON];
-        return nil;
-    }
-    
-    //init with dictionary
-    id objModel = [self initWithDictionary:obj error:&initError];
+    id objModel = [self initWithData:[string dataUsingEncoding:encoding] error:&initError];
     if (initError && err) *err = initError;
     return objModel;
+
 }
 
 -(id)initWithDictionary:(NSDictionary*)dict error:(NSError**)err
diff --git a/JSONModelDemo_iOS/MasterViewController.m b/JSONModelDemo_iOS/MasterViewController.m
@@ -122,6 +122,9 @@ -(void)viewDidAppear:(BOOL)animated
     TopModel* tm = [[TopModel alloc] initWithString:json error:nil];
     NSLog(@"tm: %@", tm.toDictionary);
     NSLog(@"to string: %@", tm.toJSONString);
+    tm = [[TopModel alloc] initWithData:[json dataUsingEncoding:NSUTF8StringEncoding] error:nil];
+    NSLog(@"tm - WithData : %@", tm.toDictionary);
+    NSLog(@"to string - WithData : %@", tm.toJSONString);
 }
 
 -(IBAction)actionLoadCall:(id)sender

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,9 @@ -(void)viewDidAppear:(BOOL)animated`
`122`	`122`	`TopModel* tm = [[TopModel alloc] initWithString:json error:nil];`
`123`	`123`	`NSLog(@"tm: %@", tm.toDictionary);`
`124`	`124`	`NSLog(@"to string: %@", tm.toJSONString);`
	`125`	`+ tm = [[TopModel alloc] initWithData:[json dataUsingEncoding:NSUTF8StringEncoding] error:nil];`
	`126`	`+ NSLog(@"tm - WithData : %@", tm.toDictionary);`
	`127`	`+ NSLog(@"to string - WithData : %@", tm.toJSONString);`
`125`	`128`	`}`
`126`	`129`
`127`	`130`	`-(IBAction)actionLoadCall:(id)sender`