Merge pull request #349 from yuru-taustahuzau/PUT_POST

Implementing post parameter work for any methods. PUT and POST use first...
epam · Aug 10, 2014 · bcbfffa · bcbfffa
2 parents b0550b3 + d15468a
commit bcbfffa
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/Framework/ROADWebService/ROADWebService/Private/Downloader/RFDownloader.m b/Framework/ROADWebService/ROADWebService/Private/Downloader/RFDownloader.m
@@ -283,25 +283,19 @@ - (void)prepareDownloadBlock {
 - (NSMutableURLRequest *)requestForUrl:(NSURL * const)anUrl withMethod:(NSString * const)method withBody:(NSData *)httpBody values:(NSDictionary *)values {
     NSData *body = httpBody;
 
-    if ([_callAttribute.method isEqualToString:@"POST"] || [_callAttribute.method isEqualToString:@"PUT"]) {
-        if (_callAttribute.postParameter != (int)NSNotFound && !httpBody.length) {
-            id bodyObject = values[[NSString stringWithFormat:@"%d", _callAttribute.postParameter]];
-            body = [self dataFromParameter:bodyObject];
-        }
-        else {
-            if ([body length] == 0) {
-                id firstParameter = values[@"0"];
-                if (firstParameter) { // Checking first parameter of web service call method
-                    body = [self dataFromParameter:firstParameter];
-                }
-            }
-            else if (_callAttribute.postParameter != (int)NSNotFound) {
-                RFWSLogWarn(@"Web service method %@ specifies postParameter, but has NSData or RFFormData variable in parameters and use it instead", method);
+    if (_callAttribute.postParameter != (int)NSNotFound) {
+        id bodyObject = values[[NSString stringWithFormat:@"%d", _callAttribute.postParameter]];
+        body = [self dataFromParameter:bodyObject];
+    }
+    else if ([_callAttribute.method isEqualToString:@"POST"] || [_callAttribute.method isEqualToString:@"PUT"]) {
+        if ([body length] == 0) {
+            id firstParameter = values[@"0"];
+            if (firstParameter) { // Checking first parameter of web service call method
+                body = [self dataFromParameter:firstParameter];
             }
         }
     }
 
-
     NSMutableURLRequest * const request = [NSMutableURLRequest requestWithURL:anUrl];
     request.HTTPMethod = method;
     request.HTTPBody = body;
@@ -371,6 +365,10 @@ - (NSData *)dataFromParameter:(id)parameter {
         data = [parameter dataUsingEncoding:NSUTF8StringEncoding];
     }
 
+    if ([parameter isKindOfClass:[NSData class]]) {
+        data = parameter;
+    }
+
     return data;
 }