Merge pull request #174 from olgadanylova/master

Adapters error handling fixed

Author: Olga Danylova

SDK/backendlessAPI/Classes/Persistence/PersistenceAdapter/DeviceRegistrationAdapter.m

@@ -33,23 +33,28 @@
 @implementation DeviceRegistrationAdapter
 
 -(id)adapt:(id)type {
-    V3Message *v3 = (V3Message *)[type defaultAdapt];
-    if (v3.isError) {
-        ErrMessage *result = (ErrMessage *)v3;
-        return [Fault fault:result.faultString detail:result.faultDetail faultCode:result.faultCode];
-    }
     NSMutableDictionary *typeProperties = ((AnonymousObject *)[type getCacheKey]).properties;
-    id body = [typeProperties valueForKey:@"body"];    
-    if ([body isKindOfClass:[NamedObject class]]) {
-        return [self adaptToDeviceRegistration:body];
+    if ([typeProperties valueForKey:@"faultCode"] ||
+        [typeProperties valueForKey:@"faultDetail"] ||
+        [typeProperties valueForKey:@"faultString"]) {
+        Fault *fault = [[Fault alloc] initWithMessage:[[typeProperties valueForKey:@"faultString"] defaultAdapt]
+                                               detail:[[typeProperties valueForKey:@"faultDetail"] defaultAdapt]
+                                            faultCode:[[typeProperties valueForKey:@"faultCode"] defaultAdapt]];
+        return fault;
     }
-    else if ([body isKindOfClass:[ArrayType class]]) {
-        NSMutableArray *result = [NSMutableArray new];
-        NSArray *bodyObjects = [body getArray];
-        for (NamedObject *bodyObject in bodyObjects) {
-            [result addObject:[self adaptToDeviceRegistration:bodyObject]];
+    else {
+        id body = [typeProperties valueForKey:@"body"];
+        if ([body isKindOfClass:[NamedObject class]]) {
+            return [self adaptToDeviceRegistration:body];
+        }
+        else if ([body isKindOfClass:[ArrayType class]]) {
+            NSMutableArray *result = [NSMutableArray new];
+            NSArray *bodyObjects = [body getArray];
+            for (NamedObject *bodyObject in bodyObjects) {
+                [result addObject:[self adaptToDeviceRegistration:bodyObject]];
+            }
+            return result;
         }
-        return result;
     }
     return nil;
 }

SDK/backendlessAPI/Classes/Persistence/PersistenceAdapter/MapAdapter.m

@@ -32,24 +32,29 @@
 @implementation MapAdapter
 
 -(id)adapt:(id)type {
-    V3Message *v3 = (V3Message *)[type defaultAdapt];
-    if (v3.isError) {
-        ErrMessage *result = (ErrMessage *)v3;        
-        return [Fault fault:result.faultString detail:result.faultDetail faultCode:result.faultCode];
-    }
     NSMutableDictionary *typeProperties = ((AnonymousObject *)[type getCacheKey]).properties;
-    id body = [typeProperties valueForKey:@"body"];
-    
-    if ([body isKindOfClass:[NamedObject class]]) {
-        return [body adapt:[NSDictionary class]];
+    if ([typeProperties valueForKey:@"faultCode"] ||
+        [typeProperties valueForKey:@"faultDetail"] ||
+        [typeProperties valueForKey:@"faultString"]) {
+        Fault *fault = [[Fault alloc] initWithMessage:[[typeProperties valueForKey:@"faultString"] defaultAdapt]
+                                               detail:[[typeProperties valueForKey:@"faultDetail"] defaultAdapt]
+                                            faultCode:[[typeProperties valueForKey:@"faultCode"] defaultAdapt]];
+        return fault;
     }
-    else if ([body isKindOfClass:[ArrayType class]]) {
-        NSMutableArray *result = [NSMutableArray new];
-        NSArray *bodyObjects = [body getArray];
-        for (NamedObject *bodyObject in bodyObjects) {
-            [result addObject:[bodyObject adapt:[NSDictionary class]]];
+    else {
+        id body = [typeProperties valueForKey:@"body"];
+        
+        if ([body isKindOfClass:[NamedObject class]]) {
+            return [body adapt:[NSDictionary class]];
+        }
+        else if ([body isKindOfClass:[ArrayType class]]) {
+            NSMutableArray *result = [NSMutableArray new];
+            NSArray *bodyObjects = [body getArray];
+            for (NamedObject *bodyObject in bodyObjects) {
+                [result addObject:[bodyObject adapt:[NSDictionary class]]];
+            }
+            return result;
         }
-        return result;
     }
     return nil;
 }